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

diff --git a/drivers/net/sc92031.c b/drivers/net/sc92031.c
index 76290a8c3c14..f3ffc1df3b2d 100644
--- a/drivers/net/sc92031.c
+++ b/drivers/net/sc92031.c
@@ -1188,10 +1188,11 @@ static int sc92031_ethtool_set_settings(struct net_device *dev,
 {
         struct sc92031_priv *priv = netdev_priv(dev);
         void __iomem *port_base = priv->port_base;
+        u32 speed = ethtool_cmd_speed(cmd);
         u32 phy_ctrl;
         u32 old_phy_ctrl;
 
-        if (!(cmd->speed == SPEED_10 || cmd->speed == SPEED_100))
+        if (!(speed == SPEED_10 || speed == SPEED_100))
                 return -EINVAL;
         if (!(cmd->duplex == DUPLEX_HALF || cmd->duplex == DUPLEX_FULL))
                 return -EINVAL;
@@ -1229,7 +1230,7 @@ static int sc92031_ethtool_set_settings(struct net_device *dev,
                 // FIXME: Whole branch guessed
                 phy_ctrl = 0;
 
-                if (cmd->speed == SPEED_10)
+                if (speed == SPEED_10)
                         phy_ctrl |= PhyCtrlSpd10;
                 else /* cmd->speed == SPEED_100 */
                         phy_ctrl |= PhyCtrlSpd100;