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>

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)
 
                 ecmd->port = PORT_TP;
 
-                ecmd->speed = adapter->link_speed;
+                ethtool_cmd_speed_set(ecmd, adapter->link_speed);
                 ecmd->duplex = adapter->link_duplex;
                 ecmd->autoneg = adapter->link_autoneg;
 
@@ -134,7 +134,7 @@ netxen_nic_get_settings(struct net_device *dev, struct ethtool_cmd *ecmd)
                 }
 
                 if (netif_running(dev) && adapter->has_link_events) {
-                        ecmd->speed = adapter->link_speed;
+                        ethtool_cmd_speed_set(ecmd, adapter->link_speed);
                         ecmd->autoneg = adapter->link_autoneg;
                         ecmd->duplex = adapter->link_duplex;
                         goto skip;
@@ -146,10 +146,10 @@ netxen_nic_get_settings(struct net_device *dev, struct ethtool_cmd *ecmd)
                         u16 pcifn = adapter->ahw.pci_func;
 
                         val = NXRD32(adapter, P3_LINK_SPEED_REG(pcifn));
-                        ecmd->speed = P3_LINK_SPEED_MHZ *
-                                        P3_LINK_SPEED_VAL(pcifn, val);
+                        ethtool_cmd_speed_set(ecmd, P3_LINK_SPEED_MHZ *
+                                              P3_LINK_SPEED_VAL(pcifn, val));
                 } else
-                        ecmd->speed = SPEED_10000;
+                        ethtool_cmd_speed_set(ecmd, SPEED_10000);
 
                 ecmd->duplex = DUPLEX_FULL;
                 ecmd->autoneg = AUTONEG_DISABLE;