From a772fde00d50e134500942aaf039cd4fa28951da Mon Sep 17 00:00:00 2001 From: Lubomir Rintel Date: Thu, 12 Mar 2015 07:02:48 +0100 Subject: [PATCH] trivial: move nm_device_queued_ip_config_change_clear() Just move it upwards, we'll need it in nm_device_activate_schedule_ip4_config_result(). --- src/devices/nm-device.c | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/src/devices/nm-device.c b/src/devices/nm-device.c index fa5c4db2a9..89832d6ec0 100644 --- a/src/devices/nm-device.c +++ b/src/devices/nm-device.c @@ -5399,6 +5399,18 @@ out: 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 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(): * @self: the #NMDevice