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

diff --git a/drivers/net/b44.c b/drivers/net/b44.c
index 2e2b76258ab4..909cc4b2a2f3 100644
--- a/drivers/net/b44.c
+++ b/drivers/net/b44.c
@@ -1831,6 +1831,7 @@ static int b44_get_settings(struct net_device *dev, struct ethtool_cmd *cmd)
 static int b44_set_settings(struct net_device *dev, struct ethtool_cmd *cmd)
 {
         struct b44 *bp = netdev_priv(dev);
+        u32 speed = ethtool_cmd_speed(cmd);
 
         /* We do not support gigabit. */
         if (cmd->autoneg == AUTONEG_ENABLE) {
@@ -1838,8 +1839,8 @@ static int b44_set_settings(struct net_device *dev, struct ethtool_cmd *cmd)
                     (ADVERTISED_1000baseT_Half |
                      ADVERTISED_1000baseT_Full))
                         return -EINVAL;
-        } else if ((cmd->speed != SPEED_100 &&
-                    cmd->speed != SPEED_10) ||
+        } else if ((speed != SPEED_100 &&
+                    speed != SPEED_10) ||
                    (cmd->duplex != DUPLEX_HALF &&
                     cmd->duplex != DUPLEX_FULL)) {
                         return -EINVAL;
@@ -1873,7 +1874,7 @@ static int b44_set_settings(struct net_device *dev, struct ethtool_cmd *cmd)
         } else {
                 bp->flags |= B44_FLAG_FORCE_LINK;
                 bp->flags &= ~(B44_FLAG_100_BASE_T | B44_FLAG_FULL_DUPLEX);
-                if (cmd->speed == SPEED_100)
+                if (speed == SPEED_100)
                         bp->flags |= B44_FLAG_100_BASE_T;
                 if (cmd->duplex == DUPLEX_FULL)
                         bp->flags |= B44_FLAG_FULL_DUPLEX;