|
@@ -2036,11 +2036,20 @@ err:
|
|
|
return -ENOMEM;
|
|
|
}
|
|
|
|
|
|
+static void mlx4_en_shutdown(struct net_device *dev)
|
|
|
+{
|
|
|
+ rtnl_lock();
|
|
|
+ netif_device_detach(dev);
|
|
|
+ mlx4_en_close(dev);
|
|
|
+ rtnl_unlock();
|
|
|
+}
|
|
|
|
|
|
void mlx4_en_destroy_netdev(struct net_device *dev)
|
|
|
{
|
|
|
struct mlx4_en_priv *priv = netdev_priv(dev);
|
|
|
struct mlx4_en_dev *mdev = priv->mdev;
|
|
|
+ bool shutdown = mdev->dev->persist->interface_state &
|
|
|
+ MLX4_INTERFACE_STATE_SHUTDOWN;
|
|
|
|
|
|
en_dbg(DRV, priv, "Destroying netdev on port:%d\n", priv->port);
|
|
|
|
|
@@ -2048,7 +2057,10 @@ void mlx4_en_destroy_netdev(struct net_device *dev)
|
|
|
if (priv->registered) {
|
|
|
devlink_port_type_clear(mlx4_get_devlink_port(mdev->dev,
|
|
|
priv->port));
|
|
|
- unregister_netdev(dev);
|
|
|
+ if (shutdown)
|
|
|
+ mlx4_en_shutdown(dev);
|
|
|
+ else
|
|
|
+ unregister_netdev(dev);
|
|
|
}
|
|
|
|
|
|
if (priv->allocated)
|
|
@@ -2073,7 +2085,8 @@ void mlx4_en_destroy_netdev(struct net_device *dev)
|
|
|
kfree(priv->tx_ring);
|
|
|
kfree(priv->tx_cq);
|
|
|
|
|
|
- free_netdev(dev);
|
|
|
+ if (!shutdown)
|
|
|
+ free_netdev(dev);
|
|
|
}
|
|
|
|
|
|
static int mlx4_en_change_mtu(struct net_device *dev, int new_mtu)
|