net/hns3: fix return value of setting VLAN offload
authorChengwen Feng <fengchengwen@huawei.com>
Thu, 26 Mar 2020 07:14:33 +0000 (15:14 +0800)
committerFerruh Yigit <ferruh.yigit@intel.com>
Tue, 21 Apr 2020 11:57:04 +0000 (13:57 +0200)
Currently, the '.vlan_offload_set' ops implementation function named
hns3vf_vlan_offload_set always return 0 in hns3 VF PMD driver.

This patch fixes it with the following modification in the function
named hns3vf_vlan_offload_set.
1. Avoid setting hardware configuration and return -EIO during resetting.
2. Add the return value detection process for calling internal static
   function named hns3vf_en_hw_strip_rxvtag.

Fixes: a5475d61fa34 ("net/hns3: support VF")
Cc: stable@dpdk.org
Signed-off-by: Chengwen Feng <fengchengwen@huawei.com>
Signed-off-by: Wei Hu (Xavier) <xavier.huwei@huawei.com>
drivers/net/hns3/hns3_ethdev_vf.c

index 08ae58a..07f5ab6 100644 (file)
@@ -1150,6 +1150,13 @@ hns3vf_vlan_offload_set(struct rte_eth_dev *dev, int mask)
        struct hns3_hw *hw = HNS3_DEV_PRIVATE_TO_HW(dev->data->dev_private);
        struct rte_eth_conf *dev_conf = &dev->data->dev_conf;
        unsigned int tmp_mask;
+       int ret = 0;
+
+       if (rte_atomic16_read(&hw->reset.resetting)) {
+               hns3_err(hw, "vf set vlan offload failed during resetting, "
+                            "mask = 0x%x", mask);
+               return -EIO;
+       }
 
        tmp_mask = (unsigned int)mask;
        /* Vlan stripping setting */
@@ -1157,13 +1164,13 @@ hns3vf_vlan_offload_set(struct rte_eth_dev *dev, int mask)
                rte_spinlock_lock(&hw->lock);
                /* Enable or disable VLAN stripping */
                if (dev_conf->rxmode.offloads & DEV_RX_OFFLOAD_VLAN_STRIP)
-                       hns3vf_en_hw_strip_rxvtag(hw, true);
+                       ret = hns3vf_en_hw_strip_rxvtag(hw, true);
                else
-                       hns3vf_en_hw_strip_rxvtag(hw, false);
+                       ret = hns3vf_en_hw_strip_rxvtag(hw, false);
                rte_spinlock_unlock(&hw->lock);
        }
 
-       return 0;
+       return ret;
 }
 
 static int