]> git.ipfire.org Git - thirdparty/dhcpcd.git/commitdiff
No point in delaying a static configuration
authorRoy Marples <roy@marples.name>
Wed, 2 Jul 2014 10:51:31 +0000 (10:51 +0000)
committerRoy Marples <roy@marples.name>
Wed, 2 Jul 2014 10:51:31 +0000 (10:51 +0000)
dhcp.c

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