From e967cbd0bfee929f7352ced380066e864782ca45 Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Wed, 9 Dec 2015 12:13:19 +0100 Subject: [PATCH] device: during activating device transit to DISCONNECTED state When activating a device, we must progress the device state to disconnected state. This matters when activating a device without carrier. In this case we would have skipped DISCONNECTED state. Skipping the device state then leads to other issues like a slave device never noticing that the master got ready. --- src/nm-manager.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/nm-manager.c b/src/nm-manager.c index 27aa603e79..33b97fc4aa 100644 --- a/src/nm-manager.c +++ b/src/nm-manager.c @@ -2808,7 +2808,7 @@ _internal_activate_device (NMManager *self, NMActiveConnection *active, GError * NM_DEVICE_STATE_REASON_USER_REQUESTED); } - if ( nm_device_is_available (device, NM_DEVICE_CHECK_DEV_AVAILABLE_NONE) + if ( nm_device_is_available (device, NM_DEVICE_CHECK_DEV_AVAILABLE_FOR_USER_REQUEST) && (nm_device_get_state (device) == NM_DEVICE_STATE_UNAVAILABLE)) { nm_device_state_changed (device, NM_DEVICE_STATE_DISCONNECTED,