net: hns3: fix a bug in hclge_uninit_client_instance

[ Upstream commit a17dcf3f0124698d1120da71574bf4c339e5a368 ]

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: 46a3df9 (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>
Signed-off-by: Sasha Levin <alexander.levin@verizon.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c
index c1cdbfd83bdba9bcef1ab3f46729f9a8bffb09c8..1df84a874d958a27c4ea0bfbd38e8e1233153278 100644 (file)
--- a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c
+++ b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c
@@ -4007,13 +4007,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;
+               }
        }
 }