From: Lubomir Rintel <lkundrak@v3.sk>
Date: Wed, 23 Mar 2016 13:51:34 +0000 (+0100)
Subject: device: only clear the activate request when the device disconnects
X-Git-Url: https://iam.tj/gitweb/gitweb.cgi?p=NetworkManager.git;a=commitdiff_plain;h=2a45d30cc535e1809ab730bb28fd0b571fcd7610

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.
---

diff --git a/src/devices/nm-device.c b/src/devices/nm-device.c
index 583218f6d..19c15992d 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 */