diff options
author | Eran Ben Elisha <eranbe@mellanox.com> | 2016-06-09 17:07:39 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2016-06-10 01:06:27 -0400 |
commit | 811afeaa3797bdf4eabed286100811b33005c9e0 (patch) | |
tree | b81ce50f96cf4bd846d2666e74dd3a7436b3d22d /drivers/net/ethernet | |
parent | 62e3c24ac4f0ee307c41a3652636f88a3f8d165c (diff) |
net/mlx5e: Use ndo_stop explicitly at shutdown flow
The current implementation copies the flow of ndo_stop instead of
calling it explicitly, Fixed it.
Fixes: 5fc7197d3a25 ("net/mlx5: Add pci shutdown callback")
Signed-off-by: Eran Ben Elisha <eranbe@mellanox.com>
Signed-off-by: Saeed Mahameed <saeedm@mellanox.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet')
-rw-r--r-- | drivers/net/ethernet/mellanox/mlx5/core/en_main.c | 5 |
1 files changed, 1 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 fd4392999eee..f5c8d5db25a8 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/en_main.c +++ b/drivers/net/ethernet/mellanox/mlx5/core/en_main.c | |||
@@ -3192,10 +3192,7 @@ static void mlx5e_destroy_netdev(struct mlx5_core_dev *mdev, void *vpriv) | |||
3192 | flush_workqueue(priv->wq); | 3192 | flush_workqueue(priv->wq); |
3193 | if (test_bit(MLX5_INTERFACE_STATE_SHUTDOWN, &mdev->intf_state)) { | 3193 | if (test_bit(MLX5_INTERFACE_STATE_SHUTDOWN, &mdev->intf_state)) { |
3194 | netif_device_detach(netdev); | 3194 | netif_device_detach(netdev); |
3195 | mutex_lock(&priv->state_lock); | 3195 | mlx5e_close(netdev); |
3196 | if (test_bit(MLX5E_STATE_OPENED, &priv->state)) | ||
3197 | mlx5e_close_locked(netdev); | ||
3198 | mutex_unlock(&priv->state_lock); | ||
3199 | } else { | 3196 | } else { |
3200 | unregister_netdev(netdev); | 3197 | unregister_netdev(netdev); |
3201 | } | 3198 | } |