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/b44.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/b44.c')
-rw-r--r-- | drivers/net/b44.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/b44.c b/drivers/net/b44.c index 909cc4b2a2f3..a69331e06b8d 100644 --- a/drivers/net/b44.c +++ b/drivers/net/b44.c | |||
@@ -1807,8 +1807,8 @@ static int b44_get_settings(struct net_device *dev, struct ethtool_cmd *cmd) | |||
1807 | if (bp->flags & B44_FLAG_ADV_100FULL) | 1807 | if (bp->flags & B44_FLAG_ADV_100FULL) |
1808 | cmd->advertising |= ADVERTISED_100baseT_Full; | 1808 | cmd->advertising |= ADVERTISED_100baseT_Full; |
1809 | cmd->advertising |= ADVERTISED_Pause | ADVERTISED_Asym_Pause; | 1809 | cmd->advertising |= ADVERTISED_Pause | ADVERTISED_Asym_Pause; |
1810 | cmd->speed = (bp->flags & B44_FLAG_100_BASE_T) ? | 1810 | ethtool_cmd_speed_set(cmd, ((bp->flags & B44_FLAG_100_BASE_T) ? |
1811 | SPEED_100 : SPEED_10; | 1811 | SPEED_100 : SPEED_10)); |
1812 | cmd->duplex = (bp->flags & B44_FLAG_FULL_DUPLEX) ? | 1812 | cmd->duplex = (bp->flags & B44_FLAG_FULL_DUPLEX) ? |
1813 | DUPLEX_FULL : DUPLEX_HALF; | 1813 | DUPLEX_FULL : DUPLEX_HALF; |
1814 | cmd->port = 0; | 1814 | cmd->port = 0; |
@@ -1820,7 +1820,7 @@ static int b44_get_settings(struct net_device *dev, struct ethtool_cmd *cmd) | |||
1820 | if (cmd->autoneg == AUTONEG_ENABLE) | 1820 | if (cmd->autoneg == AUTONEG_ENABLE) |
1821 | cmd->advertising |= ADVERTISED_Autoneg; | 1821 | cmd->advertising |= ADVERTISED_Autoneg; |
1822 | if (!netif_running(dev)){ | 1822 | if (!netif_running(dev)){ |
1823 | cmd->speed = 0; | 1823 | ethtool_cmd_speed_set(cmd, 0); |
1824 | cmd->duplex = 0xff; | 1824 | cmd->duplex = 0xff; |
1825 | } | 1825 | } |
1826 | cmd->maxtxpkt = 0; | 1826 | cmd->maxtxpkt = 0; |