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, 9 insertions, 6 deletions

diff --git a/drivers/net/mii.c b/drivers/net/mii.c
index e8198edeaa76..4fbc816efee2 100644
--- a/drivers/net/mii.c
+++ b/drivers/net/mii.c
@@ -121,22 +121,25 @@ int mii_ethtool_gset(struct mii_if_info *mii, struct ethtool_cmd *ecmd)
 
                 if (nego & (ADVERTISED_1000baseT_Full |
                             ADVERTISED_1000baseT_Half)) {
-                        ecmd->speed = SPEED_1000;
+                        ethtool_cmd_speed_set(ecmd, SPEED_1000);
                         ecmd->duplex = !!(nego & ADVERTISED_1000baseT_Full);
                 } else if (nego & (ADVERTISED_100baseT_Full |
                                    ADVERTISED_100baseT_Half)) {
-                        ecmd->speed = SPEED_100;
+                        ethtool_cmd_speed_set(ecmd, SPEED_100);
                         ecmd->duplex = !!(nego & ADVERTISED_100baseT_Full);
                 } else {
-                        ecmd->speed = SPEED_10;
+                        ethtool_cmd_speed_set(ecmd, SPEED_10);
                         ecmd->duplex = !!(nego & ADVERTISED_10baseT_Full);
                 }
         } else {
                 ecmd->autoneg = AUTONEG_DISABLE;
 
-                ecmd->speed = ((bmcr & BMCR_SPEED1000 &&
-                                (bmcr & BMCR_SPEED100) == 0) ? SPEED_1000 :
-                               (bmcr & BMCR_SPEED100) ? SPEED_100 : SPEED_10);
+                ethtool_cmd_speed_set(ecmd,
+                                      ((bmcr & BMCR_SPEED1000 &&
+                                        (bmcr & BMCR_SPEED100) == 0) ?
+                                       SPEED_1000 :
+                                       ((bmcr & BMCR_SPEED100) ?
+                                        SPEED_100 : SPEED_10)));
                 ecmd->duplex = (bmcr & BMCR_FULLDPLX) ? DUPLEX_FULL : DUPLEX_HALF;
         }