summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoy Marples <roy@marples.name>2012-01-29 16:32:06 +0000
committerRoy Marples <roy@marples.name>2012-01-29 16:32:06 +0000
commit0c6ad7828843227c2e377ef3fa206f437e472a5a (patch)
tree98c9bb72d76520dbd227f89051066b3414a162f8
parentc46132f64e2075ffc4da50c8f341aacaaca70822 (diff)
downloaddhcpcd-0c6ad7828843227c2e377ef3fa206f437e472a5a.tar.xz
Don't start IPv6 if it's disabled globally.
-rw-r--r--dhcpcd.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/dhcpcd.c b/dhcpcd.c
index 01db7d51..090a429b 100644
--- 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) {