| From cafcd5af6c820f27bab43bb551b18e4e16d209da Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Tue, 25 Jan 2022 12:52:48 +0200 |
| Subject: net/mlx5e: Disable TX queues before registering the netdev |
| |
| From: Maxim Mikityanskiy <maximmi@nvidia.com> |
| |
| [ Upstream commit d08c6e2a4d0308a7922d7ef3b1b3af45d4096aad ] |
| |
| Normally, the queues are disabled when the channels are deactivated, and |
| enabled when the channels are activated. However, on register, the |
| channels are not active, but the queues are enabled by default. This |
| change fixes it, preventing mlx5e_xmit from running when the channels |
| are deactivated in the beginning. |
| |
| Signed-off-by: Maxim Mikityanskiy <maximmi@nvidia.com> |
| Reviewed-by: Tariq Toukan <tariqt@nvidia.com> |
| Signed-off-by: Saeed Mahameed <saeedm@nvidia.com> |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| drivers/net/ethernet/mellanox/mlx5/core/en_main.c | 1 + |
| 1 file changed, 1 insertion(+) |
| |
| diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_main.c b/drivers/net/ethernet/mellanox/mlx5/core/en_main.c |
| index 22de7327c5a8..4730d6c14aeb 100644 |
| --- a/drivers/net/ethernet/mellanox/mlx5/core/en_main.c |
| +++ b/drivers/net/ethernet/mellanox/mlx5/core/en_main.c |
| @@ -5223,6 +5223,7 @@ mlx5e_create_netdev(struct mlx5_core_dev *mdev, const struct mlx5e_profile *prof |
| } |
| |
| netif_carrier_off(netdev); |
| + netif_tx_disable(netdev); |
| dev_net_set(netdev, mlx5_core_net(mdev)); |
| |
| return netdev; |
| -- |
| 2.35.1 |
| |
