amd-xgbe: Remove the adjustments needed for fixed speed

With the addition of entries in the phy speed/duplex settings
array to support KR and KX mode, the work-around to add/remove
baseT settings to run at a fixed speed is no longer needed.

Signed-off-by: Tom Lendacky <thomas.lendacky@amd.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ethernet/amd/xgbe/xgbe-ethtool.c b/drivers/net/ethernet/amd/xgbe/xgbe-ethtool.c
index 8909f2b51af1599991e680e298a3a3872d945a41..f7405261f23e9462090eed314f864372efc72208 100644 (file)
--- a/drivers/net/ethernet/amd/xgbe/xgbe-ethtool.c
+++ b/drivers/net/ethernet/amd/xgbe/xgbe-ethtool.c
@@ -331,16 +331,6 @@ static int xgbe_set_settings(struct net_device *netdev,
             (cmd->duplex != DUPLEX_FULL)))
                goto unlock;
 
-       if (cmd->autoneg == AUTONEG_ENABLE) {
-               /* Clear settings needed to force speeds */
-               phydev->supported &= ~SUPPORTED_1000baseT_Full;
-               phydev->supported &= ~SUPPORTED_10000baseT_Full;
-       } else {
-               /* Add settings needed to force speed */
-               phydev->supported |= SUPPORTED_1000baseT_Full;
-               phydev->supported |= SUPPORTED_10000baseT_Full;
-       }
-
        cmd->advertising &= phydev->supported;
        if ((cmd->autoneg == AUTONEG_ENABLE) && !cmd->advertising)
                goto unlock;

diff --git a/drivers/net/ethernet/amd/xgbe/xgbe-mdio.c b/drivers/net/ethernet/amd/xgbe/xgbe-mdio.c
index ea7a5d6750eab054104a546584d3c3d487dafe07..225f22d5fe0aebbea16379c2c6ba69b45b3eb7cb 100644 (file)
--- a/drivers/net/ethernet/amd/xgbe/xgbe-mdio.c
+++ b/drivers/net/ethernet/amd/xgbe/xgbe-mdio.c
@@ -375,10 +375,6 @@ int xgbe_mdio_register(struct xgbe_prv_data *pdata)
 
        phydev->autoneg = pdata->default_autoneg;
        if (phydev->autoneg == AUTONEG_DISABLE) {
-               /* Add settings needed to force speed */
-               phydev->supported |= SUPPORTED_1000baseT_Full;
-               phydev->supported |= SUPPORTED_10000baseT_Full;
-
                phydev->speed = pdata->default_speed;
                phydev->duplex = DUPLEX_FULL;