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

platform: simplify accessing ethtool_link_settings.link_mode_masks in set_link_settings_new()

Browse source
This commit is contained in:
Thomas Haller 2021-08-30 17:26:09 +02:00
parent f992b2bc25
commit 94e23ebba5
No known key found for this signature in database
GPG key ID: 29C2366E4DFC5728
1 changed files with 9 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
src/libnm-platform/nm-platform-utils.c
View file

@ -1422,15 +1422,15 @@ set_link_settings_new(SocketHandle * shandle,
/* then change the needed ones */ /* then change the needed ones */
edata->cmd = ETHTOOL_SLINKSETTINGS; edata->cmd = ETHTOOL_SLINKSETTINGS;
if (autoneg) { if (autoneg) {
const guint32 *v_map_supported = &edata->link_mode_masks[0];
guint32 * v_map_advertising = &edata->link_mode_masks[nwords];
guint32 * v_map_lp_advertising = &edata->link_mode_masks[2 * nwords];
edata->autoneg = AUTONEG_ENABLE; edata->autoneg = AUTONEG_ENABLE;
/* copy @map_supported to @map_advertising and @map_lp_advertising */ /* copy @map_supported to @map_advertising and @map_lp_advertising */
memcpy(&edata->link_mode_masks[nwords], memcpy(v_map_advertising, v_map_supported, sizeof(guint32) * nwords);
&edata->link_mode_masks[0], memcpy(v_map_lp_advertising, v_map_supported, sizeof(guint32) * nwords);
sizeof(guint32) * nwords);
memcpy(&edata->link_mode_masks[nwords * 2],
&edata->link_mode_masks[0],
sizeof(guint32) * nwords);
if (speed != 0) { if (speed != 0) {
guint32 mode; guint32 mode;
@ -1447,7 +1447,7 @@ set_link_settings_new(SocketHandle * shandle,
} }
/* We only support BASE-T modes in the first word */ /* We only support BASE-T modes in the first word */
if (!(edata->link_mode_masks[0] & mode)) { if (!(v_map_supported[0] & mode)) {
nm_log_trace(LOGD_PLATFORM, nm_log_trace(LOGD_PLATFORM,
"ethtool[%d]: device does not support %uBASE-T %s duplex mode", "ethtool[%d]: device does not support %uBASE-T %s duplex mode",
shandle->ifindex, shandle->ifindex,
@ -1456,9 +1456,8 @@ set_link_settings_new(SocketHandle * shandle,
return FALSE; return FALSE;
} }
edata->link_mode_masks[nwords] = v_map_advertising[0] = (v_map_advertising[0] & ~BASET_ALL_MODES) | mode;
(edata->link_mode_masks[nwords] & ~BASET_ALL_MODES) | mode; v_map_lp_advertising[0] = v_map_advertising[0];
edata->link_mode_masks[nwords * 2] = edata->link_mode_masks[nwords];
} }
} else { } else {
edata->autoneg = AUTONEG_DISABLE; edata->autoneg = AUTONEG_DISABLE;