summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLubomir Rintel <lkundrak@v3.sk>2015-12-11 13:24:07 +0100
committerLubomir Rintel <lkundrak@v3.sk>2015-12-11 13:24:07 +0100
commit785c263c18fb48ec9eb14a17631af8dbc1147553 (patch)
treee33b655a5c4201d3e91b1f2259ddae10e9331974
parent7873b1761de362a66e3b09eacf470ce6e3360068 (diff)
downloadNetworkManager-785c263c18fb48ec9eb14a17631af8dbc1147553.tar.gz
device: do the LL check when the device is disconnected
An IPv6 address might have been added externally and the device is yet to traverse to a connected state. On the other hand, the externally added devices still traverse through DISCONNECTED state and we don't want to attempt the LL addition there. Let's check if the link still exists instead.
-rw-r--r--src/devices/nm-device.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/devices/nm-device.c b/src/devices/nm-device.c
index b993a063a5..beca18b4f7 100644
--- a/src/devices/nm-device.c
+++ b/src/devices/nm-device.c
@@ -8221,7 +8221,7 @@ queued_ip6_config_change (gpointer user_data)
g_object_ref (self);
update_ip6_config (self, FALSE);
- if ( priv->state > NM_DEVICE_STATE_DISCONNECTED
+ if ( nm_platform_link_get (NM_PLATFORM_GET, priv->ifindex)
&& priv->state < NM_DEVICE_STATE_DEACTIVATING) {
/* Handle DAD falures */
for (iter = priv->dad6_failed_addrs; iter; iter = g_slist_next (iter)) {