diff options
author | David Decotigny <decot@google.com> | 2011-04-27 14:32:40 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2011-04-29 17:03:01 -0400 |
commit | 707394972093e2056e1e8cc39be19cf9bcb3e7b3 (patch) | |
tree | f6dc95219bca6895adf304b79241e9d60561f8f5 /drivers/net/bcm63xx_enet.c | |
parent | 25db0338813a8915457636b1f6abe6a28fa73f8d (diff) |
ethtool: cosmetic: Use ethtool ethtool_cmd_speed API
This updates the network drivers so that they don't access the
ethtool_cmd::speed field directly, but use ethtool_cmd_speed()
instead.
For most of the drivers, these changes are purely cosmetic and don't
fix any problem, such as for those 1GbE/10GbE drivers that indirectly
call their own ethtool get_settings()/mii_ethtool_gset(). The changes
are meant to enforce code consistency and provide robustness with
future larger throughputs, at the expense of a few CPU cycles for each
ethtool operation.
All drivers compiled with make allyesconfig ion x86_64 have been
updated.
Tested: make allyesconfig on x86_64 + e1000e/bnx2x work
Signed-off-by: David Decotigny <decot@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/bcm63xx_enet.c')
-rw-r--r-- | drivers/net/bcm63xx_enet.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/bcm63xx_enet.c b/drivers/net/bcm63xx_enet.c index e68ffe622e69..f1573d492e90 100644 --- a/drivers/net/bcm63xx_enet.c +++ b/drivers/net/bcm63xx_enet.c | |||
@@ -1346,7 +1346,8 @@ static int bcm_enet_get_settings(struct net_device *dev, | |||
1346 | return phy_ethtool_gset(priv->phydev, cmd); | 1346 | return phy_ethtool_gset(priv->phydev, cmd); |
1347 | } else { | 1347 | } else { |
1348 | cmd->autoneg = 0; | 1348 | cmd->autoneg = 0; |
1349 | cmd->speed = (priv->force_speed_100) ? SPEED_100 : SPEED_10; | 1349 | ethtool_cmd_speed_set(cmd, ((priv->force_speed_100) |
1350 | ? SPEED_100 : SPEED_10)); | ||
1350 | cmd->duplex = (priv->force_duplex_full) ? | 1351 | cmd->duplex = (priv->force_duplex_full) ? |
1351 | DUPLEX_FULL : DUPLEX_HALF; | 1352 | DUPLEX_FULL : DUPLEX_HALF; |
1352 | cmd->supported = ADVERTISED_10baseT_Half | | 1353 | cmd->supported = ADVERTISED_10baseT_Half | |