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/net/netxen | |
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/net/netxen')
-rw-r--r-- | drivers/net/netxen/netxen_nic_ethtool.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/net/netxen/netxen_nic_ethtool.c b/drivers/net/netxen/netxen_nic_ethtool.c index e8d16f6f11e3..b34fb74d07e3 100644 --- a/drivers/net/netxen/netxen_nic_ethtool.c +++ b/drivers/net/netxen/netxen_nic_ethtool.c | |||
@@ -117,7 +117,7 @@ netxen_nic_get_settings(struct net_device *dev, struct ethtool_cmd *ecmd) | |||
117 | 117 | ||
118 | ecmd->port = PORT_TP; | 118 | ecmd->port = PORT_TP; |
119 | 119 | ||
120 | ecmd->speed = adapter->link_speed; | 120 | ethtool_cmd_speed_set(ecmd, adapter->link_speed); |
121 | ecmd->duplex = adapter->link_duplex; | 121 | ecmd->duplex = adapter->link_duplex; |
122 | ecmd->autoneg = adapter->link_autoneg; | 122 | ecmd->autoneg = adapter->link_autoneg; |
123 | 123 | ||
@@ -134,7 +134,7 @@ netxen_nic_get_settings(struct net_device *dev, struct ethtool_cmd *ecmd) | |||
134 | } | 134 | } |
135 | 135 | ||
136 | if (netif_running(dev) && adapter->has_link_events) { | 136 | if (netif_running(dev) && adapter->has_link_events) { |
137 | ecmd->speed = adapter->link_speed; | 137 | ethtool_cmd_speed_set(ecmd, adapter->link_speed); |
138 | ecmd->autoneg = adapter->link_autoneg; | 138 | ecmd->autoneg = adapter->link_autoneg; |
139 | ecmd->duplex = adapter->link_duplex; | 139 | ecmd->duplex = adapter->link_duplex; |
140 | goto skip; | 140 | goto skip; |
@@ -146,10 +146,10 @@ netxen_nic_get_settings(struct net_device *dev, struct ethtool_cmd *ecmd) | |||
146 | u16 pcifn = adapter->ahw.pci_func; | 146 | u16 pcifn = adapter->ahw.pci_func; |
147 | 147 | ||
148 | val = NXRD32(adapter, P3_LINK_SPEED_REG(pcifn)); | 148 | val = NXRD32(adapter, P3_LINK_SPEED_REG(pcifn)); |
149 | ecmd->speed = P3_LINK_SPEED_MHZ * | 149 | ethtool_cmd_speed_set(ecmd, P3_LINK_SPEED_MHZ * |
150 | P3_LINK_SPEED_VAL(pcifn, val); | 150 | P3_LINK_SPEED_VAL(pcifn, val)); |
151 | } else | 151 | } else |
152 | ecmd->speed = SPEED_10000; | 152 | ethtool_cmd_speed_set(ecmd, SPEED_10000); |
153 | 153 | ||
154 | ecmd->duplex = DUPLEX_FULL; | 154 | ecmd->duplex = DUPLEX_FULL; |
155 | ecmd->autoneg = AUTONEG_DISABLE; | 155 | ecmd->autoneg = AUTONEG_DISABLE; |