Skip to content

Commit 5077bc7

Browse files
hkallweitkuba-moo
authored andcommitted
ixgene-v2: prepare for phylib stop exporting phy_10_100_features_array
As part of phylib cleanup we plan to stop exporting the feature arrays. So explicitly remove the modes not supported by the MAC. The media type bits don't have any impact on kernel behavior, so don't touch them. Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com> Reviewed-by: Andrew Lunn <andrew@lunn.ch> Reviewed-by: Mateusz Polchlopek <mateusz.polchlopek@intel.com> Link: https://patch.msgid.link/be356a21-5a1a-45b3-9407-3a97f3af4600@gmail.com Signed-off-by: Jakub Kicinski <kuba@kernel.org>
1 parent 34dba73 commit 5077bc7

File tree

1 file changed

+6
-12
lines changed
  • drivers/net/ethernet/apm/xgene-v2

1 file changed

+6
-12
lines changed

drivers/net/ethernet/apm/xgene-v2/mdio.c

Lines changed: 6 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,6 @@ void xge_mdio_remove(struct net_device *ndev)
9797

9898
int xge_mdio_config(struct net_device *ndev)
9999
{
100-
__ETHTOOL_DECLARE_LINK_MODE_MASK(mask) = { 0, };
101100
struct xge_pdata *pdata = netdev_priv(ndev);
102101
struct device *dev = &pdata->pdev->dev;
103102
struct mii_bus *mdio_bus;
@@ -137,17 +136,12 @@ int xge_mdio_config(struct net_device *ndev)
137136
goto err;
138137
}
139138

140-
linkmode_set_bit_array(phy_10_100_features_array,
141-
ARRAY_SIZE(phy_10_100_features_array),
142-
mask);
143-
linkmode_set_bit(ETHTOOL_LINK_MODE_1000baseT_Half_BIT, mask);
144-
linkmode_set_bit(ETHTOOL_LINK_MODE_AUI_BIT, mask);
145-
linkmode_set_bit(ETHTOOL_LINK_MODE_MII_BIT, mask);
146-
linkmode_set_bit(ETHTOOL_LINK_MODE_FIBRE_BIT, mask);
147-
linkmode_set_bit(ETHTOOL_LINK_MODE_BNC_BIT, mask);
148-
149-
linkmode_andnot(phydev->supported, phydev->supported, mask);
150-
linkmode_copy(phydev->advertising, phydev->supported);
139+
phy_remove_link_mode(phydev, ETHTOOL_LINK_MODE_10baseT_Half_BIT);
140+
phy_remove_link_mode(phydev, ETHTOOL_LINK_MODE_10baseT_Full_BIT);
141+
phy_remove_link_mode(phydev, ETHTOOL_LINK_MODE_100baseT_Half_BIT);
142+
phy_remove_link_mode(phydev, ETHTOOL_LINK_MODE_100baseT_Full_BIT);
143+
phy_remove_link_mode(phydev, ETHTOOL_LINK_MODE_1000baseT_Half_BIT);
144+
151145
pdata->phy_speed = SPEED_UNKNOWN;
152146

153147
return 0;

0 commit comments

Comments
 (0)