aboutsummaryrefslogtreecommitdiffstats
path: root/package/busybox/patches/243-udhcpc_changed_ifindex.patch
diff options
context:
space:
mode:
authorNicolas Thill <nico@openwrt.org>2009-09-28 12:38:46 +0000
committerNicolas Thill <nico@openwrt.org>2009-09-28 12:38:46 +0000
commit91750d01a7a0b56a880a147a825d097aaac7f53d (patch)
tree20de5267e6400c96be022906c833acdb5f7eb6d0 /package/busybox/patches/243-udhcpc_changed_ifindex.patch
parent6fa03d63d4d34ef38a5fde5292cb7f65c06d56b2 (diff)
downloadupstream-91750d01a7a0b56a880a147a825d097aaac7f53d.tar.gz
upstream-91750d01a7a0b56a880a147a825d097aaac7f53d.tar.bz2
upstream-91750d01a7a0b56a880a147a825d097aaac7f53d.zip
busybox: update to v1.14.4 (closes: #5619)
SVN-Revision: 17782
Diffstat (limited to 'package/busybox/patches/243-udhcpc_changed_ifindex.patch')
-rw-r--r--package/busybox/patches/243-udhcpc_changed_ifindex.patch12
1 files changed, 6 insertions, 6 deletions
diff --git a/package/busybox/patches/243-udhcpc_changed_ifindex.patch b/package/busybox/patches/243-udhcpc_changed_ifindex.patch
index 29727556d1..f0ab34d26a 100644
--- a/package/busybox/patches/243-udhcpc_changed_ifindex.patch
+++ b/package/busybox/patches/243-udhcpc_changed_ifindex.patch
@@ -1,8 +1,8 @@
--- a/networking/udhcp/dhcpc.c
+++ b/networking/udhcp/dhcpc.c
-@@ -320,6 +320,12 @@ int udhcpc_main(int argc UNUSED_PARAM, c
- for (;;) {
- unsigned timestamp_before_wait;
+@@ -327,6 +327,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
@@ -10,6 +10,6 @@
+ * Workaround: refresh it here before processing the next packet */
+ udhcp_read_interface(client_config.interface, &client_config.ifindex, NULL, client_config.arp);
+
- if (listen_mode != LISTEN_NONE && sockfd < 0) {
- if (listen_mode == LISTEN_KERNEL)
- sockfd = udhcp_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