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, 18 insertions, 5 deletions

diff --git a/drivers/net/ehea/ehea_ethtool.c b/drivers/net/ehea/ehea_ethtool.c
index 5f13491cf2a..1df5f40c646 100644
--- a/drivers/net/ehea/ehea_ethtool.c
+++ b/drivers/net/ehea/ehea_ethtool.c
@@ -34,6 +34,7 @@
 static int ehea_get_settings(struct net_device *dev, struct ethtool_cmd *cmd)
 {
         struct ehea_port *port = netdev_priv(dev);
+        u32 speed;
         int ret;
 
         ret = ehea_sense_port_attr(port);
@@ -43,17 +44,29 @@ static int ehea_get_settings(struct net_device *dev, struct ethtool_cmd *cmd)
 
         if (netif_carrier_ok(dev)) {
                 switch (port->port_speed) {
-                case EHEA_SPEED_10M: cmd->speed = SPEED_10; break;
-                case EHEA_SPEED_100M: cmd->speed = SPEED_100; break;
-                case EHEA_SPEED_1G: cmd->speed = SPEED_1000; break;
-                case EHEA_SPEED_10G: cmd->speed = SPEED_10000; break;
+                case EHEA_SPEED_10M:
+                        speed = SPEED_10;
+                        break;
+                case EHEA_SPEED_100M:
+                        speed = SPEED_100;
+                        break;
+                case EHEA_SPEED_1G:
+                        speed = SPEED_1000;
+                        break;
+                case EHEA_SPEED_10G:
+                        speed = SPEED_10000;
+                        break;
+                default:
+                        speed = -1;
+                        break; /* BUG */
                 }
                 cmd->duplex = port->full_duplex == 1 ?
                                                      DUPLEX_FULL : DUPLEX_HALF;
         } else {
-                cmd->speed = -1;
+                speed = ~0;
                 cmd->duplex = -1;
         }
+        ethtool_cmd_speed_set(cmd, speed);
 
         cmd->supported = (SUPPORTED_10000baseT_Full | SUPPORTED_1000baseT_Full
                        | SUPPORTED_100baseT_Full |  SUPPORTED_100baseT_Half