summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWen Liang <liangwen12year@gmail.com>2023-11-16 10:38:32 -0500
committerWen Liang <liangwen12year@gmail.com>2023-11-21 20:01:12 -0500
commit21a6d7a0b673e64ba741cd912707657c5dcffa9f (patch)
tree16ef32a7f81d47aa56beaacb0a05d6ecfa21dc31
parent084beb08181a78e0353c82dd7d8fcbbc981b9fb7 (diff)
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
-rw-r--r--src/core/devices/nm-device.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/core/devices/nm-device.c b/src/core/devices/nm-device.c
index b7e855bcde..f177fb2f82 100644
--- a/src/core/devices/nm-device.c
+++ b/src/core/devices/nm-device.c
@@ -8578,7 +8578,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: