ethtool: Call ethtool's get/set_settings callbacks with cleaned data

This makes sure that when a driver calls the ethtool's
get/set_settings() callback of another driver, the data passed to it
is clean. This guarantees that speed_hi will be zeroed correctly if
the called callback doesn't explicitely set it: we are sure we don't
get a corrupted speed from the underlying driver. We also take care of
setting the cmd field appropriately (ETHTOOL_GSET/SSET).

This applies to dev_ethtool_get_settings(), which now makes sure it
sets up that ethtool command parameter correctly before passing it to
drivers. This also means that whoever calls dev_ethtool_get_settings()
does not have to clean the ethtool command parameter. This function
also becomes an exported symbol instead of an inline.

All drivers visible to make allyesconfig under x86_64 have been
updated.

Signed-off-by: David Decotigny <decot@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 7 insertions, 4 deletions

diff --git a/drivers/scsi/bnx2fc/bnx2fc_fcoe.c b/drivers/scsi/bnx2fc/bnx2fc_fcoe.c
index e2e647509a73..cd050196a163 100644
--- a/drivers/scsi/bnx2fc/bnx2fc_fcoe.c
+++ b/drivers/scsi/bnx2fc/bnx2fc_fcoe.c
@@ -664,7 +664,7 @@ static void bnx2fc_link_speed_update(struct fc_lport *lport)
         struct fcoe_port *port = lport_priv(lport);
         struct bnx2fc_hba *hba = port->priv;
         struct net_device *netdev = hba->netdev;
-        struct ethtool_cmd ecmd = { ETHTOOL_GSET };
+        struct ethtool_cmd ecmd;
 
         if (!dev_ethtool_get_settings(netdev, &ecmd)) {
                 lport->link_supported_speeds &=
@@ -675,12 +675,15 @@ static void bnx2fc_link_speed_update(struct fc_lport *lport)
                 if (ecmd.supported & SUPPORTED_10000baseT_Full)
                         lport->link_supported_speeds |= FC_PORTSPEED_10GBIT;
 
-                if (ecmd.speed == SPEED_1000)
+                switch (ethtool_cmd_speed(&ecmd)) {
+                case SPEED_1000:
                         lport->link_speed = FC_PORTSPEED_1GBIT;
-                if (ecmd.speed == SPEED_10000)
+                        break;
+                case SPEED_10000:
                         lport->link_speed = FC_PORTSPEED_10GBIT;
+                        break;
+                }
         }
-        return;
 }
 static int bnx2fc_link_ok(struct fc_lport *lport)
 {