Skip to content

Commit

Permalink
amd-xgbe: Remove the adjustments needed for fixed speed
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Lendacky, Thomas authored and David S. Miller committed Jul 15, 2014
1 parent 3e70770 commit 6964e97
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 14 deletions.
10 changes: 0 additions & 10 deletions drivers/net/ethernet/amd/xgbe/xgbe-ethtool.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
4 changes: 0 additions & 4 deletions drivers/net/ethernet/amd/xgbe/xgbe-mdio.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down

0 comments on commit 6964e97

Please sign in to comment.