From: Roy Marples <roy@marples.name>
Date: Wed, 2 Jul 2014 10:51:31 +0000 (+0000)
Subject: No point in delaying a static configuration
X-Git-Tag: v6.4.1~39
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ddfe7a8d6becf975ffeec5267f90df5e6dcabd4e;p=thirdparty%2Fdhcpcd.git

No point in delaying a static configuration
---

diff --git a/dhcp.c b/dhcp.c
index 4f4fbb98..e3ff367c 100644
--- a/dhcp.c
+++ b/dhcp.c
@@ -2998,6 +2998,14 @@ dhcp_start(struct interface *ifp)
 	if (!(ifp->options->options & DHCPCD_IPV4))
 		return;
 
+	/* No point in delaying a static configuration */
+	if (ifp->options->options & DHCPCD_STATIC &&
+	    !(ifp->options->options & DHCPCD_INFORM))
+	{
+		dhcp_start1(ifp);
+		return;
+	}
+
 	tv.tv_sec = DHCP_MIN_DELAY;
 	tv.tv_usec = (suseconds_t)arc4random_uniform(
 	    (DHCP_MAX_DELAY - DHCP_MIN_DELAY) * 1000000);