aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/natsemi.c
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/natsemi.c
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/natsemi.c')
-rw-r--r--drivers/net/natsemi.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/natsemi.c b/drivers/net/natsemi.c
index 7633c67b7842..b78be088c4ad 100644
--- a/drivers/net/natsemi.c
+++ b/drivers/net/natsemi.c
@@ -2820,7 +2820,7 @@ static int netdev_get_ecmd(struct net_device *dev, struct ethtool_cmd *ecmd)
2820 u32 tmp; 2820 u32 tmp;
2821 2821
2822 ecmd->port = dev->if_port; 2822 ecmd->port = dev->if_port;
2823 ecmd->speed = np->speed; 2823 ethtool_cmd_speed_set(ecmd, np->speed);
2824 ecmd->duplex = np->duplex; 2824 ecmd->duplex = np->duplex;
2825 ecmd->autoneg = np->autoneg; 2825 ecmd->autoneg = np->autoneg;
2826 ecmd->advertising = 0; 2826 ecmd->advertising = 0;
@@ -2878,9 +2878,9 @@ static int netdev_get_ecmd(struct net_device *dev, struct ethtool_cmd *ecmd)
2878 tmp = mii_nway_result( 2878 tmp = mii_nway_result(
2879 np->advertising & mdio_read(dev, MII_LPA)); 2879 np->advertising & mdio_read(dev, MII_LPA));
2880 if (tmp == LPA_100FULL || tmp == LPA_100HALF) 2880 if (tmp == LPA_100FULL || tmp == LPA_100HALF)
2881 ecmd->speed = SPEED_100; 2881 ethtool_cmd_speed_set(ecmd, SPEED_100);
2882 else 2882 else
2883 ecmd->speed = SPEED_10; 2883 ethtool_cmd_speed_set(ecmd, SPEED_10);
2884 if (tmp == LPA_100FULL || tmp == LPA_10FULL) 2884 if (tmp == LPA_100FULL || tmp == LPA_10FULL)
2885 ecmd->duplex = DUPLEX_FULL; 2885 ecmd->duplex = DUPLEX_FULL;
2886 else 2886 else