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

Commit 6797a427 authored by Yunsheng Lin's avatar Yunsheng Lin Committed by Greg Kroah-Hartman
Browse files

net: hns3: Fix for vf vlan delete failed problem 



[ Upstream commit 41dafea2af781d8e3ab8626d236b52e4172905a3 ]

There are only 128 entries in vf vlan table, if user has added
more than 128 vlan, fw will ignore it and disable the vf vlan
table. So when user deletes the vlan entry that has not been
set to vf vlan table, fw will return not found result and driver
treat that as error, which will cause vlan delete failed problem.

This patch fixes it by returning ok when fw returns not found
result.

Fixes: 6c251711 ("net: hns3: Disable vf vlan filter when vf vlan table is full")
Signed-off-by: default avatarYunsheng Lin <linyunsheng@huawei.com>
Signed-off-by: default avatarPeng Li <lipeng321@huawei.com>
Signed-off-by: default avatarSalil Mehta <salil.mehta@huawei.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 0e80397c

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

+8 −0
Original line number Diff line number Diff line
@@ -4693,9 +4693,17 @@ static int hclge_set_vf_vlan_common(struct hclge_dev *hdev, int vfid, 
			"Add vf vlan filter fail, ret =%d.\n",

			req0->resp_code);

	} else {

#define HCLGE_VF_VLAN_DEL_NO_FOUND	1

		if (!req0->resp_code)

			return 0;



		if (req0->resp_code == HCLGE_VF_VLAN_DEL_NO_FOUND) {

			dev_warn(&hdev->pdev->dev,

				 "vlan %d filter is not in vf vlan table\n",

				 vlan);

			return 0;

		}



		dev_err(&hdev->pdev->dev,

			"Kill vf vlan filter fail, ret =%d.\n",

			req0->resp_code);