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>

20 files changed, 117 insertions, 89 deletions

diff --git a/arch/mips/txx9/generic/setup_tx4939.c b/arch/mips/txx9/generic/setup_tx4939.c
index 3dc19f48295..e9f95dcde37 100644
--- a/arch/mips/txx9/generic/setup_tx4939.c
+++ b/arch/mips/txx9/generic/setup_tx4939.c
@@ -318,19 +318,15 @@ void __init tx4939_sio_init(unsigned int sclk, unsigned int cts_mask)
 }
 
 #if defined(CONFIG_TC35815) || defined(CONFIG_TC35815_MODULE)
-static int tx4939_get_eth_speed(struct net_device *dev)
+static u32 tx4939_get_eth_speed(struct net_device *dev)
 {
-        struct ethtool_cmd cmd = { ETHTOOL_GSET };
-        int speed = 100;        /* default 100Mbps */
-        int err;
-        if (!dev->ethtool_ops || !dev->ethtool_ops->get_settings)
-                return speed;
-        err = dev->ethtool_ops->get_settings(dev, &cmd);
-        if (err < 0)
-                return speed;
-        speed = cmd.speed == SPEED_100 ? 100 : 10;
-        return speed;
+        struct ethtool_cmd cmd;
+        if (dev_ethtool_get_settings(dev, &cmd))
+                return 100;     /* default 100Mbps */
+
+        return ethtool_cmd_speed(&cmd);
 }
+
 static int tx4939_netdev_event(struct notifier_block *this,
                                unsigned long event,
                                void *ptr)
@@ -343,8 +339,7 @@ static int tx4939_netdev_event(struct notifier_block *this,
                 else if (dev->irq == TXX9_IRQ_BASE + TX4939_IR_ETH(1))
                         bit = TX4939_PCFG_SPEED1;
                 if (bit) {
-                        int speed = tx4939_get_eth_speed(dev);
-                        if (speed == 100)
+                        if (tx4939_get_eth_speed(dev) == 100)
                                 txx9_set64(&tx4939_ccfgptr->pcfg, bit);
                         else
                                 txx9_clear64(&tx4939_ccfgptr->pcfg, bit);
diff --git a/drivers/net/e100.c b/drivers/net/e100.c
index b0aa9e68990..66ba596a4d3 100644
--- a/drivers/net/e100.c
+++ b/drivers/net/e100.c
@@ -1668,7 +1668,7 @@ static void e100_adjust_adaptive_ifs(struct nic *nic, int speed, int duplex)
 static void e100_watchdog(unsigned long data)
 {
         struct nic *nic = (struct nic *)data;
-        struct ethtool_cmd cmd;
+        struct ethtool_cmd cmd = { .cmd = ETHTOOL_GSET };
 
         netif_printk(nic, timer, KERN_DEBUG, nic->netdev,
                      "right now = %ld\n", jiffies);
diff --git a/drivers/net/mdio.c b/drivers/net/mdio.c
index e85bf04cf81..f2d10abd040 100644
--- a/drivers/net/mdio.c
+++ b/drivers/net/mdio.c
@@ -176,6 +176,9 @@ static u32 mdio45_get_an(const struct mdio_if_info *mdio, u16 addr)
  * @npage_adv: Modes currently advertised on next pages
  * @npage_lpa: Modes advertised by link partner on next pages
  *
+ * The @ecmd parameter is expected to have been cleared before calling
+ * mdio45_ethtool_gset_npage().
+ *
  * Since the CSRs for auto-negotiation using next pages are not fully
  * standardised, this function does not attempt to decode them.  The
  * caller must pass them in.
diff --git a/drivers/net/mii.c b/drivers/net/mii.c
index 0a6c6a2e755..05acca78f63 100644
--- a/drivers/net/mii.c
+++ b/drivers/net/mii.c
@@ -58,6 +58,9 @@ static u32 mii_get_an(struct mii_if_info *mii, u16 addr)
  * @mii: MII interface
  * @ecmd: requested ethtool_cmd
  *
+ * The @ecmd parameter is expected to have been cleared before calling
+ * mii_ethtool_gset().
+ *
  * Returns 0 for success, negative on error.
  */
 int mii_ethtool_gset(struct mii_if_info *mii, struct ethtool_cmd *ecmd)
diff --git a/drivers/net/pch_gbe/pch_gbe_main.c b/drivers/net/pch_gbe/pch_gbe_main.c
index 4cc9872f5ec..f3e4b0adae9 100644
--- a/drivers/net/pch_gbe/pch_gbe_main.c
+++ b/drivers/net/pch_gbe/pch_gbe_main.c
@@ -888,12 +888,12 @@ static void pch_gbe_watchdog(unsigned long data)
         struct pch_gbe_adapter *adapter = (struct pch_gbe_adapter *)data;
         struct net_device *netdev = adapter->netdev;
         struct pch_gbe_hw *hw = &adapter->hw;
-        struct ethtool_cmd cmd;
 
         pr_debug("right now = %ld\n", jiffies);
 
         pch_gbe_update_stats(adapter);
         if ((mii_link_ok(&adapter->mii)) && (!netif_carrier_ok(netdev))) {
+                struct ethtool_cmd cmd = { .cmd = ETHTOOL_GSET };
                 netdev->tx_queue_len = adapter->tx_queue_len;
                 /* mii library handles link maintenance tasks */
                 if (mii_ethtool_gset(&adapter->mii, &cmd)) {
@@ -903,7 +903,7 @@ static void pch_gbe_watchdog(unsigned long data)
                                                 PCH_GBE_WATCHDOG_PERIOD));
                         return;
                 }
-                hw->mac.link_speed = cmd.speed;
+                hw->mac.link_speed = ethtool_cmd_speed(&cmd);
                 hw->mac.link_duplex = cmd.duplex;
                 /* Set the RGMII control. */
                 pch_gbe_set_rgmii_ctrl(adapter, hw->mac.link_speed,
@@ -913,7 +913,7 @@ static void pch_gbe_watchdog(unsigned long data)
                                  hw->mac.link_duplex);
                 netdev_dbg(netdev,
                            "Link is Up %d Mbps %s-Duplex\n",
-                           cmd.speed,
+                           hw->mac.link_speed,
                            cmd.duplex == DUPLEX_FULL ? "Full" : "Half");
                 netif_carrier_on(netdev);
                 netif_wake_queue(netdev);
diff --git a/drivers/net/pch_gbe/pch_gbe_phy.c b/drivers/net/pch_gbe/pch_gbe_phy.c
index 923a687acd3..9a8207f686f 100644
--- a/drivers/net/pch_gbe/pch_gbe_phy.c
+++ b/drivers/net/pch_gbe/pch_gbe_phy.c
@@ -247,7 +247,7 @@ inline void pch_gbe_phy_set_rgmii(struct pch_gbe_hw *hw)
 void pch_gbe_phy_init_setting(struct pch_gbe_hw *hw)
 {
         struct pch_gbe_adapter *adapter;
-        struct ethtool_cmd     cmd;
+        struct ethtool_cmd     cmd = { .cmd = ETHTOOL_GSET };
         int ret;
         u16 mii_reg;
 
diff --git a/drivers/net/pcnet32.c b/drivers/net/pcnet32.c
index 0a1efbae1bc..b48aba9e422 100644
--- a/drivers/net/pcnet32.c
+++ b/drivers/net/pcnet32.c
@@ -2099,7 +2099,7 @@ static int pcnet32_open(struct net_device *dev)
                 int first_phy = -1;
                 u16 bmcr;
                 u32 bcr9;
-                struct ethtool_cmd ecmd;
+                struct ethtool_cmd ecmd = { .cmd = ETHTOOL_GSET };
 
                 /*
                  * There is really no good other way to handle multiple PHYs
@@ -2115,9 +2115,9 @@ static int pcnet32_open(struct net_device *dev)
                         ecmd.port = PORT_MII;
                         ecmd.transceiver = XCVR_INTERNAL;
                         ecmd.autoneg = AUTONEG_DISABLE;
-                        ecmd.speed =
-                            lp->
+                        ethtool_cmd_speed_set(&ecmd,
+                                              (lp->options & PCNET32_PORT_100) ?