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/arm/ks8695net.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/arm/ks8695net.c')
-rw-r--r-- | drivers/net/arm/ks8695net.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/net/arm/ks8695net.c b/drivers/net/arm/ks8695net.c index aa07657744c3..a7b0caa18179 100644 --- a/drivers/net/arm/ks8695net.c +++ b/drivers/net/arm/ks8695net.c | |||
@@ -891,15 +891,16 @@ ks8695_wan_get_settings(struct net_device *ndev, struct ethtool_cmd *cmd) | |||
891 | cmd->advertising |= ADVERTISED_Pause; | 891 | cmd->advertising |= ADVERTISED_Pause; |
892 | cmd->autoneg = AUTONEG_ENABLE; | 892 | cmd->autoneg = AUTONEG_ENABLE; |
893 | 893 | ||
894 | cmd->speed = (ctrl & WMC_WSS) ? SPEED_100 : SPEED_10; | 894 | ethtool_cmd_speed_set(cmd, |
895 | (ctrl & WMC_WSS) ? SPEED_100 : SPEED_10); | ||
895 | cmd->duplex = (ctrl & WMC_WDS) ? | 896 | cmd->duplex = (ctrl & WMC_WDS) ? |
896 | DUPLEX_FULL : DUPLEX_HALF; | 897 | DUPLEX_FULL : DUPLEX_HALF; |
897 | } else { | 898 | } else { |
898 | /* auto-negotiation is disabled */ | 899 | /* auto-negotiation is disabled */ |
899 | cmd->autoneg = AUTONEG_DISABLE; | 900 | cmd->autoneg = AUTONEG_DISABLE; |
900 | 901 | ||
901 | cmd->speed = (ctrl & WMC_WANF100) ? | 902 | ethtool_cmd_speed_set(cmd, ((ctrl & WMC_WANF100) ? |
902 | SPEED_100 : SPEED_10; | 903 | SPEED_100 : SPEED_10)); |
903 | cmd->duplex = (ctrl & WMC_WANFF) ? | 904 | cmd->duplex = (ctrl & WMC_WANFF) ? |
904 | DUPLEX_FULL : DUPLEX_HALF; | 905 | DUPLEX_FULL : DUPLEX_HALF; |
905 | } | 906 | } |