Unverified Commit 4f6c0bee authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!15101 net/mlx5e: Don't call cleanup on profile rollback failure 

Merge Pull Request from: @ci-robot 
 
PR sync from: Dong Chenchen <dongchenchen2@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/7X74BOPBJMJC5I3ILHG6DSMJMBBOEWP7/ 
 
https://gitee.com/src-openeuler/kernel/issues/IB2SU8 
 
Link:https://gitee.com/openeuler/kernel/pulls/15101

 

Reviewed-by: default avatarZhang Changzhong <zhangchangzhong@huawei.com>
Reviewed-by: default avatarZhang Peng <zhangpeng362@huawei.com>
Signed-off-by: default avatarZhang Peng <zhangpeng362@huawei.com>
parents 306a08f9 a4ce0ce6

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

+3 −1
Original line number Diff line number Diff line
@@ -6118,6 +6118,8 @@ static void mlx5e_remove(struct auxiliary_device *adev) 
	mlx5e_dcbnl_delete_app(priv);

	unregister_netdev(priv->netdev);

	_mlx5e_suspend(adev, false);

	/* Avoid cleanup if profile rollback failed. */

	if (priv->profile)

		priv->profile->cleanup(priv);

	mlx5e_destroy_netdev(priv);

	mlx5e_devlink_port_unregister(mlx5e_dev);