OSDN Git Service

net: bna: Update supported link modes
authorErik Ekman <erik@kryo.se>
Wed, 8 Dec 2021 23:00:22 +0000 (00:00 +0100)
committerJakub Kicinski <kuba@kernel.org>
Sat, 11 Dec 2021 03:50:40 +0000 (19:50 -0800)
The BR-series installation guide from https://driverdownloads.qlogic.com/
mentions the cards support 10Gbase-SR/LR as well as direct attach cables.

The cards only have SFP+ ports, so 10000baseT is not the right mode.
Switch to using more specific link modes added in commit 5711a98221443
("net: ethtool: add support for 1000BaseX and missing 10G link modes").

Only compile tested.

Signed-off-by: Erik Ekman <erik@kryo.se>
Link: https://lore.kernel.org/r/20211208230022.153496-1-erik@kryo.se
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
drivers/net/ethernet/brocade/bna/bnad_ethtool.c

index 4b4ad73..8aca768 100644 (file)
@@ -235,13 +235,18 @@ static int
 bnad_get_link_ksettings(struct net_device *netdev,
                        struct ethtool_link_ksettings *cmd)
 {
-       u32 supported, advertising;
-
-       supported = SUPPORTED_10000baseT_Full;
-       advertising = ADVERTISED_10000baseT_Full;
+       ethtool_link_ksettings_zero_link_mode(cmd, supported);
+       ethtool_link_ksettings_zero_link_mode(cmd, advertising);
+
+       ethtool_link_ksettings_add_link_mode(cmd, supported, 10000baseCR_Full);
+       ethtool_link_ksettings_add_link_mode(cmd, supported, 10000baseSR_Full);
+       ethtool_link_ksettings_add_link_mode(cmd, supported, 10000baseLR_Full);
+       ethtool_link_ksettings_add_link_mode(cmd, advertising, 10000baseCR_Full);
+       ethtool_link_ksettings_add_link_mode(cmd, advertising, 10000baseSR_Full);
+       ethtool_link_ksettings_add_link_mode(cmd, advertising, 10000baseLR_Full);
        cmd->base.autoneg = AUTONEG_DISABLE;
-       supported |= SUPPORTED_FIBRE;
-       advertising |= ADVERTISED_FIBRE;
+       ethtool_link_ksettings_add_link_mode(cmd, supported, FIBRE);
+       ethtool_link_ksettings_add_link_mode(cmd, advertising, FIBRE);
        cmd->base.port = PORT_FIBRE;
        cmd->base.phy_address = 0;
 
@@ -253,11 +258,6 @@ bnad_get_link_ksettings(struct net_device *netdev,
                cmd->base.duplex = DUPLEX_UNKNOWN;
        }
 
-       ethtool_convert_legacy_u32_to_link_mode(cmd->link_modes.supported,
-                                               supported);
-       ethtool_convert_legacy_u32_to_link_mode(cmd->link_modes.advertising,
-                                               advertising);
-
        return 0;
 }