From: Roy Marples <roy@marples.name>
Date: Thu, 8 Oct 2009 07:07:25 +0000 (+0000)
Subject: Timeout should not automagically increase when using IPv4LL.
X-Git-Tag: v5.1.2~17
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=26071224a25bd9e536ec0c2683d1c3f2cad683d7;p=thirdparty%2Fdhcpcd.git

Timeout should not automagically increase when using IPv4LL.
If we need extra we should handle that at handle_exit_timeout() and log.
---

diff --git a/dhcpcd.c b/dhcpcd.c
index 7d2d5b12..cff3fde4 100644
--- a/dhcpcd.c
+++ b/dhcpcd.c
@@ -1766,10 +1766,7 @@ main(int argc, char **argv)
 	{
 		daemonise();
 	} else if (options & DHCPCD_DAEMONISE && ifo->timeout > 0) {
-		oi = ifo->timeout;
-		if (ifo->options & DHCPCD_IPV4LL)
-			oi += 10;
-		add_timeout_sec(oi, handle_exit_timeout, NULL);
+		add_timeout_sec(ifo->timeout, handle_exit_timeout, NULL);
 	}
 	free_options(ifo);