summaryrefslogtreecommitdiffstats
path: root/dhcpcd.c
diff options
context:
space:
mode:
authorRoy Marples <roy@marples.name>2013-04-04 23:25:31 +0000
committerRoy Marples <roy@marples.name>2013-04-04 23:25:31 +0000
commit66cf1d5db5bbbd531737f4f639fd554a99bf5473 (patch)
tree9e1ae53a41831531164b4a3d91697fe4a3354b95 /dhcpcd.c
parentf08afbd8670446698f24bec1184aa0ce814f3927 (diff)
downloaddhcpcd-66cf1d5db5bbbd531737f4f639fd554a99bf5473.tar.xz
Don't crash when disabling IPv6
Diffstat (limited to 'dhcpcd.c')
-rw-r--r--dhcpcd.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/dhcpcd.c b/dhcpcd.c
index 8401cf10..f01c0a27 100644
--- a/dhcpcd.c
+++ b/dhcpcd.c
@@ -425,11 +425,11 @@ start_interface(void *arg)
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_IPV6RS)) {
if (ifo->options & DHCPCD_IA_FORCED)
nolease = dhcp6_start(ifp, 1);