From 391fb0f0f2d569e3f8dd23e6b99fdf7743760d09 Mon Sep 17 00:00:00 2001
From: Dan Williams <dcbw@redhat.com>
Date: Wed, 5 May 2010 13:20:18 -0700
Subject: [PATCH] ip6: set accept_ra to initial value for ignored connections
 (rh #588619)

---
 src/nm-device.c | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/nm-device.c b/src/nm-device.c
index 30429030ac..7d9913d478 100644
--- a/src/nm-device.c
+++ b/src/nm-device.c
@@ -1656,6 +1656,12 @@ real_act_stage3_ip6_config_start (NMDevice *self, NMDeviceStateReason *reason)
 		priv->dhcp6_mode = IP6_DHCP_OPT_MANAGED;
 		ret = dhcp6_start (self, connection, priv->dhcp6_mode, reason);
 	} else if (ip6_method_matches (connection, NM_SETTING_IP6_CONFIG_METHOD_IGNORE)) {
+		/* reset the saved RA value when ipv6 is ignored */
+		if (priv->ip6_accept_ra_path) {
+			nm_utils_do_sysctl (priv->ip6_accept_ra_path,
+			                    priv->ip6_accept_ra_save ? "1\n" : "0\n");
+		}
+
 		priv->ip6_ready = TRUE;
 		ret = NM_ACT_STAGE_RETURN_STOP;
 	} else if (ip6_method_matches (connection, NM_SETTING_IP6_CONFIG_METHOD_MANUAL)) {