From 851be22146828fdb6aa18c83ff0d08fa64310522 Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Thu, 12 Jun 2014 14:04:42 +0200 Subject: [PATCH] core/trivial: move code Signed-off-by: Thomas Haller --- src/devices/nm-device.c | 22 +++++++++++----------- 1 file 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 @@ -5268,6 +5268,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) { @@ -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) {