From: Roy Marples <roy@marples.name>
Date: Sat, 26 Jun 2010 10:36:20 +0000 (+0000)
Subject: Rever prior patch that added an extra second per interface now we
X-Git-Tag: v5.2.6~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=74e4ea256f24b8c7fe546abf95e88e21517fca45;p=thirdparty%2Fdhcpcd.git

Rever prior patch that added an extra second per interface now we
always daemonise in master mode.
---

diff --git a/dhcpcd.c b/dhcpcd.c
index 11db53af..3759722d 100644
--- a/dhcpcd.c
+++ b/dhcpcd.c
@@ -195,7 +195,6 @@ void
 handle_exit_timeout(_unused void *arg)
 {
 	int timeout;
-	struct interface *ifp;
 
 	syslog(LOG_ERR, "timed out");
 	if (!(options & DHCPCD_TIMEOUT_IPV4LL)) {
@@ -207,9 +206,6 @@ handle_exit_timeout(_unused void *arg)
 	}
 	options &= ~DHCPCD_TIMEOUT_IPV4LL;
 	timeout = (PROBE_NUM * PROBE_MAX) + PROBE_WAIT + 1;
-	/* Add an extra second per interface */
-	for (ifp = ifaces; ifp; ifp = ifp->next)
-		timeout++;
 	syslog(LOG_WARNING, "allowing %d seconds for IPv4LL timeout", timeout);
 	add_timeout_sec(timeout, handle_exit_timeout, NULL);
 }