about summary refs log tree commit diff
path: root/src/core/NetworkManagerUtils.c
diff options
context:
space:
mode:
authorMichael Biebl <biebl@debian.org>2024-05-05 00:07:42 +0200
committerMichael Biebl <biebl@debian.org>2024-05-05 00:07:42 +0200
commita9c892f6640668b93848584d246280c4d33cc025 (patch)
tree914226b8c8fffd1a8e101e71d361d6d126322c12 /src/core/NetworkManagerUtils.c
parentf03946fe0cdd73041658be1009f06f0e287c4b80 (diff)
parent34bb501be08aa2b313d88e67d6e0a7e0a3f9cfa6 (diff)
Update upstream source from tag 'upstream/1.47.90'
Update to upstream version '1.47.90'
with Debian dir fca683c43690f5e2bfc191d3d528666444bec54b
Diffstat (limited to 'src/core/NetworkManagerUtils.c')
-rw-r--r--src/core/NetworkManagerUtils.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/core/NetworkManagerUtils.c b/src/core/NetworkManagerUtils.c
index cced1717..2f447146 100644
--- a/src/core/NetworkManagerUtils.c
+++ b/src/core/NetworkManagerUtils.c
@@ -702,8 +702,8 @@ check_connection_controller(NMConnection *orig, NMConnection *candidate, GHashTa
 
     s_con_orig      = nm_connection_get_setting_connection(orig);
     s_con_cand      = nm_connection_get_setting_connection(candidate);
-    orig_controller = nm_setting_connection_get_master(s_con_orig);
-    cand_controller = nm_setting_connection_get_master(s_con_cand);
+    orig_controller = nm_setting_connection_get_controller(s_con_orig);
+    cand_controller = nm_setting_connection_get_controller(s_con_cand);
 
     /* A generated connection uses the UUID to specify the controller. Accept
      * candidates that specify as controller an interface name matching that