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

diff --git a/drivers/net/via-velocity.c b/drivers/net/via-velocity.c
index baf04b0a6575..9a8f116e6920 100644
--- a/drivers/net/via-velocity.c
+++ b/drivers/net/via-velocity.c
@@ -3247,9 +3247,11 @@ static int velocity_get_settings(struct net_device *dev, struct ethtool_cmd *cmd
         return 0;
 }
 
-static int velocity_set_settings(struct net_device *dev, struct ethtool_cmd *cmd)
+static int velocity_set_settings(struct net_device *dev,
+                                 struct ethtool_cmd *cmd)
 {
         struct velocity_info *vptr = netdev_priv(dev);
+        u32 speed = ethtool_cmd_speed(cmd);
         u32 curr_status;
         u32 new_status = 0;
         int ret = 0;
@@ -3258,9 +3260,9 @@ static int velocity_set_settings(struct net_device *dev, struct ethtool_cmd *cmd
         curr_status &= (~VELOCITY_LINK_FAIL);
 
         new_status |= ((cmd->autoneg) ? VELOCITY_AUTONEG_ENABLE : 0);
-        new_status |= ((cmd->speed == SPEED_1000) ? VELOCITY_SPEED_1000 : 0);
-        new_status |= ((cmd->speed == SPEED_100) ? VELOCITY_SPEED_100 : 0);
-        new_status |= ((cmd->speed == SPEED_10) ? VELOCITY_SPEED_10 : 0);
+        new_status |= ((speed == SPEED_1000) ? VELOCITY_SPEED_1000 : 0);
+        new_status |= ((speed == SPEED_100) ? VELOCITY_SPEED_100 : 0);
+        new_status |= ((speed == SPEED_10) ? VELOCITY_SPEED_10 : 0);
         new_status |= ((cmd->duplex == DUPLEX_FULL) ? VELOCITY_DUPLEX_FULL : 0);
 
         if ((new_status & VELOCITY_AUTONEG_ENABLE) &&