Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ece4bf46 authored by Huazhong Tan's avatar Huazhong Tan Committed by David S. Miller
Browse files

net: hns3: add error handler for hns3_nic_init_vector_data() 



When hns3_nic_init_vector_data() fails to map ring to vector,
it should cancel the netif_napi_add() that has been successfully
done and then exits.

Fixes: 76ad4f0e ("net: hns3: Add support of HNS3 Ethernet Driver for hip08 SoC")
Signed-off-by: default avatarHuazhong Tan <tanhuazhong@huawei.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent d48051c5

drivers/net/ethernet/hisilicon/hns3/hns3_enet.c

+8 −2
Original line number Diff line number Diff line
@@ -2821,7 +2821,7 @@ static int hns3_nic_init_vector_data(struct hns3_nic_priv *priv) 
	struct hnae3_handle *h = priv->ae_handle;

	struct hns3_enet_tqp_vector *tqp_vector;

	int ret = 0;

	u16 i;

	int i;



	hns3_nic_set_cpumask(priv);
@@ -2868,13 +2868,19 @@ static int hns3_nic_init_vector_data(struct hns3_nic_priv *priv) 
		hns3_free_vector_ring_chain(tqp_vector, &vector_ring_chain);



		if (ret)

			return ret;

			goto map_ring_fail;



		netif_napi_add(priv->netdev, &tqp_vector->napi,

			       hns3_nic_common_poll, NAPI_POLL_WEIGHT);

	}



	return 0;



map_ring_fail:

	while (i--)

		netif_napi_del(&priv->tqp_vector[i].napi);



	return ret;

}



static int hns3_nic_alloc_vector_data(struct hns3_nic_priv *priv)