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/sungem.c b/drivers/net/sungem.c
index 81b6eb8ed4d7..40a755dd1a26 100644
--- a/drivers/net/sungem.c
+++ b/drivers/net/sungem.c
@@ -1294,7 +1294,7 @@ static void gem_begin_auto_negotiation(struct gem *gp, struct ethtool_cmd *ep)
                 autoneg = 1;
         } else {
                 autoneg = 0;
-                speed = ep->speed;
+                speed = ethtool_cmd_speed(ep);
                 duplex = ep->duplex;
         }
 
@@ -2686,6 +2686,7 @@ static int gem_get_settings(struct net_device *dev, struct ethtool_cmd *cmd)
 static int gem_set_settings(struct net_device *dev, struct ethtool_cmd *cmd)
 {
         struct gem *gp = netdev_priv(dev);
+        u32 speed = ethtool_cmd_speed(cmd);
 
         /* Verify the settings we care about. */
         if (cmd->autoneg != AUTONEG_ENABLE &&
@@ -2697,9 +2698,9 @@ static int gem_set_settings(struct net_device *dev, struct ethtool_cmd *cmd)
                 return -EINVAL;
 
         if (cmd->autoneg == AUTONEG_DISABLE &&
-            ((cmd->speed != SPEED_1000 &&
-              cmd->speed != SPEED_100 &&
-              cmd->speed != SPEED_10) ||
+            ((speed != SPEED_1000 &&
+              speed != SPEED_100 &&
+              speed != SPEED_10) ||
              (cmd->duplex != DUPLEX_HALF &&
               cmd->duplex != DUPLEX_FULL)))
                 return -EINVAL;