X-Git-Url: http://git.ozo.com/?a=blobdiff_plain;f=package%2Fbusybox%2Fpatches%2F240-udhcpc_retries.patch;h=30f64e16a77d3067ee4d7571fcb2e292aaef66ab;hb=2db05e4bbbdf107f2cebdf385af108c77b9748ba;hp=4f15c42c64e76b4e7e705754ff5f77af3fcc2cff;hpb=b5cb1795de1f0959de1e228bd2e784d1cea921a7;p=openwrt-10.03%2F.git

diff --git a/package/busybox/patches/240-udhcpc_retries.patch b/package/busybox/patches/240-udhcpc_retries.patch
index 4f15c42c6..30f64e16a 100644
--- a/package/busybox/patches/240-udhcpc_retries.patch
+++ b/package/busybox/patches/240-udhcpc_retries.patch
@@ -1,22 +1,20 @@
-Index: busybox-1.4.2/networking/udhcp/dhcpc.c
-===================================================================
---- busybox-1.4.2.orig/networking/udhcp/dhcpc.c	2007-06-04 13:21:32.319063424 +0200
-+++ busybox-1.4.2/networking/udhcp/dhcpc.c	2007-06-04 13:21:33.430894400 +0200
-@@ -291,7 +291,7 @@
- 			/* timeout dropped to zero */
+--- a/networking/udhcp/dhcpc.c
++++ b/networking/udhcp/dhcpc.c
+@@ -352,7 +352,7 @@ int udhcpc_main(int argc ATTRIBUTE_UNUSE
+ 
  			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();
  
-@@ -316,7 +316,7 @@
- 				break;
+@@ -382,7 +382,7 @@ int udhcpc_main(int argc ATTRIBUTE_UNUSE
+ 				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);