about summary refs log tree commit diff
path: root/src/libnm-core-impl/nm-setting-ovs-external-ids.c
diff options
context:
space:
mode:
authorMichael Biebl <biebl@debian.org>2024-08-09 18:57:26 +0200
committerMichael Biebl <biebl@debian.org>2024-08-09 18:57:26 +0200
commit5ebc16389d33662f712e49a8d5f3445f6b34ca05 (patch)
treeaf14aec1d1271903e73ef2b45d6b9c6d6c188f44 /src/libnm-core-impl/nm-setting-ovs-external-ids.c
parentf07580d7a481ecbc1e90033b7fa5607e0ab2d051 (diff)
parente96d74409128c6a977e31f24fad9b267d2feb9a1 (diff)
Update upstream source from tag 'upstream/1.48.8'
Update to upstream version '1.48.8'
with Debian dir b9f8c1b806c3088cd4a6040531628e5352ccb2ee
Diffstat (limited to 'src/libnm-core-impl/nm-setting-ovs-external-ids.c')
-rw-r--r--src/libnm-core-impl/nm-setting-ovs-external-ids.c18
1 files changed, 9 insertions, 9 deletions
diff --git a/src/libnm-core-impl/nm-setting-ovs-external-ids.c b/src/libnm-core-impl/nm-setting-ovs-external-ids.c
index 0cdf3e6b..9acdae6c 100644
--- a/src/libnm-core-impl/nm-setting-ovs-external-ids.c
+++ b/src/libnm-core-impl/nm-setting-ovs-external-ids.c
@@ -124,7 +124,7 @@ _nm_setting_ovs_verify_connection_type(GType gtype, NMConnection *connection, GE
 {
     NMSettingConnection *s_con;
     const char          *type;
-    const char          *slave_type;
+    const char          *port_type;
 
     nm_assert(!connection || NM_IS_CONNECTION(connection));
     nm_assert(NM_IN_SET(gtype, NM_TYPE_SETTING_OVS_EXTERNAL_IDS, NM_TYPE_SETTING_OVS_OTHER_CONFIG));
@@ -150,14 +150,14 @@ _nm_setting_ovs_verify_connection_type(GType gtype, NMConnection *connection, GE
         return TRUE;
 
     if ((s_con = nm_connection_get_setting_connection(connection))
-        && _nm_connection_detect_slave_type_full(s_con,
-                                                 connection,
-                                                 &slave_type,
-                                                 NULL,
-                                                 NULL,
-                                                 NULL,
-                                                 NULL)
-        && nm_streq0(slave_type, NM_SETTING_OVS_PORT_SETTING_NAME))
+        && _nm_connection_detect_port_type_full(s_con,
+                                                connection,
+                                                &port_type,
+                                                NULL,
+                                                NULL,
+                                                NULL,
+                                                NULL)
+        && nm_streq0(port_type, NM_SETTING_OVS_PORT_SETTING_NAME))
         return TRUE;
 
     g_set_error(error,