From 57ab02b754ca5ec963e78e1e2a548a88a797ae18 Mon Sep 17 00:00:00 2001
From: Felix Fietkau <nbd@openwrt.org>
Date: Thu, 9 Nov 2006 23:41:50 +0000
Subject: [PATCH] add support for -t 0 (infinite retry) in busybox udhcpc and
 use it in the network scripts

SVN-Revision: 5493
---
 .../base-files/default/lib/network/config.sh  |  2 +-
 .../busybox/patches/240-udhcpc_retries.patch  | 21 +++++++++++++++++++
 2 files changed, 22 insertions(+), 1 deletion(-)
 create mode 100644 package/busybox/patches/240-udhcpc_retries.patch

diff --git a/package/base-files/default/lib/network/config.sh b/package/base-files/default/lib/network/config.sh
index 32558de8f3..762ca8bc1e 100755
--- a/package/base-files/default/lib/network/config.sh
+++ b/package/base-files/default/lib/network/config.sh
@@ -143,7 +143,7 @@ setup_interface() {
 
 			# don't stay running in background if dhcp is not the main proto on the interface (e.g. when using pptp)
 			[ "$proto1" != "$proto" ] && dhcpopts="-n -q"
-			$DEBUG udhcpc -i "$iface" ${ipaddr:+-r $ipaddr} ${hostname:+-H $hostname} -b -p "$pidfile" ${dhcpopts:- -R &}
+			$DEBUG udhcpc -t 0 -i "$iface" ${ipaddr:+-r $ipaddr} ${hostname:+-H $hostname} -b -p "$pidfile" ${dhcpopts:- -R &}
 			lock -u "/var/lock/dhcp-$iface"
 		;;
 		*)
diff --git a/package/busybox/patches/240-udhcpc_retries.patch b/package/busybox/patches/240-udhcpc_retries.patch
new file mode 100644
index 0000000000..3142eac6e1
--- /dev/null
+++ b/package/busybox/patches/240-udhcpc_retries.patch
@@ -0,0 +1,21 @@
+diff -ur busybox.old/networking/udhcp/dhcpc.c busybox.dev/networking/udhcp/dhcpc.c
+--- busybox.old/networking/udhcp/dhcpc.c	2006-11-10 00:17:26.000000000 +0100
++++ busybox.dev/networking/udhcp/dhcpc.c	2006-11-10 00:17:10.000000000 +0100
+@@ -330,7 +330,7 @@
+ 			/* timeout dropped to zero */
+ 			switch (state) {
+ 			case INIT_SELECTING:
+-				if (packet_num < client_config.retries) {
++				if (!client_config.retries || (packet_num < client_config.retries)) {
+ 					if (packet_num == 0)
+ 						xid = random_xid();
+ 
+@@ -355,7 +355,7 @@
+ 				break;
+ 			case RENEW_REQUESTED:
+ 			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 */
-- 
2.25.1