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

diff --git a/drivers/net/bnx2.c b/drivers/net/bnx2.c
index bf729ee6acbd..e43efd86425b 100644
--- a/drivers/net/bnx2.c
+++ b/drivers/net/bnx2.c
@@ -6758,21 +6758,21 @@ bnx2_set_settings(struct net_device *dev, struct ethtool_cmd *cmd)
                 advertising |= ADVERTISED_Autoneg;
         }
         else {
+                u32 speed = ethtool_cmd_speed(cmd);
                 if (cmd->port == PORT_FIBRE) {
-                        if ((cmd->speed != SPEED_1000 &&
-                             cmd->speed != SPEED_2500) ||
+                        if ((speed != SPEED_1000 &&
+                             speed != SPEED_2500) ||
                             (cmd->duplex != DUPLEX_FULL))
                                 goto err_out_unlock;
 
-                        if (cmd->speed == SPEED_2500 &&
+                        if (speed == SPEED_2500 &&
                             !(bp->phy_flags & BNX2_PHY_FLAG_2_5G_CAPABLE))
                                 goto err_out_unlock;
-                }
-                else if (cmd->speed == SPEED_1000 || cmd->speed == SPEED_2500)
+                } else if (speed == SPEED_1000 || speed == SPEED_2500)
                         goto err_out_unlock;
 
                 autoneg &= ~AUTONEG_SPEED;
-                req_line_speed = cmd->speed;
+                req_line_speed = speed;
                 req_duplex = cmd->duplex;
                 advertising = 0;
         }