diff options
| author | Lubomir Rintel <lkundrak@v3.sk> | 2015-04-01 06:46:55 -0400 |
|---|---|---|
| committer | Lubomir Rintel <lkundrak@v3.sk> | 2015-04-01 14:59:16 +0200 |
| commit | dc1928a0d0d8cb4ab9f286d61cbef1b25eb71676 (patch) | |
| tree | f289ac2b3335e8103dd922bab961570dc191e5e4 | |
| parent | b6f5f030331cc680edbe19ae322e894494d63687 (diff) | |
| download | NetworkManager-dc1928a0d0d8cb4ab9f286d61cbef1b25eb71676.tar.gz | |
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
| -rw-r--r-- | src/devices/nm-device.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/devices/nm-device.c b/src/devices/nm-device.c index bf10abe6c5..bc5406a2ed 100644 --- a/src/devices/nm-device.c +++ b/src/devices/nm-device.c @@ -4803,6 +4803,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; |