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, 2 insertions, 3 deletions

diff --git a/drivers/net/stmmac/stmmac_ethtool.c b/drivers/net/stmmac/stmmac_ethtool.c
index 0e61ac8707cb..6f5aaeb986ff 100644
--- a/drivers/net/stmmac/stmmac_ethtool.c
+++ b/drivers/net/stmmac/stmmac_ethtool.c
@@ -237,13 +237,12 @@ stmmac_set_pauseparam(struct net_device *netdev,
 
         if (phy->autoneg) {
                 if (netif_running(netdev)) {
-                        struct ethtool_cmd cmd;
+                        struct ethtool_cmd cmd = { .cmd = ETHTOOL_SSET };
                         /* auto-negotiation automatically restarted */
-                        cmd.cmd = ETHTOOL_NWAY_RST;
                         cmd.supported = phy->supported;
                         cmd.advertising = phy->advertising;
                         cmd.autoneg = phy->autoneg;
-                        cmd.speed = phy->speed;
+                        ethtool_cmd_speed_set(&cmd, phy->speed);
                         cmd.duplex = phy->duplex;
                         cmd.phy_address = phy->addr;
                         ret = phy_ethtool_sset(phy, &cmd);