Commit a17dcf3f authored Oct 24, 2017 by Lipeng Committed by David S. Miller Oct 26, 2017

net: hns3: fix a bug in hclge_uninit_client_instance



HNS3 driver initialize hdev->roce_client and vport->roce.client in
hclge_init_client_instance, and need set hdev->roce_client and
vport->roce.client NULL.

If do not set them NULL when uninit, it will fail in the scene:
insmod hns3.ko, hns-roce.ko, hns-roce-hw-v3.ko successfully, but
rmmod hns3.ko after rmmod hns-roce-hw-v2.ko and hns-roce.ko.
This patch fixes the issue.

Fixes: 46a3df9f (net: hns3: Add HNS3 Acceleration Engine & Compatibility Layer Support)

Signed-off-by: Lipeng <lipeng321@huawei.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

parent 3a46f34d

drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c

+8 −2

Original line number	Diff line number	Diff line
		@@ -4311,13 +4311,19 @@ static void hclge_uninit_client_instance(struct hnae3_client *client,

		for (i = 0; i < hdev->num_vmdq_vport + 1; i++) {
		vport = &hdev->vport[i];
		if (hdev->roce_client)
		if (hdev->roce_client) {
		hdev->roce_client->ops->uninit_instance(&vport->roce,
		0);
		hdev->roce_client = NULL;
		vport->roce.client = NULL;
		}
		if (client->type == HNAE3_CLIENT_ROCE)
		return;
		if (client->ops->uninit_instance)
		if (client->ops->uninit_instance) {
		client->ops->uninit_instance(&vport->nic, 0);
		hdev->nic_client = NULL;
		vport->nic.client = NULL;
		}
		}
		}