net/mlx5e: Disable netdev after close

Disable netdev should come after it was closed, although no harm of doing it
before -hence the MLX5E_STATE_DESTROYING bit- but it is more natural this way.

Fixes: 26e59d8077a3 ("net/mlx5e: Implement mlx5e interface attach/detach callbacks")
Signed-off-by: Saeed Mahameed <saeedm@mellanox.com>
Reviewed-by: Mohamad Haj Yahia <mohamad@mellanox.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 4 insertions, 4 deletions

diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_main.c b/drivers/net/ethernet/mellanox/mlx5/core/en_main.c
index cf270f6c90e8..1236b27b1493 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/en_main.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en_main.c
@@ -3947,10 +3947,6 @@ void mlx5e_detach_netdev(struct mlx5_core_dev *mdev, struct net_device *netdev)
         const struct mlx5e_profile *profile = priv->profile;
 
         set_bit(MLX5E_STATE_DESTROYING, &priv->state);
-        if (profile->disable)
-                profile->disable(priv);
-
-        flush_workqueue(priv->wq);
 
         rtnl_lock();
         if (netif_running(netdev))
@@ -3958,6 +3954,10 @@ void mlx5e_detach_netdev(struct mlx5_core_dev *mdev, struct net_device *netdev)
         netif_device_detach(netdev);
         rtnl_unlock();
 
+        if (profile->disable)
+                profile->disable(priv);
+        flush_workqueue(priv->wq);
+
         mlx5e_destroy_q_counter(priv);
         profile->cleanup_rx(priv);
         mlx5e_close_drop_rq(priv);