From: Roy Marples <roy@marples.name>
Date: Wed, 2 Jul 2014 10:57:18 +0000 (+0000)
Subject: Minor optimisation
X-Git-Tag: v6.4.1~38
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=0a016005514bc8d5197ac302a999c74c30e53bf7;p=thirdparty%2Fdhcpcd.git

Minor optimisation
---

diff --git a/dhcp.c b/dhcp.c
index e3ff367c..d4ba47c9 100644
--- a/dhcp.c
+++ b/dhcp.c
@@ -3002,17 +3002,18 @@ dhcp_start(struct interface *ifp)
 	if (ifp->options->options & DHCPCD_STATIC &&
 	    !(ifp->options->options & DHCPCD_INFORM))
 	{
-		dhcp_start1(ifp);
-		return;
+		tv.tv_sec = 0;
+		tv.tv_usec = 0;
+	} else {
+		tv.tv_sec = DHCP_MIN_DELAY;
+		tv.tv_usec = (suseconds_t)arc4random_uniform(
+		    (DHCP_MAX_DELAY - DHCP_MIN_DELAY) * 1000000);
+		timernorm(&tv);
+		syslog(LOG_DEBUG,
+		    "%s: delaying DHCP for %0.1f seconds",
+		    ifp->name, timeval_to_double(&tv));
 	}
 
-	tv.tv_sec = DHCP_MIN_DELAY;
-	tv.tv_usec = (suseconds_t)arc4random_uniform(
-	    (DHCP_MAX_DELAY - DHCP_MIN_DELAY) * 1000000);
-	timernorm(&tv);
-	syslog(LOG_DEBUG,
-	    "%s: delaying DHCP for %0.1f seconds",
-	    ifp->name, timeval_to_double(&tv));
 	eloop_timeout_add_tv(ifp->ctx->eloop, &tv, dhcp_start1, ifp);
 }