From bb0b6bcc6fe6f212272a24d5a5ff6a3b3ec3ec42 Mon Sep 17 00:00:00 2001 From: Dan Williams Date: Fri, 19 Dec 2014 11:13:45 -0600 Subject: [PATCH] Revert "core: force disable_ipv6=0 when turning on userspace IPv6LL" This reverts commit 45434c0f2a8a5f71c2aca9f91df139eaeee1b3c1. Mistaken push, not committing this yet so close to release. --- src/devices/nm-device.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/devices/nm-device.c b/src/devices/nm-device.c index 119d4a85c1..a9899535df 100644 --- a/src/devices/nm-device.c +++ b/src/devices/nm-device.c @@ -4345,12 +4345,11 @@ set_nm_ipv6ll (NMDevice *self, gboolean enable) if (enable) { /* Bounce IPv6 to ensure the kernel stops IPv6LL address generation */ value = nm_platform_sysctl_get (nm_utils_ip6_property_path (iface, "disable_ipv6")); - if (g_strcmp0 (value, "0") == 0) + if (g_strcmp0 (value, "0") == 0) { nm_device_ipv6_sysctl_set (self, "disable_ipv6", "1"); + nm_device_ipv6_sysctl_set (self, "disable_ipv6", "0"); + } g_free (value); - - /* Ensure IPv6 is enabled */ - nm_device_ipv6_sysctl_set (self, "disable_ipv6", "0"); } }