diff options
| author | Thomas Haller <thaller@redhat.com> | 2023-06-12 16:35:39 +0200 |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2023-06-30 18:05:43 +0200 |
| commit | 1648ae58a32931948e489abc03489d26f6605ac8 (patch) | |
| tree | 884a7aad2a5ec44706b135f5aab9bfbf12fdac76 | |
| parent | 91c23e2a3d3880b5e2e5092bf6c4dc4df0fe9ba4 (diff) | |
core: rename nm_config_data_get_ignore_carrier() to nm_config_data_get_ignore_carrier_by_device()
(cherry picked from commit 13690f445aff140b44c4c7f83ae5eb78e3f547fb)
| -rw-r--r-- | src/core/devices/nm-device.c | 10 | ||||
| -rw-r--r-- | src/core/nm-config-data.c | 2 | ||||
| -rw-r--r-- | src/core/nm-config-data.h | 2 |
3 files changed, 8 insertions, 6 deletions
diff --git a/src/core/devices/nm-device.c b/src/core/devices/nm-device.c index fa72d1def9..ed1f67aded 100644 --- a/src/core/devices/nm-device.c +++ b/src/core/devices/nm-device.c @@ -7339,7 +7339,7 @@ config_changed(NMConfig *config, NMDevicePrivate *priv = NM_DEVICE_GET_PRIVATE(self); if (priv->state <= NM_DEVICE_STATE_DISCONNECTED || priv->state >= NM_DEVICE_STATE_ACTIVATED) { - priv->ignore_carrier = nm_config_data_get_ignore_carrier(config_data, self); + priv->ignore_carrier = nm_config_data_get_ignore_carrier_by_device(config_data, self); if (NM_FLAGS_HAS(changes, NM_CONFIG_CHANGE_VALUES) && !nm_device_get_applied_setting(self, NM_TYPE_SETTING_SRIOV)) device_init_static_sriov_num_vfs(self); @@ -7478,8 +7478,9 @@ realize_start_setup(NMDevice *self, nm_device_update_permanent_hw_address(self, FALSE); /* Note: initial hardware address must be read before calling get_ignore_carrier() */ - config = nm_config_get(); - priv->ignore_carrier = nm_config_data_get_ignore_carrier(nm_config_get_data(config), self); + config = nm_config_get(); + priv->ignore_carrier = + nm_config_data_get_ignore_carrier_by_device(nm_config_get_data(config), self); if (!priv->config_changed_id) { priv->config_changed_id = g_signal_connect(config, NM_CONFIG_SIGNAL_CONFIG_CHANGED, @@ -16059,7 +16060,8 @@ _set_state_full(NMDevice *self, NMDeviceState state, NMDeviceStateReason reason, /* We cache the ignore_carrier state to not react on config-reloads while the connection * is active. But on deactivating, reset the ignore-carrier flag to the current state. */ - priv->ignore_carrier = nm_config_data_get_ignore_carrier(NM_CONFIG_GET_DATA, self); + priv->ignore_carrier = + nm_config_data_get_ignore_carrier_by_device(NM_CONFIG_GET_DATA, self); if (quitting) { nm_dispatcher_call_device_sync(NM_DISPATCHER_ACTION_PRE_DOWN, self, req); diff --git a/src/core/nm-config-data.c b/src/core/nm-config-data.c index 7b778cc753..2fa49ae7aa 100644 --- a/src/core/nm-config-data.c +++ b/src/core/nm-config-data.c @@ -366,7 +366,7 @@ nm_config_data_get_iwd_config_path(const NMConfigData *self) } gboolean -nm_config_data_get_ignore_carrier(const NMConfigData *self, NMDevice *device) +nm_config_data_get_ignore_carrier_by_device(const NMConfigData *self, NMDevice *device) { const char *value; gboolean has_match; diff --git a/src/core/nm-config-data.h b/src/core/nm-config-data.h index 8ecf926058..acc968d69a 100644 --- a/src/core/nm-config-data.h +++ b/src/core/nm-config-data.h @@ -185,7 +185,7 @@ const char *nm_config_data_get_dns_mode(const NMConfigData *self); const char *nm_config_data_get_rc_manager(const NMConfigData *self); gboolean nm_config_data_get_systemd_resolved(const NMConfigData *self); -gboolean nm_config_data_get_ignore_carrier(const NMConfigData *self, NMDevice *device); +gboolean nm_config_data_get_ignore_carrier_by_device(const NMConfigData *self, NMDevice *device); gboolean nm_config_data_get_assume_ipv6ll_only(const NMConfigData *self, NMDevice *device); int nm_config_data_get_sriov_num_vfs(const NMConfigData *self, NMDevice *device); |