diff options
| author | Beniamino Galvani <bgalvani@redhat.com> | 2019-11-18 11:33:43 +0100 |
|---|---|---|
| committer | Beniamino Galvani <bgalvani@redhat.com> | 2019-11-18 19:07:42 +0100 |
| commit | e2607477b4b60719bcbf18ad280520a7b4b19ccb (patch) | |
| tree | fa77b19ce2b10da8564e259cc6cba9a3e271fd47 | |
| parent | a65982c5ad7c15681fb6670b7a449380fce33c51 (diff) | |
| download | NetworkManager-bg/activation-wait-disconnect-rh1772960.tar.gz | |
device: check for disconnected state before activating NMActRequestbg/activation-wait-disconnect-rh1772960
When a new activation request comes and the device is currently
activated, we move the device state to 'deactivating' and wait that it
reaches 'disconnected' before starting the new activation request.
In the meantime, a carrier change could happen but still we have to
wait that device finishes any pending deactivation.
https://bugzilla.redhat.com/show_bug.cgi?id=1772960
| -rw-r--r-- | src/devices/nm-device.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/devices/nm-device.c b/src/devices/nm-device.c index 7c6e89fd53..d589447611 100644 --- a/src/devices/nm-device.c +++ b/src/devices/nm-device.c @@ -12355,7 +12355,7 @@ _carrier_wait_check_queued_act_request (NMDevice *self) _LOGD (LOGD_DEVICE, "Cancel queued activation request as we have no carrier after timeout"); _clear_queued_act_request (priv, NM_ACTIVE_CONNECTION_STATE_REASON_DEVICE_DISCONNECTED); - } else { + } else if (priv->state == NM_DEVICE_STATE_DISCONNECTED) { gs_unref_object NMActRequest *queued_req = NULL; _LOGD (LOGD_DEVICE, "Activate queued activation request as we now have carrier"); |