X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/e8b81c92e78dc781a9569d7d51bd4f98d89237f8..1deca2707326574a6ee8e1c58158506885ec7e44:/package/busybox/patches/243-udhcpc_changed_ifindex.patch?ds=sidebyside

diff --git a/package/busybox/patches/243-udhcpc_changed_ifindex.patch b/package/busybox/patches/243-udhcpc_changed_ifindex.patch
index b30460423..c5bf9123d 100644
--- 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.7.2/networking/udhcp/dhcpc.c
-===================================================================
---- 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;
+--- a/networking/udhcp/dhcpc.c
++++ b/networking/udhcp/dhcpc.c
+@@ -342,6 +342,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 && sockfd < 0) {
- 			if (listen_mode == LISTEN_KERNEL)
- 				sockfd = 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