Upgrade busybox to 1.7.2
[openwrt/svn-archive/archive.git] / package / busybox / patches / 243-udhcpc_changed_ifindex.patch
index 3a9517418faceeea6100eabbfe2e44d50858231e..b30460423236c46f90b7beba2b109a99ce869d8a 100644 (file)
@@ -1,9 +1,9 @@
-Index: busybox-1.4.2/networking/udhcp/dhcpc.c
+Index: busybox-1.7.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();
+--- busybox-1.7.2.orig/networking/udhcp/dhcpc.c        2007-10-04 14:36:41.521873204 +0200
++++ busybox-1.7.2/networking/udhcp/dhcpc.c     2007-10-04 14:38:28.231954268 +0200
+@@ -309,6 +309,12 @@
+  jump_in:
                tv.tv_usec = 0;
  
 +              /* When running on a bridge, the ifindex may have changed (e.g. if
@@ -12,6 +12,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);