diff options
author | Florian Fainelli <florian@openwrt.org> | 2009-12-07 16:56:04 +0000 |
---|---|---|
committer | Florian Fainelli <florian@openwrt.org> | 2009-12-07 16:56:04 +0000 |
commit | 2469eb18208255653d05af2e8aadd74fd7749c2e (patch) | |
tree | 988a315683659fdf7de4e74170065aa34e4042f5 /package/busybox/patches/240-udhcpc_retries.patch | |
parent | 0282f7482993f68e2b5c98e608b642f85602fc62 (diff) | |
download | upstream-2469eb18208255653d05af2e8aadd74fd7749c2e.tar.gz upstream-2469eb18208255653d05af2e8aadd74fd7749c2e.tar.bz2 upstream-2469eb18208255653d05af2e8aadd74fd7749c2e.zip |
[package] update busybox to 1.15.2 (#5926)
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@18684 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/busybox/patches/240-udhcpc_retries.patch')
-rw-r--r-- | package/busybox/patches/240-udhcpc_retries.patch | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/package/busybox/patches/240-udhcpc_retries.patch b/package/busybox/patches/240-udhcpc_retries.patch index 81f120d8e6..bfcc02b7fb 100644 --- a/package/busybox/patches/240-udhcpc_retries.patch +++ b/package/busybox/patches/240-udhcpc_retries.patch @@ -1,6 +1,6 @@ --- a/networking/udhcp/dhcpc.c +++ b/networking/udhcp/dhcpc.c -@@ -363,7 +363,7 @@ int udhcpc_main(int argc UNUSED_PARAM, c +@@ -380,7 +380,7 @@ int udhcpc_main(int argc UNUSED_PARAM, c switch (state) { case INIT_SELECTING: @@ -8,13 +8,13 @@ + if (!discover_retries || packet_num < discover_retries) { if (packet_num == 0) xid = random_xid(); - -@@ -394,7 +394,7 @@ int udhcpc_main(int argc UNUSED_PARAM, c + /* broadcast */ +@@ -409,7 +409,7 @@ int udhcpc_main(int argc UNUSED_PARAM, c + packet_num = 0; continue; - case RENEW_REQUESTED: case REQUESTING: - if (packet_num < discover_retries) { + if (!discover_retries || packet_num < discover_retries) { - /* send request packet */ - if (state == RENEW_REQUESTED) /* unicast */ - send_renew(xid, server_addr, requested_ip); + /* send broadcast select packet */ + send_select(xid, server_addr, requested_ip); + timeout = discover_timeout; |