[package] kernel: revert unrelated change in previous commit

[openwrt.git] / package / busybox / patches / 243-udhcpc_changed_ifindex.patch

diff --git a/package/busybox/patches/243-udhcpc_changed_ifindex.patch b/package/busybox/patches/243-udhcpc_changed_ifindex.patch
index 3a95174..71bfe01 100644 (file)
--- a/package/busybox/patches/243-udhcpc_changed_ifindex.patch
+++ b/package/busybox/patches/243-udhcpc_changed_ifindex.patch
@@ -1,17 +1,15 @@
-Index: busybox-1.4.2/networking/udhcp/dhcpc.c
-===================================================================
---- busybox-1.4.2.orig/networking/udhcp/dhcpc.c        2007-07-18 10:07:20.161035443 +0200
-+++ busybox-1.4.2/networking/udhcp/dhcpc.c     2007-07-18 10:09:15.515609124 +0200
-@@ -273,6 +273,12 @@
-               tv.tv_sec = timeout - uptime();
-               tv.tv_usec = 0;
+--- a/networking/udhcp/dhcpc.c
++++ b/networking/udhcp/dhcpc.c
+@@ -1144,6 +1144,12 @@ int udhcpc_main(int argc UNUSED_PARAM, c
+               /* silence "uninitialized!" warning */
+               unsigned timestamp_before_wait = timestamp_before_wait;
  
 +              /* When running on a bridge, the ifindex may have changed (e.g. if
 +               * member interfaces were added/removed or if the status of the
 +               * bridge changed).
 +               * Workaround: refresh it here before processing the next packet */
-+              read_interface(client_config.interface, &client_config.ifindex, NULL, client_config.arp);
++              udhcp_read_interface(client_config.interface, &client_config.ifindex, NULL, client_config.client_mac);
 +
-               if (listen_mode != LISTEN_NONE && fd < 0) {
-                       if (listen_mode == LISTEN_KERNEL)
-                               fd = listen_socket(INADDR_ANY, CLIENT_PORT, client_config.interface);
+               //bb_error_msg("sockfd:%d, listen_mode:%d", sockfd, listen_mode);
+ 
+               /* Was opening raw or udp socket here