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/igbvf | |
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/igbvf')
-rw-r--r-- | drivers/net/igbvf/ethtool.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/net/igbvf/ethtool.c b/drivers/net/igbvf/ethtool.c index 1d943aa7c7a6..112ae15b2d49 100644 --- a/drivers/net/igbvf/ethtool.c +++ b/drivers/net/igbvf/ethtool.c | |||
@@ -90,18 +90,18 @@ static int igbvf_get_settings(struct net_device *netdev, | |||
90 | status = er32(STATUS); | 90 | status = er32(STATUS); |
91 | if (status & E1000_STATUS_LU) { | 91 | if (status & E1000_STATUS_LU) { |
92 | if (status & E1000_STATUS_SPEED_1000) | 92 | if (status & E1000_STATUS_SPEED_1000) |
93 | ecmd->speed = 1000; | 93 | ethtool_cmd_speed_set(ecmd, SPEED_1000); |
94 | else if (status & E1000_STATUS_SPEED_100) | 94 | else if (status & E1000_STATUS_SPEED_100) |
95 | ecmd->speed = 100; | 95 | ethtool_cmd_speed_set(ecmd, SPEED_100); |
96 | else | 96 | else |
97 | ecmd->speed = 10; | 97 | ethtool_cmd_speed_set(ecmd, SPEED_10); |
98 | 98 | ||
99 | if (status & E1000_STATUS_FD) | 99 | if (status & E1000_STATUS_FD) |
100 | ecmd->duplex = DUPLEX_FULL; | 100 | ecmd->duplex = DUPLEX_FULL; |
101 | else | 101 | else |
102 | ecmd->duplex = DUPLEX_HALF; | 102 | ecmd->duplex = DUPLEX_HALF; |
103 | } else { | 103 | } else { |
104 | ecmd->speed = -1; | 104 | ethtool_cmd_speed_set(ecmd, -1); |
105 | ecmd->duplex = -1; | 105 | ecmd->duplex = -1; |
106 | } | 106 | } |
107 | 107 | ||