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/core/nm-config-data.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'src/core/nm-config-data.c') diff --git a/src/core/nm-config-data.c b/src/core/nm-config-data.c index 5b330f24..9b3f958b 100644 --- a/src/core/nm-config-data.c +++ b/src/core/nm-config-data.c @@ -373,8 +373,8 @@ nm_config_data_get_iwd_config_path(const NMConfigData *self) gboolean nm_config_data_get_ignore_carrier_for_port(const NMConfigData *self, - const char *master, - const char *slave_type) + const char *controller, + const char *port_type) { const char *value; gboolean has_match; @@ -383,15 +383,15 @@ nm_config_data_get_ignore_carrier_for_port(const NMConfigData *self, g_return_val_if_fail(NM_IS_CONFIG_DATA(self), FALSE); - if (!master || !slave_type) + if (!controller || !port_type) goto out_default; - if (!nm_utils_ifname_valid_kernel(master, NULL)) + if (!nm_utils_ifname_valid_kernel(controller, NULL)) goto out_default; match_data = (NMMatchSpecDeviceData){ - .interface_name = master, - .device_type = slave_type, + .interface_name = controller, + .device_type = port_type, }; value = _config_data_get_device_config(self, @@ -412,7 +412,7 @@ nm_config_data_get_ignore_carrier_for_port(const NMConfigData *self, return m; out_default: - /* if ignore-carrier is not explicitly or detected for the master, then we assume it's + /* if ignore-carrier is not explicitly or detected for the controller, then we assume it's * enabled. This is in line with nm_config_data_get_ignore_carrier_by_device(), where * ignore-carrier is enabled based on nm_device_ignore_carrier_by_default(). */ -- cgit 1.3.0-6-gf8a5