Commit b0c0f405 authored Mar 30, 2022 by Guangbin Huang Committed by Greg Kroah-Hartman Apr 15, 2022

net: hns3: fix software vlan talbe of vlan 0 inconsistent with hardware



commit 7ed258f12ec5ce855f15cdfb5710361dc82fe899 upstream.

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: fe4144d4 ("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: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

parent 2a548fbf

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

+3 −3

Original line number	Diff line number	Diff line
		@@ -8344,11 +8344,11 @@ int hclge_set_vlan_filter(struct hnae3_handle *handle, __be16 proto,
		}

		if (!ret) {
		if (is_kill)
		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