]> git.ipfire.org Git - thirdparty/dhcpcd.git/commitdiff
Minor optimisation
authorRoy Marples <roy@marples.name>
Wed, 2 Jul 2014 10:57:18 +0000 (10:57 +0000)
committerRoy Marples <roy@marples.name>
Wed, 2 Jul 2014 10:57:18 +0000 (10:57 +0000)
dhcp.c

diff --git a/dhcp.c b/dhcp.c
index e3ff367cd71b4ebec6b86ca9446e841ce01ed102..d4ba47c9b6acf638c2f554129e2256d530290733 100644 (file)
--- 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);
 }