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/s2io.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/s2io.c')
-rw-r--r-- | drivers/net/s2io.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/s2io.c b/drivers/net/s2io.c index 5443985c019e..89cfee7e8643 100644 --- a/drivers/net/s2io.c +++ b/drivers/net/s2io.c | |||
@@ -5414,10 +5414,10 @@ static int s2io_ethtool_gset(struct net_device *dev, struct ethtool_cmd *info) | |||
5414 | info->transceiver = XCVR_EXTERNAL; | 5414 | info->transceiver = XCVR_EXTERNAL; |
5415 | 5415 | ||
5416 | if (netif_carrier_ok(sp->dev)) { | 5416 | if (netif_carrier_ok(sp->dev)) { |
5417 | info->speed = 10000; | 5417 | ethtool_cmd_speed_set(info, SPEED_10000); |
5418 | info->duplex = DUPLEX_FULL; | 5418 | info->duplex = DUPLEX_FULL; |
5419 | } else { | 5419 | } else { |
5420 | info->speed = -1; | 5420 | ethtool_cmd_speed_set(info, -1); |
5421 | info->duplex = -1; | 5421 | info->duplex = -1; |
5422 | } | 5422 | } |
5423 | 5423 | ||