Unverified Commit 710d9571 authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!12244 v2 net/mlx5e: Fix netif state handling 

Merge Pull Request from: @ci-robot 
 
PR sync from: Liu Jian <liujian56@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/W4EIYZAW43BL37GHDXQMQDUY5TXFT5DJ/ 
 
https://gitee.com/src-openeuler/kernel/issues/IA6S7G 
 
Link:https://gitee.com/openeuler/kernel/pulls/12244

 

Reviewed-by: default avatarYue Haibing <yuehaibing@huawei.com>
Signed-off-by: default avatarYang Yingliang <yangyingliang@huawei.com>
parents 56bd74ee 8453e177

drivers/net/ethernet/mellanox/mlx5/core/en_main.c

+8 −3
Original line number Diff line number Diff line
@@ -5578,7 +5578,7 @@ static int mlx5e_attach(struct mlx5_core_dev *mdev, void *vpriv) 
	return 0;

}



static void mlx5e_detach(struct mlx5_core_dev *mdev, void *vpriv)

static void __mlx5e_detach(struct mlx5_core_dev *mdev, void *vpriv, bool pre_netdev_reg)

{

	struct mlx5e_priv *priv = vpriv;

	struct net_device *netdev = priv->netdev;
@@ -5588,13 +5588,18 @@ static void mlx5e_detach(struct mlx5_core_dev *mdev, void *vpriv) 
		return;

#endif



	if (!netif_device_present(netdev))

	if (!pre_netdev_reg && !netif_device_present(netdev))

		return;



	mlx5e_detach_netdev(priv);

	mlx5e_destroy_mdev_resources(mdev);

}



static void mlx5e_detach(struct mlx5_core_dev *mdev, void *vpriv)

{

	__mlx5e_detach(mdev, vpriv, false);

}



static void *mlx5e_add(struct mlx5_core_dev *mdev)

{

	struct net_device *netdev;
@@ -5642,7 +5647,7 @@ static void *mlx5e_add(struct mlx5_core_dev *mdev) 
	return priv;



err_detach:

	mlx5e_detach(mdev, priv);

	__mlx5e_detach(mdev, priv, true);

err_destroy_netdev:

	mlx5e_destroy_netdev(priv);

	return NULL;