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/infiniband/hw/nes | |
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/infiniband/hw/nes')
-rw-r--r-- | drivers/infiniband/hw/nes/nes_nic.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/infiniband/hw/nes/nes_nic.c b/drivers/infiniband/hw/nes/nes_nic.c index d2e67c4e3228..d3a1c41cfd27 100644 --- a/drivers/infiniband/hw/nes/nes_nic.c +++ b/drivers/infiniband/hw/nes/nes_nic.c | |||
@@ -1493,7 +1493,7 @@ static int nes_netdev_get_settings(struct net_device *netdev, struct ethtool_cmd | |||
1493 | et_cmd->maxrxpkt = 511; | 1493 | et_cmd->maxrxpkt = 511; |
1494 | 1494 | ||
1495 | if (nesadapter->OneG_Mode) { | 1495 | if (nesadapter->OneG_Mode) { |
1496 | et_cmd->speed = SPEED_1000; | 1496 | ethtool_cmd_speed_set(et_cmd, SPEED_1000); |
1497 | if (phy_type == NES_PHY_TYPE_PUMA_1G) { | 1497 | if (phy_type == NES_PHY_TYPE_PUMA_1G) { |
1498 | et_cmd->supported = SUPPORTED_1000baseT_Full; | 1498 | et_cmd->supported = SUPPORTED_1000baseT_Full; |
1499 | et_cmd->advertising = ADVERTISED_1000baseT_Full; | 1499 | et_cmd->advertising = ADVERTISED_1000baseT_Full; |
@@ -1532,7 +1532,7 @@ static int nes_netdev_get_settings(struct net_device *netdev, struct ethtool_cmd | |||
1532 | et_cmd->advertising = ADVERTISED_10000baseT_Full; | 1532 | et_cmd->advertising = ADVERTISED_10000baseT_Full; |
1533 | et_cmd->phy_address = mac_index; | 1533 | et_cmd->phy_address = mac_index; |
1534 | } | 1534 | } |
1535 | et_cmd->speed = SPEED_10000; | 1535 | ethtool_cmd_speed_set(et_cmd, SPEED_10000); |
1536 | et_cmd->autoneg = AUTONEG_DISABLE; | 1536 | et_cmd->autoneg = AUTONEG_DISABLE; |
1537 | return 0; | 1537 | return 0; |
1538 | } | 1538 | } |