]> git.ipfire.org Git - thirdparty/dhcpcd.git/commitdiff
Don't start IPv6 if it's disabled globally.
authorRoy Marples <roy@marples.name>
Sun, 29 Jan 2012 16:32:06 +0000 (16:32 +0000)
committerRoy Marples <roy@marples.name>
Sun, 29 Jan 2012 16:32:06 +0000 (16:32 +0000)
dhcpcd.c

index 01db7d516cb775a19c999855ccb666c98ced3c27..090a429b1eae3b82721996aabff3757909082f42 100644 (file)
--- a/dhcpcd.c
+++ b/dhcpcd.c
@@ -1162,7 +1162,7 @@ start_interface(void *arg)
        free(iface->state->offer);
        iface->state->offer = NULL;
 
-       if (ifo->options & DHCPCD_IPV6RS)
+       if (options & DHCPCD_IPV6RS && ifo->options & DHCPCD_IPV6RS)
                ipv6rs_start(iface);
 
        if (iface->state->arping_index < ifo->arping_len) {