ethtool: Use full 32 bit speed range in ethtool's set_settings

This makes sure the ethtool's set_settings() callback of network
drivers don't ignore the 16 most significant bits when ethtool calls
their set_settings().

All drivers compiled with make allyesconfig on 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, 5 insertions, 4 deletions

diff --git a/drivers/net/tg3.c b/drivers/net/tg3.c
index fa57e3d699de..004f266e4352 100644
--- a/drivers/net/tg3.c
+++ b/drivers/net/tg3.c
@@ -10042,6 +10042,7 @@ static int tg3_get_settings(struct net_device *dev, struct ethtool_cmd *cmd)
 static int tg3_set_settings(struct net_device *dev, struct ethtool_cmd *cmd)
 {
         struct tg3 *tp = netdev_priv(dev);
+        u32 speed = ethtool_cmd_speed(cmd);
 
         if (tg3_flag(tp, USE_PHYLIB)) {
                 struct phy_device *phydev;
@@ -10091,14 +10092,14 @@ static int tg3_set_settings(struct net_device *dev, struct ethtool_cmd *cmd)
                 cmd->advertising &= mask;
         } else {
                 if (tp->phy_flags & TG3_PHYFLG_ANY_SERDES) {
-                        if (cmd->speed != SPEED_1000)
+                        if (speed != SPEED_1000)
                                 return -EINVAL;
 
                         if (cmd->duplex != DUPLEX_FULL)
                                 return -EINVAL;
                 } else {
-                        if (cmd->speed != SPEED_100 &&
-                            cmd->speed != SPEED_10)
+                        if (speed != SPEED_100 &&
+                            speed != SPEED_10)
                                 return -EINVAL;
                 }
         }
@@ -10113,7 +10114,7 @@ static int tg3_set_settings(struct net_device *dev, struct ethtool_cmd *cmd)
                 tp->link_config.duplex = DUPLEX_INVALID;
         } else {
                 tp->link_config.advertising = 0;
-                tp->link_config.speed = cmd->speed;
+                tp->link_config.speed = speed;
                 tp->link_config.duplex = cmd->duplex;
         }