Skip to content

Commit 7ed258f

Browse files
Guangbin HuangPaolo Abeni
authored andcommitted
net: hns3: fix software vlan talbe of vlan 0 inconsistent with hardware
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: fe4144d ("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>
1 parent 9c9a042 commit 7ed258f

1 file changed

Lines changed: 3 additions & 3 deletions

File tree

drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10323,11 +10323,11 @@ int hclge_set_vlan_filter(struct hnae3_handle *handle, __be16 proto,
1032310323
}
1032410324

1032510325
if (!ret) {
10326-
if (is_kill)
10327-
hclge_rm_vport_vlan_table(vport, vlan_id, false);
10328-
else
10326+
if (!is_kill)
1032910327
hclge_add_vport_vlan_table(vport, vlan_id,
1033010328
writen_to_tbl);
10329+
else if (is_kill && vlan_id != 0)
10330+
hclge_rm_vport_vlan_table(vport, vlan_id, false);
1033110331
} else if (is_kill) {
1033210332
/* when remove hw vlan filter failed, record the vlan id,
1033310333
* and try to remove it from hw later, to be consistence

0 commit comments

Comments
 (0)