From e96d74409128c6a977e31f24fad9b267d2feb9a1 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Fri, 9 Aug 2024 18:57:15 +0200 Subject: New upstream version 1.48.8 --- src/libnm-core-impl/nm-setting-ovs-external-ids.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'src/libnm-core-impl/nm-setting-ovs-external-ids.c') 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, -- cgit 1.3.0-6-gf8a5