diff options
| author | Lubomir Rintel <lkundrak@v3.sk> | 2015-03-12 07:02:48 +0100 |
|---|---|---|
| committer | Lubomir Rintel <lkundrak@v3.sk> | 2015-03-13 08:21:45 +0100 |
| commit | a772fde00d50e134500942aaf039cd4fa28951da (patch) | |
| tree | bb477e95f543d8f5beafd4688b2ac177559779d6 | |
| parent | d2de83e0f78edcc09181913b3308a3b2663b8ebd (diff) | |
| download | NetworkManager-a772fde00d50e134500942aaf039cd4fa28951da.tar.gz | |
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().
| -rw-r--r-- | src/devices/nm-device.c | 24 |
1 files 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 |