diff options
| author | Thomas Haller <thaller@redhat.com> | 2015-12-09 12:13:19 +0100 |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2015-12-09 12:42:50 +0100 |
| commit | e967cbd0bfee929f7352ced380066e864782ca45 (patch) | |
| tree | fdab9c818a767f560ed4fb3fe266a334cc655467 | |
| parent | 2d1d187493365316c216743c365077e0220259b0 (diff) | |
| download | NetworkManager-e967cbd0bfee929f7352ced380066e864782ca45.tar.gz | |
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.
| -rw-r--r-- | src/nm-manager.c | 2 |
1 files changed, 1 insertions, 1 deletions
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, |