diff options
| author | Imre Kaloz <kaloz@openwrt.org> | 2008-08-20 14:00:34 +0000 |
|---|---|---|
| committer | Imre Kaloz <kaloz@openwrt.org> | 2008-08-20 14:00:34 +0000 |
| commit | 1e82faaa5e835b00676421b1c63bef541f8ca0d3 (patch) | |
| tree | abda8ea9d70f7d10c897cf214028b9037b17f784 /package/busybox/patches/240-udhcpc_retries.patch | |
| parent | e3d9bc5779a012df82e2c48af3bef81bb011257a (diff) | |
| download | master-31e0f0ae-1e82faaa5e835b00676421b1c63bef541f8ca0d3.tar.gz master-31e0f0ae-1e82faaa5e835b00676421b1c63bef541f8ca0d3.tar.bz2 master-31e0f0ae-1e82faaa5e835b00676421b1c63bef541f8ca0d3.zip | |
upgrade busybox to v1.11.1 and add current upstream fixes
SVN-Revision: 12348
Diffstat (limited to 'package/busybox/patches/240-udhcpc_retries.patch')
| -rw-r--r-- | package/busybox/patches/240-udhcpc_retries.patch | 26 |
1 files changed, 12 insertions, 14 deletions
diff --git a/package/busybox/patches/240-udhcpc_retries.patch b/package/busybox/patches/240-udhcpc_retries.patch index 7a655376dc..2e0ef118f4 100644 --- a/package/busybox/patches/240-udhcpc_retries.patch +++ b/package/busybox/patches/240-udhcpc_retries.patch @@ -1,22 +1,20 @@ -Index: busybox-1.7.2/networking/udhcp/dhcpc.c -=================================================================== ---- busybox-1.7.2.orig/networking/udhcp/dhcpc.c 2007-10-30 15:35:00.000000000 -0500 -+++ busybox-1.7.2/networking/udhcp/dhcpc.c 2007-10-30 15:35:01.000000000 -0500 -@@ -334,7 +334,7 @@ - /* timeout dropped to zero */ +--- a/networking/udhcp/dhcpc.c ++++ b/networking/udhcp/dhcpc.c +@@ -352,7 +352,7 @@ + switch (state) { case INIT_SELECTING: -- if (packet_num < client_config.retries) { -+ if (!client_config.retries || (packet_num < client_config.retries)) { +- if (packet_num < discover_retries) { ++ if (!discover_retries || packet_num < discover_retries) { if (packet_num == 0) xid = random_xid(); -@@ -360,7 +360,7 @@ - break; +@@ -382,7 +382,7 @@ + continue; case RENEW_REQUESTED: case REQUESTING: -- if (packet_num < client_config.retries) { -+ if (!client_config.retries || (packet_num < client_config.retries)) { +- if (packet_num < discover_retries) { ++ if (!discover_retries || packet_num < discover_retries) { /* send request packet */ - if (state == RENEW_REQUESTED) - send_renew(xid, server_addr, requested_ip); /* unicast */ + if (state == RENEW_REQUESTED) /* unicast */ + send_renew(xid, server_addr, requested_ip); |