device: only clear the activate request when the device disconnects
authorLubomir Rintel <lkundrak@v3.sk>
Wed, 23 Mar 2016 13:51:34 +0000 (14:51 +0100)
committerLubomir Rintel <lkundrak@v3.sk>
Sat, 26 Mar 2016 10:29:41 +0000 (11:29 +0100)
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.

src/devices/nm-device.c

index 583218f..19c1599 100644 (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 */