Commit b641667d authored by Hao Chen's avatar Hao Chen
Browse files

net: hns3: revert "net: hns3: fix port vlan filter not disabled problem in dynamic vlan mode" 

driver inclusion
category: feature
bugzilla: https://gitee.com/openeuler/kernel/issues/I9NZTZ


CVE: NA

----------------------------------------------------------------------

This reverts commit 617ccb8e.

Signed-off-by: default avatarHao Chen <970353908@qq.com>
parent e33d399c

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

+1 −6
Original line number Diff line number Diff line
@@ -10575,7 +10575,6 @@ static int hclge_set_vlan_protocol_type(struct hclge_dev *hdev) 
static int hclge_init_vlan_filter(struct hclge_dev *hdev)

{

	struct hclge_vport *vport;

	bool enable = true;

	int ret;

	int i;
@@ -10595,12 +10594,8 @@ static int hclge_init_vlan_filter(struct hclge_dev *hdev) 
		vport->cur_vlan_fltr_en = true;

	}



	if (test_bit(HNAE3_DEV_SUPPORT_VLAN_FLTR_MDF_B, hdev->ae_dev->caps) &&

	    !test_bit(HNAE3_DEV_SUPPORT_PORT_VLAN_BYPASS_B, hdev->ae_dev->caps))

		enable = false;



	return hclge_set_vlan_filter_ctrl(hdev, HCLGE_FILTER_TYPE_PORT,

					  HCLGE_FILTER_FE_INGRESS, enable, 0);

					  HCLGE_FILTER_FE_INGRESS, true, 0);

}



static int hclge_init_vlan_type(struct hclge_dev *hdev)