device: properly cancel queued activation request

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: 0bfe635119
This commit is contained in:
Thomas Haller 2015-10-19 15:16:20 +02:00
parent 118de885ea
commit 839330cd39

View file

@ -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;