]> git.proxmox.com Git - mirror_ubuntu-bionic-kernel.git/commitdiff
net: hns3: remove the Redundant put_vector in hns3_client_uninit
authorPeng Li <lipeng321@huawei.com>
Thu, 28 Jun 2018 04:12:27 +0000 (12:12 +0800)
committerKleber Sacilotto de Souza <kleber.souza@canonical.com>
Wed, 5 Sep 2018 12:18:37 +0000 (14:18 +0200)
BugLink: https://bugs.launchpad.net/bugs/1787477
The interface h->ae_algo->ops->put_vector is called in both
hns3_nic_dealloc_vector_data and hns3_nic_uninit_vector_data in
hns3_client_uninit, this will cause vector freed twice.
This patch remove the Redundant put_vector to make vector freed
only once.

Signed-off-by: Peng Li <lipeng321@huawei.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
(cherry picked from commit 43e2b1c7f4a498520c741b4c0a89f8475bd8b950)
Signed-off-by: dann frazier <dann.frazier@canonical.com>
Acked-by: Stefan Bader <stefan.bader@canonical.com>
Acked-by: Kleber Sacilotto de Souza <kleber.souza@canonical.com>
Signed-off-by: Kleber Sacilotto de Souza <kleber.souza@canonical.com>
drivers/net/ethernet/hisilicon/hns3/hns3_enet.c

index 1092076911f027868a8fba5606fcfc0a7d9796ef..e5585fd02b9f1828a97c2675cf6db3b83ac488fd 100644 (file)
@@ -2762,10 +2762,6 @@ static int hns3_nic_uninit_vector_data(struct hns3_nic_priv *priv)
                if (ret)
                        return ret;
 
-               ret = h->ae_algo->ops->put_vector(h, tqp_vector->vector_irq);
-               if (ret)
-                       return ret;
-
                hns3_free_vector_ring_chain(tqp_vector, &vector_ring_chain);
 
                if (priv->tqp_vector[i].irq_init_flag == HNS3_VECTOR_INITED) {