diff options
| author |   Erik Ekman <erik@kryo.se> | 2021-10-17 19:16:57 +0200 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2021-10-18 14:28:02 +0100 |
| commit | 041c61488236a5a84789083e3d9f0a51139b6edf (patch) | |
| tree | c80291d04fa01ef22ab85025559e9f9e0a564b3b /drivers/net/ethernet/sfc/ethtool_common.c | |
| parent | net: dsa: qca8k: fix delay applied to wrong cpu in parse_port_config (diff) | |
| download | linux-041c61488236a5a84789083e3d9f0a51139b6edf.tar.xz linux-041c61488236a5a84789083e3d9f0a51139b6edf.zip | |
sfc: Fix reading non-legacy supported link modes
Everything except the first 32 bits was lost when the pause flags were
added. This makes the 50000baseCR2 mode flag (bit 34) not appear.
I have tested this with a 10G card (SFN5122F-R7) by modifying it to
return a non-legacy link mode (10000baseCR).
Signed-off-by: Erik Ekman <erik@kryo.se>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/sfc/ethtool_common.c')
| -rw-r--r-- | drivers/net/ethernet/sfc/ethtool_common.c | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/drivers/net/ethernet/sfc/ethtool_common.c b/drivers/net/ethernet/sfc/ethtool_common.c index bf1443539a1a..bd552c7dffcb 100644 --- a/drivers/net/ethernet/sfc/ethtool_common.c +++ b/drivers/net/ethernet/sfc/ethtool_common.c @@ -563,20 +563,14 @@ int efx_ethtool_get_link_ksettings(struct net_device *net_dev, { struct efx_nic *efx = netdev_priv(net_dev); struct efx_link_state *link_state = &efx->link_state; - u32 supported; mutex_lock(&efx->mac_lock); efx_mcdi_phy_get_link_ksettings(efx, cmd); mutex_unlock(&efx->mac_lock); /* Both MACs support pause frames (bidirectional and respond-only) */ - ethtool_convert_link_mode_to_legacy_u32(&supported, - cmd->link_modes.supported); - - supported |= SUPPORTED_Pause | SUPPORTED_Asym_Pause; - - ethtool_convert_legacy_u32_to_link_mode(cmd->link_modes.supported, - supported); + ethtool_link_ksettings_add_link_mode(cmd, supported, Pause); + ethtool_link_ksettings_add_link_mode(cmd, supported, Asym_Pause); if (LOOPBACK_INTERNAL(efx)) { cmd->base.speed = link_state->speed; |