Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6f0c0b35 authored by Guojia Liao's avatar Guojia Liao Committed by Greg Kroah-Hartman
Browse files

net: hns3: fix duplicate node in VLAN list 



[ Upstream commit 94391fae82f71c98ecc7716a32611fcca73c74eb ]

VLAN list should not be added duplicate VLAN node, otherwise it would
cause "add failed" when restore VLAN from VLAN list, so this patch adds
VLAN ID check before adding node into VLAN list.

Fixes: c6075b19 ("net: hns3: Record VF vlan tables")
Signed-off-by: default avatarGuojia Liao <liaoguojia@huawei.com>
Signed-off-by: default avatarGuangbin Huang <huangguangbin2@huawei.com>
Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 951805c2

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

+5 −1
Original line number Diff line number Diff line
@@ -8006,7 +8006,11 @@ static int hclge_init_vlan_config(struct hclge_dev *hdev) 
static void hclge_add_vport_vlan_table(struct hclge_vport *vport, u16 vlan_id,

				       bool writen_to_tbl)

{

	struct hclge_vport_vlan_cfg *vlan;

	struct hclge_vport_vlan_cfg *vlan, *tmp;



	list_for_each_entry_safe(vlan, tmp, &vport->vlan_list, node)

		if (vlan->vlan_id == vlan_id)

			return;



	vlan = kzalloc(sizeof(*vlan), GFP_KERNEL);

	if (!vlan)