summary refs log tree commit diff
path: root/src/core/nm-manager.c
diff options
context:
space:
mode:
authorMichael Biebl <biebl@debian.org>2024-07-26 01:21:35 +0200
committerMichael Biebl <biebl@debian.org>2024-07-26 01:21:35 +0200
commit45a364c60a9d6d34e614c4f1f507c69336ad1e69 (patch)
treee19f6be7be473589a493b2e7888e5eb2c28dad43 /src/core/nm-manager.c
parent58affb29b8386d6d26359da604a64fefe7ae0a60 (diff)
New upstream version 1.48.6 upstream/1.48.6
Diffstat (limited to 'src/core/nm-manager.c')
-rw-r--r--src/core/nm-manager.c18
1 files changed, 12 insertions, 6 deletions
diff --git a/src/core/nm-manager.c b/src/core/nm-manager.c
index ddbd2021..e949ea11 100644
--- a/src/core/nm-manager.c
+++ b/src/core/nm-manager.c
@@ -5953,15 +5953,21 @@ _internal_activate_device(NMManager *self, NMActiveConnection *active, GError **
             && (nm_device_get_state_reason(master_device)
                 == NM_DEVICE_STATE_REASON_NEW_ACTIVATION)) {
             nm_active_connection_set_controller_dev(active, master_device);
+            _LOGD(LOGD_CORE,
+                  "Activation of '%s'(%s) depends on controller device %p %s",
+                  nm_settings_connection_get_id(sett_conn),
+                  nm_settings_connection_get_connection_type(sett_conn),
+                  master_device,
+                  nm_dbus_object_get_path(NM_DBUS_OBJECT(master_device)) ?: "");
         } else {
             nm_active_connection_set_controller(active, master_ac);
+            _LOGD(LOGD_CORE,
+                  "Activation of '%s'(%s) depends on active connection %p %s",
+                  nm_settings_connection_get_id(sett_conn),
+                  nm_settings_connection_get_connection_type(sett_conn),
+                  master_ac,
+                  nm_dbus_object_get_path(NM_DBUS_OBJECT(master_ac)) ?: "");
         }
-
-        _LOGD(LOGD_CORE,
-              "Activation of '%s' depends on active connection %p %s",
-              nm_settings_connection_get_id(sett_conn),
-              master_ac,
-              nm_dbus_object_get_path(NM_DBUS_OBJECT(master_ac)) ?: "");
     }
 
     /* Check slaves for master connection and possibly activate them */