From 296ea386bf24aac2a48fb7cb6a629a4d437813cd Mon Sep 17 00:00:00 2001 From: Beniamino Galvani Date: Wed, 7 Oct 2015 17:40:34 +0200 Subject: [PATCH] device: get rid of ipv4ll_timeout_remove() nm_clear_g_source() already does that. --- src/devices/nm-device.c | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) diff --git a/src/devices/nm-device.c b/src/devices/nm-device.c index fe48260a7d..c588ade47f 100644 --- a/src/devices/nm-device.c +++ b/src/devices/nm-device.c @@ -3175,17 +3175,6 @@ nm_device_check_ip_failed (NMDevice *self, gboolean may_fail) /*********************************************/ /* IPv4LL stuff */ -static void -ipv4ll_timeout_remove (NMDevice *self) -{ - NMDevicePrivate *priv = NM_DEVICE_GET_PRIVATE (self); - - if (priv->ipv4ll_timeout) { - g_source_remove (priv->ipv4ll_timeout); - priv->ipv4ll_timeout = 0; - } -} - static void ipv4ll_cleanup (NMDevice *self) { @@ -3197,7 +3186,7 @@ ipv4ll_cleanup (NMDevice *self) priv->ipv4ll = sd_ipv4ll_unref (priv->ipv4ll); } - ipv4ll_timeout_remove (self); + nm_clear_g_source (&priv->ipv4ll_timeout); } static NMIP4Config * @@ -3278,7 +3267,7 @@ nm_device_handle_ipv4ll_event (sd_ipv4ll *ll, int event, void *data) } if (priv->ip4_state == IP_CONF) { - ipv4ll_timeout_remove (self); + nm_clear_g_source (&priv->ipv4ll_timeout); nm_device_activate_schedule_ip4_config_result (self, config); } else if (priv->ip4_state == IP_DONE) { if (!ip4_config_merge_and_apply (self, config, TRUE, NULL)) {