colin/NetworkManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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().
This commit is contained in:
Lubomir Rintel
2015-03-12 07:02:48 +01:00
parent d2de83e0f7
commit a772fde00d
1 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -5399,6 +5399,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)
{ {
@@ -6906,18 +6918,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