core/trivial: move code

Signed-off-by: Thomas Haller <thaller@redhat.com>
This commit is contained in:
Thomas Haller 2014-06-12 14:04:42 +02:00
parent 524fc6d454
commit 851be22146

View file

@ -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)
{