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

device: refactor clearing @queued_ip4_config_id and @queued_ip6_config_id

Browse source 
(cherry picked from commit b6a92cbdc3)
This commit is contained in:
Thomas Haller 2016-05-05 10:58:10 +02:00
parent acf9bad08a
commit 6af508cebd
1 changed files with 9 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -6836,30 +6836,6 @@ activate_stage5_ip4_config_commit (NMDevice *self)
check_ip_done (self);
}
static void
queued_ip4_config_change_clear (NMDevice *self)
{
NMDevicePrivate *priv = NM_DEVICE_GET_PRIVATE (self);
if (priv->queued_ip4_config_id) {
_LOGD (LOGD_DEVICE, "clearing queued IP4 config change");
g_source_remove (priv->queued_ip4_config_id);
priv->queued_ip4_config_id = 0;
}
}
static void
queued_ip6_config_change_clear (NMDevice *self)
{
NMDevicePrivate *priv = NM_DEVICE_GET_PRIVATE (self);
if (priv->queued_ip6_config_id) {
_LOGD (LOGD_DEVICE, "clearing queued IP6 config change");
g_source_remove (priv->queued_ip6_config_id);
priv->queued_ip6_config_id = 0;
}
}
void
nm_device_activate_schedule_ip4_config_result (NMDevice *self, NMIP4Config *config)
{
@ -6872,7 +6848,9 @@ nm_device_activate_schedule_ip4_config_result (NMDevice *self, NMIP4Config *conf
if (config)
priv->dev_ip4_config = g_object_ref (config);
queued_ip4_config_change_clear (self);
if (nm_clear_g_source (&priv->queued_ip4_config_id))
_LOGD (LOGD_DEVICE, "clearing queued IP4 config change");
activation_source_schedule (self, activate_stage5_ip4_config_commit, AF_INET);
}
@ -7118,7 +7096,9 @@ _cleanup_ip4_pre (NMDevice *self, CleanupType cleanup_type)
NMDevicePrivate *priv = NM_DEVICE_GET_PRIVATE (self);
priv->ip4_state = IP_NONE;
queued_ip4_config_change_clear (self);
if (nm_clear_g_source (&priv->queued_ip4_config_id))
_LOGD (LOGD_DEVICE, "clearing queued IP4 config change");
dhcp4_cleanup (self, cleanup_type, FALSE);
arp_cleanup (self);
@ -7132,7 +7112,9 @@ _cleanup_ip6_pre (NMDevice *self, CleanupType cleanup_type)
NMDevicePrivate *priv = NM_DEVICE_GET_PRIVATE (self);
priv->ip6_state = IP_NONE;
queued_ip6_config_change_clear (self);
if (nm_clear_g_source (&priv->queued_ip6_config_id))
_LOGD (LOGD_DEVICE, "clearing queued IP6 config change");
dhcp6_cleanup (self, cleanup_type, FALSE);
linklocal6_cleanup (self);