From: Roy Marples <roy@marples.name>
Date: Sun, 29 Jan 2012 16:32:06 +0000 (+0000)
Subject: Don't start IPv6 if it's disabled globally.
X-Git-Tag: v5.5.1~6
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0c6ad7828843227c2e377ef3fa206f437e472a5a;p=thirdparty%2Fdhcpcd.git

Don't start IPv6 if it's disabled globally.
---

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) {