busybox: refresh busybox patches

[openwrt/staging/mkresin.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 3a9517418faceeea6100eabbfe2e44d50858231e..50987665e67348f10efdf3179a1fc3ac40b3c369 100644 (file)
--- a/package/busybox/patches/243-udhcpc_changed_ifindex.patch
+++ b/package/busybox/patches/243-udhcpc_changed_ifindex.patch
@@ -1,10 +1,8 @@
-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
+@@ -319,6 +319,12 @@ int udhcpc_main(int argc ATTRIBUTE_UNUSE
+       for (;;) {
+               unsigned 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
@@ -12,6 +10,6 @@ Index: busybox-1.4.2/networking/udhcp/dhcpc.c
 +               * Workaround: refresh it here before processing the next packet */
 +              read_interface(client_config.interface, &client_config.ifindex, NULL, client_config.arp);
 +
-               if (listen_mode != LISTEN_NONE && fd < 0) {
+               if (listen_mode != LISTEN_NONE && sockfd < 0) {
                        if (listen_mode == LISTEN_KERNEL)
-                               fd = listen_socket(INADDR_ANY, CLIENT_PORT, client_config.interface);
+                               sockfd = listen_socket(/*INADDR_ANY,*/ CLIENT_PORT, client_config.interface);