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>

4 files changed, 26 insertions, 22 deletions

diff --git a/drivers/net/usb/asix.c b/drivers/net/usb/asix.c
index 6140b56cce53..6998aa6b7bb7 100644
--- a/drivers/net/usb/asix.c
+++ b/drivers/net/usb/asix.c
@@ -847,7 +847,7 @@ static void ax88172_set_multicast(struct net_device *net)
 static int ax88172_link_reset(struct usbnet *dev)
 {
         u8 mode;
-        struct ethtool_cmd ecmd;
+        struct ethtool_cmd ecmd = { .cmd = ETHTOOL_GSET };
 
         mii_check_media(&dev->mii, 1, 1);
         mii_ethtool_gset(&dev->mii, &ecmd);
@@ -856,8 +856,8 @@ static int ax88172_link_reset(struct usbnet *dev)
         if (ecmd.duplex != DUPLEX_FULL)
                 mode |= ~AX88172_MEDIUM_FD;
 
-        netdev_dbg(dev->net, "ax88172_link_reset() speed: %d duplex: %d setting mode to 0x%04x\n",
-                   ecmd.speed, ecmd.duplex, mode);
+        netdev_dbg(dev->net, "ax88172_link_reset() speed: %u duplex: %d setting mode to 0x%04x\n",
+                   ethtool_cmd_speed(&ecmd), ecmd.duplex, mode);
 
         asix_write_medium_mode(dev, mode);
 
@@ -947,20 +947,20 @@ static const struct ethtool_ops ax88772_ethtool_ops = {
 static int ax88772_link_reset(struct usbnet *dev)
 {
         u16 mode;
-        struct ethtool_cmd ecmd;
+        struct ethtool_cmd ecmd = { .cmd = ETHTOOL_GSET };
 
         mii_check_media(&dev->mii, 1, 1);
         mii_ethtool_gset(&dev->mii, &ecmd);
         mode = AX88772_MEDIUM_DEFAULT;
 
-        if (ecmd.speed != SPEED_100)
+        if (ethtool_cmd_speed(&ecmd) != SPEED_100)
                 mode &= ~AX_MEDIUM_PS;
 
         if (ecmd.duplex != DUPLEX_FULL)
                 mode &= ~AX_MEDIUM_FD;
 
-        netdev_dbg(dev->net, "ax88772_link_reset() speed: %d duplex: %d setting mode to 0x%04x\n",
-                   ecmd.speed, ecmd.duplex, mode);
+        netdev_dbg(dev->net, "ax88772_link_reset() speed: %u duplex: %d setting mode to 0x%04x\n",
+                   ethtool_cmd_speed(&ecmd), ecmd.duplex, mode);
 
         asix_write_medium_mode(dev, mode);
 
@@ -1173,18 +1173,20 @@ static int marvell_led_status(struct usbnet *dev, u16 speed)
 static int ax88178_link_reset(struct usbnet *dev)
 {
         u16 mode;
-        struct ethtool_cmd ecmd;
+        struct ethtool_cmd ecmd = { .cmd = ETHTOOL_GSET };
         struct asix_data *data = (struct asix_data *)&dev->data;
+        u32 speed;
 
         netdev_dbg(dev->net, "ax88178_link_reset()\n");
 
         mii_check_media(&dev->mii, 1, 1);
         mii_ethtool_gset(&dev->mii, &ecmd);
         mode = AX88178_MEDIUM_DEFAULT;
+        speed = ethtool_cmd_speed(&ecmd);
 
-        if (ecmd.speed == SPEED_1000)
+        if (speed == SPEED_1000)
                 mode |= AX_MEDIUM_GM;
-        else if (ecmd.speed == SPEED_100)
+        else if (speed == SPEED_100)
                 mode |= AX_MEDIUM_PS;
         else
                 mode &= ~(AX_MEDIUM_PS | AX_MEDIUM_GM);
@@ -1196,13 +1198,13 @@ static int ax88178_link_reset(struct usbnet *dev)
         else
                 mode &= ~AX_MEDIUM_FD;
 
-        netdev_dbg(dev->net, "ax88178_link_reset() speed: %d duplex: %d setting mode to 0x%04x\n",
-                   ecmd.speed, ecmd.duplex, mode);
+        netdev_dbg(dev->net, "ax88178_link_reset() speed: %u duplex: %d setting mode to 0x%04x\n",
+                   speed, ecmd.duplex, mode);
 
         asix_write_medium_mode(dev, mode);
 
         if (data->phymode == PHY_MODE_MARVELL && data->ledmode)
-                marvell_led_status(dev, ecmd.speed);
+                marvell_led_status(dev, speed);
 
         return 0;
 }
diff --git a/drivers/net/usb/dm9601.c b/drivers/net/usb/dm9601.c
index 5002f5be47be..1d93133e9b74 100644
--- a/drivers/net/usb/dm9601.c
+++ b/drivers/net/usb/dm9601.c
@@ -599,13 +599,13 @@ static void dm9601_status(struct usbnet *dev, struct urb *urb)
 
 static int dm9601_link_reset(struct usbnet *dev)
 {
-        struct ethtool_cmd ecmd;
+        struct ethtool_cmd ecmd = { .cmd = ETHTOOL_GSET };
 
         mii_check_media(&dev->mii, 1, 1);
         mii_ethtool_gset(&dev->mii, &ecmd);
 
-        netdev_dbg(dev->net, "link_reset() speed: %d duplex: %d\n",
-                   ecmd.speed, ecmd.duplex);
+        netdev_dbg(dev->net, "link_reset() speed: %u duplex: %d\n",
+                   ethtool_cmd_speed(&ecmd), ecmd.duplex);
 
         return 0;
 }
diff --git a/drivers/net/usb/smsc75xx.c b/drivers/net/usb/smsc75xx.c
index 860a20c938b4..15b3d6888ae9 100644
--- a/drivers/net/usb/smsc75xx.c
+++ b/drivers/net/usb/smsc75xx.c
@@ -503,7 +503,7 @@ static int smsc75xx_update_flowcontrol(struct usbnet *dev, u8 duplex,
 static int smsc75xx_link_reset(struct usbnet *dev)
 {
         struct mii_if_info *mii = &dev->mii;
-        struct ethtool_cmd ecmd;
+        struct ethtool_cmd ecmd = { .cmd = ETHTOOL_GSET };
         u16 lcladv, rmtadv;
         int ret;
 
@@ -519,8 +519,9 @@ static int smsc75xx_link_reset(struct usbnet *dev)
         lcladv = smsc75xx_mdio_read(dev->net, mii->phy_id, MII_ADVERTISE);
         rmtadv = smsc75xx_mdio_read(dev->net, mii->phy_id, MII_LPA);
 
-        netif_dbg(dev, link, dev->net, "speed: %d duplex: %d lcladv: %04x"
-                " rmtadv: %04x", ecmd.speed, ecmd.duplex, lcladv, rmtadv);
+        netif_dbg(dev, link, dev->net, "speed: %u duplex: %d lcladv: %04x"
+                  " rmtadv: %04x", ethtool_cmd_speed(&ecmd),
+                  ecmd.duplex, lcladv, rmtadv);
 
         return smsc75xx_update_flowcontrol(dev, ecmd.duplex, lcladv, rmtadv);
 }
diff --git a/drivers/net/usb/smsc95xx.c b/drivers/net/usb/smsc95xx.c
index 24f4b3739dd2..b374a9997908 100644
--- a/drivers/net/usb/smsc95xx.c
+++ b/drivers/net/usb/smsc95xx.c
@@ -457,7 +457,7 @@ static int smsc95xx_link_reset(struct usbnet *dev)
 {
         struct smsc95xx_priv *pdata = (struct smsc95xx_priv *)(dev->data[0]);
         struct mii_if_info *mii = &dev->mii;
-        struct ethtool_cmd ecmd;
+        struct ethtool_cmd ecmd = { .cmd = ETHTOOL_GSET };
         unsigned long flags;
         u16 lcladv, rmtadv;
         u32 intdata;
@@ -472,8 +472,9 @@ static int smsc95xx_link_reset(struct usbnet *dev)
         lcladv = smsc95xx_mdio_read(dev->net, mii->phy_id, MII_ADVERTISE);
         rmtadv = smsc95xx_mdio_read(dev->net, mii->phy_id, MII_LPA);
 
-        netif_dbg(dev, link, dev->net, "speed: %d duplex: %d lcladv: %04x rmtadv: %04x\n",
-                  ecmd.speed, ecmd.duplex, lcladv, rmtadv);
+        netif_dbg(dev, link, dev->net,
+                  "speed: %u duplex: %d lcladv: %04x rmtadv: %04x\n",
+                  ethtool_cmd_speed(&ecmd), ecmd.duplex, lcladv, rmtadv);
 
         spin_lock_irqsave(&pdata->mac_cr_lock, flags);
         if (ecmd.duplex != DUPLEX_FULL) {