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, 7 insertions, 18 deletions

diff --git a/drivers/net/dl2k.c b/drivers/net/dl2k.c
index c05db6046050..ab63989619d4 100644
--- a/drivers/net/dl2k.c
+++ b/drivers/net/dl2k.c
@@ -1219,31 +1219,20 @@ static int rio_set_settings(struct net_device *dev, struct ethtool_cmd *cmd)
         } else {
                 np->an_enable = 0;
                 if (np->speed == 1000) {
-                        cmd->speed = SPEED_100;
+                        ethtool_cmd_speed_set(cmd, SPEED_100);
                         cmd->duplex = DUPLEX_FULL;
                         printk("Warning!! Can't disable Auto negotiation in 1000Mbps, change to Manual 100Mbps, Full duplex.\n");
                 }
-                switch(cmd->speed + cmd->duplex) {
-
-                case SPEED_10 + DUPLEX_HALF:
-                        np->speed = 10;
-                        np->full_duplex = 0;
-                        break;
-
-                case SPEED_10 + DUPLEX_FULL:
+                switch (ethtool_cmd_speed(cmd)) {
+                case SPEED_10:
                         np->speed = 10;
-                        np->full_duplex = 1;
+                        np->full_duplex = (cmd->duplex == DUPLEX_FULL);
                         break;
-                case SPEED_100 + DUPLEX_HALF:
+                case SPEED_100:
                         np->speed = 100;
-                        np->full_duplex = 0;
-                        break;
-                case SPEED_100 + DUPLEX_FULL:
-                        np->speed = 100;
-                        np->full_duplex = 1;
+                        np->full_duplex = (cmd->duplex == DUPLEX_FULL);
                         break;
-                case SPEED_1000 + DUPLEX_HALF:/* not supported */
-                case SPEED_1000 + DUPLEX_FULL:/* not supported */
+                case SPEED_1000: /* not supported */
                 default:
                         return -EINVAL;
                 }