summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLubomir Rintel <lkundrak@v3.sk>2015-02-17 10:40:18 +0100
committerLubomir Rintel <lkundrak@v3.sk>2015-02-24 18:43:00 +0100
commit600489003ff2eca33865a3d41abcc9fc03fd6bb1 (patch)
treea00c97a36a0f8a63d914e1b22205e41d7af03c3a
parentd37f2280b7440cfbfb88aa1c250c6e0ae707038e (diff)
downloadNetworkManager-600489003ff2eca33865a3d41abcc9fc03fd6bb1.tar.gz
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
-rw-r--r--src/devices/nm-device.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/devices/nm-device.c b/src/devices/nm-device.c
index 5b3e3c4eed..05cc4c5716 100644
--- a/src/devices/nm-device.c
+++ b/src/devices/nm-device.c
@@ -5834,7 +5834,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);
}
}