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

trivial: move nm_device_queued_ip_config_change_clear()

Browse source 
Just move it upwards, we'll need it in
nm_device_activate_schedule_ip4_config_result().

(cherry picked from commit a772fde00d)
This commit is contained in:
Lubomir Rintel 2015-03-12 07:02:48 +01:00 • committed by Thomas Haller
parent e23fda7a07
commit bdf4ea8aa5
1 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -5527,6 +5527,18 @@ out:
return FALSE; return FALSE;
} }
static void
nm_device_queued_ip_config_change_clear (NMDevice *self)
{
NMDevicePrivate *priv = NM_DEVICE_GET_PRIVATE (self);
if (priv->queued_ip_config_id) {
_LOGD (LOGD_DEVICE, "clearing queued IP config change");
g_source_remove (priv->queued_ip_config_id);
priv->queued_ip_config_id = 0;
}
}
void void
nm_device_activate_schedule_ip4_config_result (NMDevice *self, NMIP4Config *config) nm_device_activate_schedule_ip4_config_result (NMDevice *self, NMIP4Config *config)
{ {
@ -6998,18 +7010,6 @@ device_ip_changed (NMPlatform *platform,
} }
} }
static void
nm_device_queued_ip_config_change_clear (NMDevice *self)
{
NMDevicePrivate *priv = NM_DEVICE_GET_PRIVATE (self);
if (priv->queued_ip_config_id) {
_LOGD (LOGD_DEVICE, "clearing queued IP config change");
g_source_remove (priv->queued_ip_config_id);
priv->queued_ip_config_id = 0;
}
}
/** /**
* nm_device_get_managed(): * nm_device_get_managed():
* @self: the #NMDevice * @self: the #NMDevice