1 files changed, 8 insertions, 10 deletions

diff --git a/drivers/net/ethernet/mellanox/mlx4/en_ethtool.c b/drivers/net/ethernet/mellanox/mlx4/en_ethtool.c
index 569eda9e83d6..a7b58ba8492b 100644
--- a/drivers/net/ethernet/mellanox/mlx4/en_ethtool.c
+++ b/drivers/net/ethernet/mellanox/mlx4/en_ethtool.c
@@ -770,22 +770,20 @@ static int mlx4_en_set_settings(struct net_device *dev, struct ethtool_cmd *cmd)
                 return 0;
         }
 
-        proto_admin = cpu_to_be32(ptys_adv);
-        if (speed >= 0 && speed != priv->port_state.link_speed)
-                /* If speed was set then speed decides :-) */
-                proto_admin = speed_set_ptys_admin(priv, speed,
-                                                   ptys_reg.eth_proto_cap);
+        proto_admin = cmd->autoneg == AUTONEG_ENABLE ?
+                cpu_to_be32(ptys_adv) :
+                speed_set_ptys_admin(priv, speed,
+                                     ptys_reg.eth_proto_cap);
 
         proto_admin &= ptys_reg.eth_proto_cap;
-
-        if (proto_admin == ptys_reg.eth_proto_admin)
-                return 0; /* Nothing to change */
-
         if (!proto_admin) {
                 en_warn(priv, "Not supported link mode(s) requested, check supported link modes.\n");
                 return -EINVAL; /* nothing to change due to bad input */
         }
 
+        if (proto_admin == ptys_reg.eth_proto_admin)
+                return 0; /* Nothing to change */
+
         en_dbg(DRV, priv, "mlx4_ACCESS_PTYS_REG SET: ptys_reg.eth_proto_admin = 0x%x\n",
                be32_to_cpu(proto_admin));
 
@@ -798,9 +796,9 @@ static int mlx4_en_set_settings(struct net_device *dev, struct ethtool_cmd *cmd)
                 return ret;
         }
 
-        en_warn(priv, "Port link mode changed, restarting port...\n");
         mutex_lock(&priv->mdev->state_lock);
         if (priv->port_up) {
+                en_warn(priv, "Port link mode changed, restarting port...\n");
                 mlx4_en_stop_port(dev, 1);
                 if (mlx4_en_start_port(dev))
                         en_err(priv, "Failed restarting port %d\n", priv->port);