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/sky2.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/sky2.c')
-rw-r--r-- | drivers/net/sky2.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/sky2.c b/drivers/net/sky2.c index 5c7e2d68df2a..3ee41da130c2 100644 --- a/drivers/net/sky2.c +++ b/drivers/net/sky2.c | |||
@@ -3413,10 +3413,10 @@ static int sky2_get_settings(struct net_device *dev, struct ethtool_cmd *ecmd) | |||
3413 | ecmd->phy_address = PHY_ADDR_MARV; | 3413 | ecmd->phy_address = PHY_ADDR_MARV; |
3414 | if (sky2_is_copper(hw)) { | 3414 | if (sky2_is_copper(hw)) { |
3415 | ecmd->port = PORT_TP; | 3415 | ecmd->port = PORT_TP; |
3416 | ecmd->speed = sky2->speed; | 3416 | ethtool_cmd_speed_set(ecmd, sky2->speed); |
3417 | ecmd->supported |= SUPPORTED_Autoneg | SUPPORTED_TP; | 3417 | ecmd->supported |= SUPPORTED_Autoneg | SUPPORTED_TP; |
3418 | } else { | 3418 | } else { |
3419 | ecmd->speed = SPEED_1000; | 3419 | ethtool_cmd_speed_set(ecmd, SPEED_1000); |
3420 | ecmd->port = PORT_FIBRE; | 3420 | ecmd->port = PORT_FIBRE; |
3421 | ecmd->supported |= SUPPORTED_Autoneg | SUPPORTED_FIBRE; | 3421 | ecmd->supported |= SUPPORTED_Autoneg | SUPPORTED_FIBRE; |
3422 | } | 3422 | } |