changeset 2559:a9188e42b807 draft

Minor optimisation
author Roy Marples <roy@marples.name>
date Wed, 02 Jul 2014 10:57:18 +0000
parents 044ce7911580
children 0703537a18a3
files dhcp.c
diffstat 1 files changed, 10 insertions(+), 9 deletions(-) [+]
line wrap: on
line diff
--- a/dhcp.c	Wed Jul 02 10:51:31 2014 +0000
+++ b/dhcp.c	Wed Jul 02 10:57:18 2014 +0000
@@ -3002,17 +3002,18 @@
 	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);
 }