Patch "net: hns3: fix a bug in hclge_uninit_client_instance" has been added to the 4.14-stable tree

This is a note to let you know that I've just added the patch titled

net: hns3: fix a bug in hclge_uninit_client_instance

to the 4.14-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
net-hns3-fix-a-bug-in-hclge_uninit_client_instance.patch
and it can be found in the queue-4.14 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.

From: Lipeng <[email protected]>
Date: Tue, 24 Oct 2017 21:02:11 +0800
Subject: net: hns3: fix a bug in hclge_uninit_client_instance

From: Lipeng <[email protected]>

[ 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.

---
 drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c |   10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

@@ -4007,13 +4007,19 @@ static void hclge_uninit_client_instance
 
 	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;
+		}
 	}
 }
 

Patches currently in stable-queue which might be from [email protected] are

queue-4.14/net-hns3-fix-the-tx-rx-ring.queue_index-in-hns3_ring_get_cfg.patch queue-4.14/net-hns3-fix-the-bug-when-map-buffer-fail.patch queue-4.14/net-hns3-fix-a-bug-when-alloc-new-buffer.patch queue-4.14/net-hns3-fix-the-bug-of-hns3_set_txbd_baseinfo.patch queue-4.14/net-hns3-fix-a-bug-in-hclge_uninit_client_instance.patch queue-4.14/net-hns3-fix-a-misuse-to-devm_free_irq.patch queue-4.14/net-hns3-fix-for-getting-advertised_caps-in-hns3_get_link_ksettings.patch queue-4.14/net-hns3-add-nic_client-check-when-initialize-roce-base-information.patch