fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-05-09 05:58:01 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

device: minor cleanup of carrier_disconnected_action_cancel()

Browse source
This commit is contained in:
Thomas Haller 2017-05-12 16:22:47 +02:00
parent a07c6255a0
commit 6c5d883a4b
1 changed files with 4 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/devices/nm-device.c
View file

@ -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); _LOGD (LOGD_DEVICE, "link disconnected (calling deferred action) (id=%u)", priv->carrier_defer_id);
priv->carrier_defer_id = 0; priv->carrier_defer_id = 0;
carrier_changed (self, FALSE); carrier_changed (self, FALSE);
return FALSE; return FALSE;
} }
@ -2267,11 +2265,11 @@ static void
carrier_disconnected_action_cancel (NMDevice *self) carrier_disconnected_action_cancel (NMDevice *self)
{ {
NMDevicePrivate *priv = NM_DEVICE_GET_PRIVATE (self); NMDevicePrivate *priv = NM_DEVICE_GET_PRIVATE (self);
guint id = priv->carrier_defer_id;
if (priv->carrier_defer_id) { if (nm_clear_g_source (&priv->carrier_defer_id)) {
g_source_remove (priv->carrier_defer_id); _LOGD (LOGD_DEVICE, "link disconnected (canceling deferred action) (id=%u)",
_LOGD (LOGD_DEVICE, "link disconnected (canceling deferred action) (id=%u)", priv->carrier_defer_id); id);
priv->carrier_defer_id = 0;
} }
} }