On 2018/10/30 17:11, Sergei Shtylyov wrote:

On 10/29/2018 4:54 PM, Huazhong Tan wrote:

quoted

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: 76ad4f0ee747 ("net: hns3: Add support of HNS3 Ethernet Driver 
for hip08 SoC")
Signed-off-by: Huazhong Tan <redacted>
---
  drivers/net/ethernet/hisilicon/hns3/hns3_enet.c | 10 ++++++++--
  1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3_enet.c 

b/drivers/net/ethernet/hisilicon/hns3/hns3_enet.c
index 32f3aca8..d9066c5 100644

--- a/drivers/net/ethernet/hisilicon/hns3/hns3_enet.c
+++ b/drivers/net/ethernet/hisilicon/hns3/hns3_enet.c

@@ -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, j;
      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:
+    for (j = i - 1; j >= 0; j--)
+        netif_napi_del(&priv->tqp_vector[j].napi);

    'j' doesn't seem needed as well.

yes, it will be change to below one.

+
+map_ring_fail:
+	while(i--)
+		netif_napi_del(&priv->tqp_vector[i].napi);
+
+	return ret;

[...]

MBR, Sergei

.

Thanks, Huazhong.