From 052627dd7c746aed2bc75bd48a838537eefdceba Mon Sep 17 00:00:00 2001 From: Wen Liang Date: Thu, 16 Nov 2023 10:38:32 -0500 Subject: [PATCH] device: change port deactivation reason upon user-request controller deactivation When connection down is explicitly called on the controller, the port connection should also be deactivated with the reason user-requested, otherwise any following connection update on the controller profile will unblock the port connection and unnessarily make the port to autoconnet again. Fixes: 645a1bb0ef1b ('core: unblock autoconnect when master profile changes') https://gitlab.freedesktop.org/NetworkManager/NetworkManager-ci/-/merge_requests/1568 (cherry picked from commit 21a6d7a0b673e64ba741cd912707657c5dcffa9f) --- src/core/devices/nm-device.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/core/devices/nm-device.c b/src/core/devices/nm-device.c index 8006634927..50761f29ad 100644 --- a/src/core/devices/nm-device.c +++ b/src/core/devices/nm-device.c @@ -8339,7 +8339,7 @@ nm_device_slave_notify_release(NMDevice *self, master_status = "failed"; break; case NM_DEVICE_STATE_REASON_USER_REQUESTED: - reason = NM_DEVICE_STATE_REASON_DEPENDENCY_FAILED; + reason = NM_DEVICE_STATE_REASON_USER_REQUESTED; master_status = "deactivated by user request"; break; case NM_DEVICE_STATE_REASON_CONNECTION_REMOVED: