Unverified Commit 3e84c5c1 authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!11091 net/mlx5: Always drain health in shutdown callback 

Merge Pull Request from: @ci-robot 
 
PR sync from: Zhengchao Shao <shaozhengchao@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/WON27A5EZGHRDCQ56SHCPUFFUOQUFVDG/ 
 
https://gitee.com/src-openeuler/kernel/issues/IALCRV 
 
Link:https://gitee.com/openeuler/kernel/pulls/11091

 

Reviewed-by: default avatarYue Haibing <yuehaibing@huawei.com>
Signed-off-by: default avatarYang Yingliang <yangyingliang@huawei.com>
parents f07d1dc4 f8587631

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

+1 −1
Original line number Diff line number Diff line
@@ -1524,7 +1524,6 @@ static int mlx5_try_fast_unload(struct mlx5_core_dev *dev) 
	/* Panic tear down fw command will stop the PCI bus communication

	 * with the HCA, so the health polll is no longer needed.

	 */

	mlx5_drain_health_wq(dev);

	mlx5_stop_health_poll(dev, false);



	ret = mlx5_cmd_fast_teardown_hca(dev);
@@ -1558,6 +1557,7 @@ static void shutdown(struct pci_dev *pdev) 
	int err;



	mlx5_core_info(dev, "Shutdown was called\n");

	mlx5_drain_health_wq(dev);

	err = mlx5_try_fast_unload(dev);

	if (err)

		mlx5_unload_one(dev, false);