aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/arm
diff options
context:
space:
mode:
authorDavid Decotigny <decot@google.com>2011-04-27 14:32:40 -0400
committerDavid S. Miller <davem@davemloft.net>2011-04-29 17:03:01 -0400
commit707394972093e2056e1e8cc39be19cf9bcb3e7b3 (patch)
treef6dc95219bca6895adf304b79241e9d60561f8f5 /drivers/net/arm
parent25db0338813a8915457636b1f6abe6a28fa73f8d (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')
-rw-r--r--drivers/net/arm/etherh.c5
-rw-r--r--drivers/net/arm/ks8695net.c7
2 files changed, 7 insertions, 5 deletions
diff --git a/drivers/net/arm/etherh.c b/drivers/net/arm/etherh.c
index 4af235d41fd..e252cd59501 100644
--- a/drivers/net/arm/etherh.c
+++ b/drivers/net/arm/etherh.c
@@ -591,10 +591,11 @@ static void etherh_get_drvinfo(struct net_device *dev, struct ethtool_drvinfo *i
591static int etherh_get_settings(struct net_device *dev, struct ethtool_cmd *cmd) 591static int etherh_get_settings(struct net_device *dev, struct ethtool_cmd *cmd)
592{ 592{
593 cmd->supported = etherh_priv(dev)->supported; 593 cmd->supported = etherh_priv(dev)->supported;
594 cmd->speed = SPEED_10; 594 ethtool_cmd_speed_set(cmd, SPEED_10);
595 cmd->duplex = DUPLEX_HALF; 595 cmd->duplex = DUPLEX_HALF;
596 cmd->port = dev->if_port == IF_PORT_10BASET ? PORT_TP : PORT_BNC; 596 cmd->port = dev->if_port == IF_PORT_10BASET ? PORT_TP : PORT_BNC;
597 cmd->autoneg = dev->flags & IFF_AUTOMEDIA ? AUTONEG_ENABLE : AUTONEG_DISABLE; 597 cmd->autoneg = (dev->flags & IFF_AUTOMEDIA ?
598 AUTONEG_ENABLE : AUTONEG_DISABLE);
598 return 0; 599 return 0;
599} 600}
600 601
diff --git a/drivers/net/arm/ks8695net.c b/drivers/net/arm/ks8695net.c
index aa07657744c..a7b0caa1817 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 }