From 567e86c9f8e2273d5da657f609742e88182c1942 Mon Sep 17 00:00:00 2001 From: Lubomir Rintel Date: Tue, 17 Feb 2015 10:40:18 +0100 Subject: [PATCH] device: set the reason for when deactivating for another activation It's always user requested -- auto activation never happens on already active devices. nm_device_release_one_slave() rightly asserts teardown with (un)configuration does not happen for no reason at all. https://bugzilla.gnome.org/show_bug.cgi?id=744812 (cherry picked from commit 600489003ff2eca33865a3d41abcc9fc03fd6bb1) --- src/devices/nm-device.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/devices/nm-device.c b/src/devices/nm-device.c index 2704531c1f..df0f7a0775 100644 --- a/src/devices/nm-device.c +++ b/src/devices/nm-device.c @@ -5790,7 +5790,7 @@ nm_device_queue_activation (NMDevice *self, NMActRequest *req) _LOGI (LOGD_DEVICE, "disconnecting for new activation request."); nm_device_state_changed (self, NM_DEVICE_STATE_DEACTIVATING, - NM_DEVICE_STATE_REASON_NONE); + NM_DEVICE_STATE_REASON_USER_REQUESTED); } }