From: Roy Marples <roy@marples.name>
Date: Tue, 12 Dec 2017 13:38:43 +0000 (+0000)
Subject: ipv6: disable kernel RA if interface is active
X-Git-Tag: v7.0.0~3
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d2cdc1e130fffb05f409ba81ab92723146841c91;p=thirdparty%2Fdhcpcd.git

ipv6: disable kernel RA if interface is active
---

diff --git a/src/dhcpcd.c b/src/dhcpcd.c
index 6ce077f7..d29cc508 100644
--- a/src/dhcpcd.c
+++ b/src/dhcpcd.c
@@ -438,7 +438,7 @@ configure_interface1(struct interface *ifp)
 		    ~(DHCPCD_IPV6RS | DHCPCD_DHCP6 | DHCPCD_WAITIP6);
 
 	/* We want to disable kernel interface RA as early as possible. */
-	if (ifo->options & DHCPCD_IPV6RS &&
+	if (ifp->active == IF_ACTIVE_USER &&
 	    !(ifp->ctx->options & DHCPCD_DUMPLEASE))
 	{
 		int ra_global, ra_iface;