From 088d86511f9e407a27a62e16af60ced1fb05944f Mon Sep 17 00:00:00 2001 From: Imre Kaloz Date: Wed, 20 Aug 2008 14:00:34 +0000 Subject: upgrade busybox to v1.11.1 and add current upstream fixes git-svn-id: svn://svn.openwrt.org/openwrt/trunk@12348 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- package/busybox/patches/240-udhcpc_retries.patch | 26 +++++++++++------------- 1 file changed, 12 insertions(+), 14 deletions(-) (limited to 'package/busybox/patches/240-udhcpc_retries.patch') 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); -- cgit v1.2.3