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.
This commit is contained in:
Lubomir Rintel 2016-03-23 14:51:34 +01:00
parent 6219759490
commit 2a45d30cc5

View file

@ -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 */