Mercurial > hg > dhcpcd

changeset 1903:783adb9e45cc draft

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Don't crash when disabling IPv6
author Roy Marples <roy@marples.name>
date Thu, 04 Apr 2013 23:25:31 +0000
parents 5ebd3a527c2b
children 95b690395b34
files dhcpcd.c
diffstat 1 files changed, 4 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/dhcpcd.c	Thu Apr 04 22:07:48 2013 +0000
+++ b/dhcpcd.c	Thu Apr 04 23:25:31 2013 +0000
@@ -425,11 +425,11 @@
 		return;
 	}
 
-	if (options & DHCPCD_IPV6RS && ifo->options & DHCPCD_IPV6RS &&
-	    !(ifo->options & DHCPCD_INFORM))
-		ipv6rs_start(ifp);
+	if (ifo->options & DHCPCD_IPV6) {
+		if (ifo->options & DHCPCD_IPV6RS &&
+		    !(ifo->options & DHCPCD_INFORM))
+			ipv6rs_start(ifp);
 
-	if (ifo->options & DHCPCD_IPV6) {
 		if (!(ifo->options & DHCPCD_IPV6RS)) {
 			if (ifo->options & DHCPCD_IA_FORCED)
 				nolease = dhcp6_start(ifp, 1);