diff options
| author | Thomas Haller <thaller@redhat.com> | 2015-10-19 15:16:20 +0200 |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2015-10-19 15:17:42 +0200 |
| commit | 839330cd39df8bb1c54cb35ce81f7c381b9090d1 (patch) | |
| tree | 28d2fa09716bc21c264b7cad3dd9755d12548dfd | |
| parent | 118de885eab0a161db291f1c2fb14690b891b00e (diff) | |
| download | NetworkManager-th/wait-carrier-rh1079353.tar.gz | |
device: properly cancel queued activation requestth/wait-carrier-rh1079353
We would leak the NMActivationRequest when carrier didn't
come within timeout. We must properly set the state of the
activation request.
https://bugzilla.redhat.com/show_bug.cgi?id=1079353
Fixes: 0bfe635119facb8514e8f5824f599f4c4c3514e2
| -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 7c77c9ca80..7338ff5ffb 100644 --- a/src/devices/nm-device.c +++ b/src/devices/nm-device.c @@ -6622,7 +6622,7 @@ _carrier_wait_check_queued_act_request (NMDevice *self) priv->queued_act_request_is_waiting_for_carrier = FALSE; if (!priv->carrier) { _LOGD (LOGD_DEVICE, "Cancel queued activation request as we have no carrier after timeout"); - g_clear_object (&priv->queued_act_request); + _clear_queued_act_request (priv); } else { _LOGD (LOGD_DEVICE, "Activate queued activation request as we now have carrier"); queued_req = priv->queued_act_request; |