From 2792038e0bbd250b8a090fec4f5cb536da3d4461 Mon Sep 17 00:00:00 2001 From: Lubomir Rintel Date: Tue, 17 Jan 2023 18:49:30 +0100 Subject: [PATCH] WIP: core/6lowpan: s/master/controller/ --- src/libnm-core-impl/nm-setting-6lowpan.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/libnm-core-impl/nm-setting-6lowpan.c b/src/libnm-core-impl/nm-setting-6lowpan.c index b8902b5c7c..37225259b1 100644 --- a/src/libnm-core-impl/nm-setting-6lowpan.c +++ b/src/libnm-core-impl/nm-setting-6lowpan.c @@ -86,24 +86,24 @@ verify(NMSetting *setting, NMConnection *connection, GError **error) } if (nm_utils_is_uuid(priv->parent)) { - /* If we have an NMSettingConnection:master with slave-type="6lowpan", + /* If we have an NMSettingConnection:controller with slave-type="6lowpan", * then it must be the same UUID. */ if (s_con) { - const char *master = NULL, *slave_type = NULL; + const char *controller = NULL, *slave_type = NULL; slave_type = nm_setting_connection_get_slave_type(s_con); if (!g_strcmp0(slave_type, NM_SETTING_6LOWPAN_SETTING_NAME)) - master = nm_setting_connection_get_controller(s_con); + controller = nm_setting_connection_get_controller(s_con); - if (master && g_strcmp0(priv->parent, master) != 0) { + if (controller && g_strcmp0(priv->parent, controller) != 0) { g_set_error(error, NM_CONNECTION_ERROR, NM_CONNECTION_ERROR_INVALID_PROPERTY, _("'%s' value doesn't match '%s=%s'"), priv->parent, NM_SETTING_CONNECTION_MASTER, - master); + controller); g_prefix_error(error, "%s.%s: ", NM_SETTING_6LOWPAN_SETTING_NAME,