aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/acenic.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/acenic.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/acenic.c')
-rw-r--r--drivers/net/acenic.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/net/acenic.c b/drivers/net/acenic.c
index 0b4d8d13c488..a5798991c8b1 100644
--- a/drivers/net/acenic.c
+++ b/drivers/net/acenic.c
@@ -2658,15 +2658,15 @@ static int ace_get_settings(struct net_device *dev, struct ethtool_cmd *ecmd)
2658 2658
2659 link = readl(&regs->GigLnkState); 2659 link = readl(&regs->GigLnkState);
2660 if (link & LNK_1000MB) 2660 if (link & LNK_1000MB)
2661 ecmd->speed = SPEED_1000; 2661 ethtool_cmd_speed_set(ecmd, SPEED_1000);
2662 else { 2662 else {
2663 link = readl(&regs->FastLnkState); 2663 link = readl(&regs->FastLnkState);
2664 if (link & LNK_100MB) 2664 if (link & LNK_100MB)
2665 ecmd->speed = SPEED_100; 2665 ethtool_cmd_speed_set(ecmd, SPEED_100);
2666 else if (link & LNK_10MB) 2666 else if (link & LNK_10MB)
2667 ecmd->speed = SPEED_10; 2667 ethtool_cmd_speed_set(ecmd, SPEED_10);
2668 else 2668 else
2669 ecmd->speed = 0; 2669 ethtool_cmd_speed_set(ecmd, 0);
2670 } 2670 }
2671 if (link & LNK_FULL_DUPLEX) 2671 if (link & LNK_FULL_DUPLEX)
2672 ecmd->duplex = DUPLEX_FULL; 2672 ecmd->duplex = DUPLEX_FULL;