Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1e338db5 authored by Yevgeny Petrilin's avatar Yevgeny Petrilin Committed by David S. Miller
Browse files

mlx4_en: Fix a race at restart task 



The query whether the port is up or not should be done at
the execution of the restart task and not when it is queued.

Signed-off-by: default avatarYevgeny Petrilin <yevgenyp@mellanox.co.il>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 9a4f92a6

drivers/net/mlx4/en_netdev.c

+11 −8
Original line number Diff line number Diff line
@@ -348,12 +348,10 @@ static void mlx4_en_tx_timeout(struct net_device *dev) 
	if (netif_msg_timer(priv))

		mlx4_warn(mdev, "Tx timeout called on port:%d\n", priv->port);



	if (netif_carrier_ok(dev)) {

	priv->port_stats.tx_timeout++;

	mlx4_dbg(DRV, priv, "Scheduling watchdog\n");

	queue_work(mdev->workqueue, &priv->watchdog_task);

}

}





static struct net_device_stats *mlx4_en_get_stats(struct net_device *dev)
@@ -761,10 +759,15 @@ static void mlx4_en_restart(struct work_struct *work) 
	struct net_device *dev = priv->dev;



	mlx4_dbg(DRV, priv, "Watchdog task called for port %d\n", priv->port);



	mutex_lock(&mdev->state_lock);

	if (priv->port_up) {

		mlx4_en_stop_port(dev);

		if (mlx4_en_start_port(dev))

			mlx4_err(mdev, "Failed restarting port %d\n", priv->port);

	}

	mutex_unlock(&mdev->state_lock);

}





static int mlx4_en_open(struct net_device *dev)