From 5ed2a9430a861bb1afd314f12a3feec75710f878 Mon Sep 17 00:00:00 2001 From: Dan Williams Date: Wed, 5 Mar 2014 22:07:19 +0100 Subject: [PATCH] core: unschedule deletion of software device when starting an activation request This fixes queued activation request to be aborted because the software device gets removed before the device reaches the PREPARED state. This happens, because when the previous connection disconnects, the device will schedule its removal. https://bugzilla.redhat.com/show_bug.cgi?id=1073015 Signed-off-by: Thomas Haller --- src/devices/nm-device.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/devices/nm-device.c b/src/devices/nm-device.c index 2ff4ab6a08..2169a2778a 100644 --- a/src/devices/nm-device.c +++ b/src/devices/nm-device.c @@ -4779,6 +4779,8 @@ _device_activate (NMDevice *self, NMActRequest *req) nm_device_get_iface (self), nm_connection_get_id (connection)); + delete_on_deactivate_unschedule (priv); + /* Move default unmanaged devices to DISCONNECTED state here */ if (priv->default_unmanaged && priv->state == NM_DEVICE_STATE_UNMANAGED) { nm_device_state_changed (self,