From 216b28d7ff6c4b3196c1cbb258a746cdc40efdae Mon Sep 17 00:00:00 2001 From: Lubomir Rintel Date: Wed, 1 Apr 2015 06:46:55 -0400 Subject: [PATCH] device: progress the device activation if it has a valid assumed connection If we detect a LL address and this not decide to readd it, don't stop at ip-config; progress to ip-check. Fixes: 396dc2b3b40f9b33e9c55f8e72bb192739983476 (cherry picked from commit dc1928a0d0d8cb4ab9f286d61cbef1b25eb71676) --- src/devices/nm-device.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/devices/nm-device.c b/src/devices/nm-device.c index d8bb2247a9..6bd0a99303 100644 --- a/src/devices/nm-device.c +++ b/src/devices/nm-device.c @@ -4672,6 +4672,8 @@ nm_device_activate_stage3_ip6_start (NMDevice *self) } else if (ret == NM_ACT_STAGE_RETURN_FINISH) { /* Early finish, nothing more to do */ priv->ip6_state = IP_DONE; + if (nm_device_get_state (self) == NM_DEVICE_STATE_IP_CONFIG) + nm_device_state_changed (self, NM_DEVICE_STATE_IP_CHECK, NM_DEVICE_STATE_REASON_NONE); } else if (ret == NM_ACT_STAGE_RETURN_WAIT) { /* Wait for something to try IP config again */ priv->ip6_state = IP_WAIT;