From 6c5d883a4bd9ef167ee4fe8ec2b0187c7bc77142 Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Fri, 12 May 2017 16:22:47 +0200 Subject: [PATCH] device: minor cleanup of carrier_disconnected_action_cancel() --- src/devices/nm-device.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/src/devices/nm-device.c b/src/devices/nm-device.c index 49becc994e..028808cb44 100644 --- a/src/devices/nm-device.c +++ b/src/devices/nm-device.c @@ -2257,9 +2257,7 @@ carrier_disconnected_action_cb (gpointer user_data) _LOGD (LOGD_DEVICE, "link disconnected (calling deferred action) (id=%u)", priv->carrier_defer_id); priv->carrier_defer_id = 0; - carrier_changed (self, FALSE); - return FALSE; } @@ -2267,11 +2265,11 @@ static void carrier_disconnected_action_cancel (NMDevice *self) { NMDevicePrivate *priv = NM_DEVICE_GET_PRIVATE (self); + guint id = priv->carrier_defer_id; - if (priv->carrier_defer_id) { - g_source_remove (priv->carrier_defer_id); - _LOGD (LOGD_DEVICE, "link disconnected (canceling deferred action) (id=%u)", priv->carrier_defer_id); - priv->carrier_defer_id = 0; + if (nm_clear_g_source (&priv->carrier_defer_id)) { + _LOGD (LOGD_DEVICE, "link disconnected (canceling deferred action) (id=%u)", + id); } }