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>
This commit is contained in:
Lendacky, Thomas 2014-07-14 14:05:52 -05:00 committed by David S. Miller
parent 3e7077067e
commit 6964e97051
2 changed files with 0 additions and 14 deletions

View File

@ -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;

View File

@ -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;