net: hns3: fix incomplete uninitialization of IRQ in the hns3_nic_uninit_vector_data()
authorHuazhong Tan <tanhuazhong@huawei.com>
Tue, 18 Dec 2018 11:37:53 +0000 (19:37 +0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 12 Feb 2019 18:47:12 +0000 (19:47 +0100)
[ Upstream commit ae6017a71115ebc4e5c1a3f0f451319ab3f5c447 ]

In the hns3_nic_uninit_vector_data(), the procedure of uninitializing
the tqp_vector's IRQ has not set affinity_notify to NULL and changes
its init flag. This patch fixes it. And for simplificaton, local
variable tqp_vector is used instead of priv->tqp_vector[i].

Fixes: 424eb834a9be ("net: hns3: Unified HNS3 {VF|PF} Ethernet Driver for hip08 SoC")
Signed-off-by: Huazhong Tan <tanhuazhong@huawei.com>
Signed-off-by: Peng Li <lipeng321@huawei.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Sasha Levin <sashal@kernel.org>
drivers/net/ethernet/hisilicon/hns3/hns3_enet.c

index b7b2f82..d5f15d8 100644 (file)
@@ -2760,12 +2760,12 @@ static int hns3_nic_uninit_vector_data(struct hns3_nic_priv *priv)
 
                hns3_free_vector_ring_chain(tqp_vector, &vector_ring_chain);
 
-               if (priv->tqp_vector[i].irq_init_flag == HNS3_VECTOR_INITED) {
-                       (void)irq_set_affinity_hint(
-                               priv->tqp_vector[i].vector_irq,
-                                                   NULL);
-                       free_irq(priv->tqp_vector[i].vector_irq,
-                                &priv->tqp_vector[i]);
+               if (tqp_vector->irq_init_flag == HNS3_VECTOR_INITED) {
+                       irq_set_affinity_notifier(tqp_vector->vector_irq,
+                                                 NULL);
+                       irq_set_affinity_hint(tqp_vector->vector_irq, NULL);
+                       free_irq(tqp_vector->vector_irq, tqp_vector);
+                       tqp_vector->irq_init_flag = HNS3_VECTOR_NOT_INITED;
                }
 
                priv->ring_data[i].ring->irq_init_flag = HNS3_VECTOR_NOT_INITED;