summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGuangbin Huang <huangguangbin2@huawei.com>2022-06-11 15:25:24 +0300
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2022-06-22 15:28:00 +0300
commit8f21d6cb7f6eb78538b40923d36b27b6b8d980c9 (patch)
tree2741e94263fe8c2f45bd265ce576a4c4d6ee596a
parent606e5d565605e26bf61a0933a6d56940f339c080 (diff)
downloadlinux-8f21d6cb7f6eb78538b40923d36b27b6b8d980c9.tar.xz
net: hns3: set port base vlan tbl_sta to false before removing old vlan
[ Upstream commit 9eda7d8bcbdb6909f202edeedff51948f1cad1e5 ] When modify port base vlan, the port base vlan tbl_sta needs to set to false before removing old vlan, to indicate this operation is not finish. Fixes: c0f46de30c96 ("net: hns3: fix port base vlan add fail when concurrent with reset") Signed-off-by: Guangbin Huang <huangguangbin2@huawei.com> Signed-off-by: David S. Miller <davem@davemloft.net> Signed-off-by: Sasha Levin <sashal@kernel.org>
-rw-r--r--drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c
index 8cebb180c812..5d1615e27a1c 100644
--- a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c
+++ b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c
@@ -10136,6 +10136,7 @@ static int hclge_modify_port_base_vlan_tag(struct hclge_vport *vport,
if (ret)
return ret;
+ vport->port_base_vlan_cfg.tbl_sta = false;
/* remove old VLAN tag */
if (old_info->vlan_tag == 0)
ret = hclge_set_vf_vlan_common(hdev, vport->vport_id,