aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/ixgbe
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/ixgbe
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/ixgbe')
-rw-r--r--drivers/net/ixgbe/ixgbe_ethtool.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/net/ixgbe/ixgbe_ethtool.c b/drivers/net/ixgbe/ixgbe_ethtool.c
index c52243d67edc..bcba057b510f 100644
--- a/drivers/net/ixgbe/ixgbe_ethtool.c
+++ b/drivers/net/ixgbe/ixgbe_ethtool.c
@@ -288,20 +288,20 @@ static int ixgbe_get_settings(struct net_device *netdev,
288 if (link_up) { 288 if (link_up) {
289 switch (link_speed) { 289 switch (link_speed) {
290 case IXGBE_LINK_SPEED_10GB_FULL: 290 case IXGBE_LINK_SPEED_10GB_FULL:
291 ecmd->speed = SPEED_10000; 291 ethtool_cmd_speed_set(ecmd, SPEED_10000);
292 break; 292 break;
293 case IXGBE_LINK_SPEED_1GB_FULL: 293 case IXGBE_LINK_SPEED_1GB_FULL:
294 ecmd->speed = SPEED_1000; 294 ethtool_cmd_speed_set(ecmd, SPEED_1000);
295 break; 295 break;
296 case IXGBE_LINK_SPEED_100_FULL: 296 case IXGBE_LINK_SPEED_100_FULL:
297 ecmd->speed = SPEED_100; 297 ethtool_cmd_speed_set(ecmd, SPEED_100);
298 break; 298 break;
299 default: 299 default:
300 break; 300 break;
301 } 301 }
302 ecmd->duplex = DUPLEX_FULL; 302 ecmd->duplex = DUPLEX_FULL;
303 } else { 303 } else {
304 ecmd->speed = -1; 304 ethtool_cmd_speed_set(ecmd, -1);
305 ecmd->duplex = -1; 305 ecmd->duplex = -1;
306 } 306 }
307 307