X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/b0c94d7f56f87751f1a594bc189b204eed800610..733f605a17e5ef598450cb30b5a92891c7e0da2b:/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 7a655376d..c78dae533 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
+@@ -1017,7 +1017,7 @@ int udhcpc_main(int argc UNUSED_PARAM, c
+ 
  			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;
- 			case RENEW_REQUESTED:
+ 					/* broadcast */
+@@ -1046,7 +1046,7 @@ int udhcpc_main(int argc UNUSED_PARAM, c
+ 				packet_num = 0;
+ 				continue;
  			case REQUESTING:
--				if (packet_num < client_config.retries) {
-+				if (!client_config.retries || (packet_num < client_config.retries)) {
- 					/* send request packet */
- 					if (state == RENEW_REQUESTED)
- 						send_renew(xid, server_addr, requested_ip); /* unicast */
+-				if (packet_num < discover_retries) {
++				if (!discover_retries || packet_num < discover_retries) {
+ 					/* send broadcast select packet */
+ 					send_select(xid, server_addr, requested_ip);
+ 					timeout = discover_timeout;