diff options
| author | Lubomir Rintel <lkundrak@v3.sk> | 2016-03-23 14:51:34 +0100 |
|---|---|---|
| committer | Lubomir Rintel <lkundrak@v3.sk> | 2016-03-26 11:29:41 +0100 |
| commit | 2a45d30cc535e1809ab730bb28fd0b571fcd7610 (patch) | |
| tree | 14643fbc080ee82e0cd6df415d1e412ce25565ef | |
| parent | 621975949024520c71215fe17c7d2ffc86e4efbd (diff) | |
| download | NetworkManager-2a45d30cc535e1809ab730bb28fd0b571fcd7610.tar.gz | |
device: only clear the activate request when the device disconnects
If it's traversing from unavailable to disconnected (e.g. realizing
of the device was delayed because it was awaiting the parent connection),
then we just want to progress the activation.
| -rw-r--r-- | src/devices/nm-device.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/devices/nm-device.c b/src/devices/nm-device.c index 583218f6d1..19c15992d2 100644 --- a/src/devices/nm-device.c +++ b/src/devices/nm-device.c @@ -10400,7 +10400,8 @@ _set_state_full (NMDevice *self, if (state <= NM_DEVICE_STATE_UNAVAILABLE) { if (available_connections_del_all (self)) available_connections_notify (self); - _clear_queued_act_request (priv); + if (old_state > NM_DEVICE_STATE_UNAVAILABLE) + _clear_queued_act_request (priv); } /* Update the available connections list when a device first becomes available */ |