diff options
author | Nicolas Thill <nico@openwrt.org> | 2009-09-28 12:38:46 +0000 |
---|---|---|
committer | Nicolas Thill <nico@openwrt.org> | 2009-09-28 12:38:46 +0000 |
commit | 49254e2b2c2f65a21be6c38c3afc0b9d4832f3fb (patch) | |
tree | 0c8df24973e5339e60c5aae5a5d461d18d373cac /package/busybox/patches/243-udhcpc_changed_ifindex.patch | |
parent | b36c9d3cec0da6a0e1e3ba5f1fbbdac9de750312 (diff) | |
download | master-187ad058-49254e2b2c2f65a21be6c38c3afc0b9d4832f3fb.tar.gz master-187ad058-49254e2b2c2f65a21be6c38c3afc0b9d4832f3fb.tar.bz2 master-187ad058-49254e2b2c2f65a21be6c38c3afc0b9d4832f3fb.zip |
[package] busybox: update to v1.14.4 (closes: #5619)
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@17782 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/busybox/patches/243-udhcpc_changed_ifindex.patch')
-rw-r--r-- | package/busybox/patches/243-udhcpc_changed_ifindex.patch | 12 |
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 |