59 lines
2.2 KiB
Diff
59 lines
2.2 KiB
Diff
From 275383264471b2e77bc0b57083942e7c0990e697 Mon Sep 17 00:00:00 2001
|
|
From: Guangbin Huang <huangguangbin2@huawei.com>
|
|
Date: Tue, 14 Jun 2022 17:47:17 +0800
|
|
Subject: [PATCH 178/283] net: hns3: fix software vlan talbe of vlan 0
|
|
inconsistent with hardware
|
|
|
|
mainline inclusion
|
|
from mainline-v5.18-rc1
|
|
commit 7ed258f12ec5ce855f15cdfb5710361dc82fe899
|
|
category: bugfix
|
|
bugzilla: https://gitee.com/src-openeuler/kernel/issues/I8EN3D
|
|
CVE: NA
|
|
|
|
Reference: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=7ed258f12ec5ce855f15cdfb5710361dc82fe899
|
|
|
|
----------------------------------------------------------------------
|
|
|
|
When user delete vlan 0, as driver will not delete vlan 0 for hardware in
|
|
function hclge_set_vlan_filter_hw(), so vlan 0 in software vlan talbe should
|
|
not be deleted.
|
|
|
|
Fixes: fe4144d47eef ("net: hns3: sync VLAN filter entries when kill VLAN ID failed")
|
|
Signed-off-by: Guangbin Huang <huangguangbin2@huawei.com>
|
|
Signed-off-by: Paolo Abeni <pabeni@redhat.com>
|
|
Signed-off-by: Jiantao Xiao <xiaojiantao1@h-partners.com>
|
|
Reviewed-by: Yue Haibing <yuehaibing@huawei.com>
|
|
Reviewed-by: Jian Shen <shenjian15@huawei.com>
|
|
Signed-off-by: Zheng Zengkai <zhengzengkai@huawei.com>
|
|
Signed-off-by: Xiaodong Li <lixiaodong67@huawei.com>
|
|
|
|
Conflicts:
|
|
drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c
|
|
---
|
|
drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c | 6 +++---
|
|
1 file changed, 3 insertions(+), 3 deletions(-)
|
|
|
|
diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c
|
|
index 691fbbb77619..7ae0194bcda2 100644
|
|
--- a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c
|
|
+++ b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c
|
|
@@ -9926,11 +9926,11 @@ int hclge_set_vlan_filter(struct hnae3_handle *handle, __be16 proto,
|
|
}
|
|
|
|
if (!ret) {
|
|
- if (is_kill && vlan_id != 0)
|
|
- hclge_rm_vport_vlan_table(vport, vlan_id, false);
|
|
- else
|
|
+ if (!is_kill)
|
|
hclge_add_vport_vlan_table(vport, vlan_id,
|
|
writen_to_tbl);
|
|
+ else if (is_kill && vlan_id != 0)
|
|
+ hclge_rm_vport_vlan_table(vport, vlan_id, false);
|
|
} else if (is_kill) {
|
|
/* when remove hw vlan filter failed, record the vlan id,
|
|
* and try to remove it from hw later, to be consistence
|
|
--
|
|
2.34.1
|
|
|