changeset 2828:86cae86b30bb draft

Fix disabling IPv6 on start error.
author Roy Marples <roy@marples.name>
date Mon, 03 Nov 2014 11:50:11 +0000
parents c93e8882c7f1
children 423f369d00df
files dhcpcd.c
diffstat 1 files changed, 2 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/dhcpcd.c	Wed Oct 29 00:53:02 2014 +0000
+++ b/dhcpcd.c	Mon Nov 03 11:50:11 2014 +0000
@@ -624,7 +624,7 @@
 	 * from under us. */
 	if (ifp->options->options & DHCPCD_IPV6 && ipv6_start(ifp) == -1) {
 		syslog(LOG_ERR, "%s: ipv6_start: %m", ifp->name);
-		ifp->options->options &= DHCPCD_IPV6;
+		ifp->options->options &= ~DHCPCD_IPV6;
 	}
 }
 
@@ -801,7 +801,7 @@
 	 * inadvertently ups the interface. */
 	if (ifo->options & DHCPCD_IPV6 && ipv6_start(ifp) == -1) {
 		syslog(LOG_ERR, "%s: ipv6_start: %m", ifp->name);
-		ifo->options &= DHCPCD_IPV6;
+		ifo->options &= ~DHCPCD_IPV6;
 	}
 }