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

device: get rid of ipv4ll_timeout_remove()

Browse source 
nm_clear_g_source() already does that.
This commit is contained in:
Beniamino Galvani 2015-10-07 17:40:34 +02:00
parent e6d7fee5a6
commit 296ea386bf
1 changed files with 2 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -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)) {