From 768d54bcc68218dd7cf35a4c819bdd1949316be0 Mon Sep 17 00:00:00 2001 From: Dan Williams Date: Tue, 6 Dec 2011 17:17:34 -0600 Subject: [PATCH] core: use right IP family when commiting IP configuration IPv6 needs to clear it's own activation chain, not IPv4's. --- src/nm-device.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/nm-device.c b/src/nm-device.c index 560125e83d..8f49f000c9 100644 --- a/src/nm-device.c +++ b/src/nm-device.c @@ -2567,7 +2567,7 @@ nm_device_activate_ip4_config_commit (gpointer user_data) int ifindex; /* Clear the activation source ID now that this stage has run */ - activation_source_clear (self, FALSE, 0); + activation_source_clear (self, FALSE, AF_INET); iface = nm_device_get_iface (self); nm_log_info (LOGD_DEVICE, "Activation (%s) Stage 5 of 5 (IPv4 Commit) started...", @@ -2726,7 +2726,7 @@ nm_device_activate_ip6_config_commit (gpointer user_data) int ifindex; /* Clear the activation source ID now that this stage has run */ - activation_source_clear (self, FALSE, 0); + activation_source_clear (self, FALSE, AF_INET6); iface = nm_device_get_iface (self); nm_log_info (LOGD_DEVICE, "Activation (%s) Stage 5 of 5 (IPv6 Commit) started...",