fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-05-07 13:08:10 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

merge: branch 'wl/nm-1-52'

Browse source 
core: fail early if we cannot get current FEC value

https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/merge_requests/2181
This commit is contained in:
Wen Liang 2025-04-07 13:31:15 +00:00
commit 3dee98acdc
1 changed files with 10 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
src/core/devices/nm-device.c
View file

@ -2759,22 +2759,23 @@ _ethtool_fec_set(NMDevice *self,
g_hash_table_iter_init(&iter, hash); g_hash_table_iter_init(&iter, hash);
while (g_hash_table_iter_next(&iter, (gpointer *) &name, (gpointer *) &variant)) { while (g_hash_table_iter_next(&iter, (gpointer *) &name, (gpointer *) &variant)) {
NMEthtoolID ethtool_id = nm_ethtool_id_get_by_name(name); if (nm_ethtool_id_is_fec(nm_ethtool_id_get_by_name(name))) {
nm_assert(g_variant_is_of_type(variant, G_VARIANT_TYPE_UINT32));
if (!nm_ethtool_id_is_fec(ethtool_id)) fec_mode = g_variant_get_uint32(variant);
continue; break;
}
nm_assert(g_variant_is_of_type(variant, G_VARIANT_TYPE_UINT32));
fec_mode = g_variant_get_uint32(variant);
} }
nm_platform_ethtool_get_fec_mode(platform, ethtool_state->ifindex, &old_fec_mode);
/* The NM_SETTING_ETHTOOL_FEC_MODE_NONE is query only value, hence do nothing. */ /* The NM_SETTING_ETHTOOL_FEC_MODE_NONE is query only value, hence do nothing. */
if (!fec_mode || fec_mode == NM_SETTING_ETHTOOL_FEC_MODE_NONE) { if (!fec_mode || fec_mode == NM_SETTING_ETHTOOL_FEC_MODE_NONE) {
return; return;
} }
if (!nm_platform_ethtool_get_fec_mode(platform, ethtool_state->ifindex, &old_fec_mode)) {
_LOGW(LOGD_DEVICE, "ethtool: failure setting FEC %d: cannot get current value", fec_mode);
return;
}
if (!nm_platform_ethtool_set_fec_mode(platform, ethtool_state->ifindex, fec_mode)) if (!nm_platform_ethtool_set_fec_mode(platform, ethtool_state->ifindex, fec_mode))
_LOGW(LOGD_DEVICE, "ethtool: failure setting FEC %d", fec_mode); _LOGW(LOGD_DEVICE, "ethtool: failure setting FEC %d", fec_mode);
else { else {