From: Roy Marples <roy@marples.name>
Date: Fri, 17 Oct 2014 20:56:21 +0000 (+0000)
Subject: Delay IPv4LL by a potential DHCP delay as well.
X-Git-Tag: v6.5.1~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=878a75fdb6622a0286ce25175f5b9336d4e0a8a0;p=thirdparty%2Fdhcpcd.git

Delay IPv4LL by a potential DHCP delay as well.
---

diff --git a/dhcpcd.c b/dhcpcd.c
index 5a9d4305..7e1844c5 100644
--- a/dhcpcd.c
+++ b/dhcpcd.c
@@ -204,7 +204,7 @@ handle_exit_timeout(void *arg)
 		return;
 	}
 	ctx->options &= ~DHCPCD_TIMEOUT_IPV4LL;
-	timeout = (PROBE_NUM * PROBE_MAX) + (PROBE_WAIT * 2);
+	timeout = (PROBE_NUM * PROBE_MAX) + (PROBE_WAIT * 2) + DHCP_MAX_DELAY;
 	syslog(LOG_WARNING, "allowing %d seconds for IPv4LL timeout", timeout);
 	eloop_timeout_add_sec(ctx->eloop, timeout, handle_exit_timeout, ctx);
 }