diff options
| author | Thomas Haller <thaller@redhat.com> | 2014-06-12 14:04:42 +0200 |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2014-06-16 19:18:57 +0200 |
| commit | 851be22146828fdb6aa18c83ff0d08fa64310522 (patch) | |
| tree | 2ab283fd2ea9444e607bf22e1d4f817e59f9165b | |
| parent | 524fc6d454e063cd84b004d23e2a0ccc163b8588 (diff) | |
| download | NetworkManager-851be22146828fdb6aa18c83ff0d08fa64310522.tar.gz | |
core/trivial: move code
Signed-off-by: Thomas Haller <thaller@redhat.com>
| -rw-r--r-- | src/devices/nm-device.c | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/src/devices/nm-device.c b/src/devices/nm-device.c index 7fca6efb4e..6c04187d76 100644 --- a/src/devices/nm-device.c +++ b/src/devices/nm-device.c @@ -5269,6 +5269,17 @@ nm_device_get_ip6_config (NMDevice *self) /****************************************************************/ static void +dispatcher_cleanup (NMDevice *self) +{ + NMDevicePrivate *priv = NM_DEVICE_GET_PRIVATE (self); + + if (priv->dispatcher_id) { + nm_dispatcher_call_cancel (priv->dispatcher_id); + priv->dispatcher_id = 0; + } +} + +static void ip_check_pre_up_done (guint call_id, gpointer user_data) { NMDevice *self = NM_DEVICE (user_data); @@ -6538,17 +6549,6 @@ dispatcher_pre_down_done (guint call_id, gpointer user_data) nm_device_queue_state (self, NM_DEVICE_STATE_DISCONNECTED, priv->dispatcher_pre_down_reason); } -static void -dispatcher_cleanup (NMDevice *self) -{ - NMDevicePrivate *priv = NM_DEVICE_GET_PRIVATE (self); - - if (priv->dispatcher_id) { - nm_dispatcher_call_cancel (priv->dispatcher_id); - priv->dispatcher_id = 0; - } -} - static gboolean ip_config_valid (NMDeviceState state) { |