]> git.ipfire.org Git - thirdparty/dhcpcd.git/commitdiff
Fix disabling IPv6 on start error.
authorRoy Marples <roy@marples.name>
Mon, 3 Nov 2014 11:50:11 +0000 (11:50 +0000)
committerRoy Marples <roy@marples.name>
Mon, 3 Nov 2014 11:50:11 +0000 (11:50 +0000)
dhcpcd.c

index 97330af0a823cce83f57273b8f518867890b0fa2..22da5ab52ce2e2a1c5e38a8da9ec0d0f464c4b2a 100644 (file)
--- a/dhcpcd.c
+++ b/dhcpcd.c
@@ -624,7 +624,7 @@ pre_start(struct interface *ifp)
         * from under us. */
        if (ifp->options->options & DHCPCD_IPV6 && ipv6_start(ifp) == -1) {
                syslog(LOG_ERR, "%s: ipv6_start: %m", ifp->name);
-               ifp->options->options &= DHCPCD_IPV6;
+               ifp->options->options &= ~DHCPCD_IPV6;
        }
 }
 
@@ -801,7 +801,7 @@ dhcpcd_initstate1(struct interface *ifp, int argc, char **argv)
         * inadvertently ups the interface. */
        if (ifo->options & DHCPCD_IPV6 && ipv6_start(ifp) == -1) {
                syslog(LOG_ERR, "%s: ipv6_start: %m", ifp->name);
-               ifo->options &= DHCPCD_IPV6;
+               ifo->options &= ~DHCPCD_IPV6;
        }
 }