From: shenhao shenhao21@huawei.com
driver inclusion category: bugfix bugzilla: NA CVE: NA
--------------------------------------------
This patch just modifies definition location of struct hclge_vf_vlan_cfg to sync code with linux mainline.
Signed-off-by: Guangbin Huang huangguangbin2@huawei.com Signed-off-by: shenhao shenhao21@huawei.com Reviewed-by: Zhong Zhaohui zhongzhaohui@huawei.com Signed-off-by: Yang Yingliang yangyingliang@huawei.com --- .../ethernet/hisilicon/hns3/hns3pf/hclge_main.h | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-)
diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.h b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.h index a1fa782..099dc29 100644 --- a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.h +++ b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.h @@ -689,6 +689,17 @@ struct hclge_mac_tnl_stats { #define HCLGE_RESET_INTERVAL (12 * HZ) #define HCLGE_WAIT_RESET_DONE 100
+#pragma pack(1) +struct hclge_vf_vlan_cfg { + u8 mbx_cmd; + u8 subcode; + u8 is_kill; + u16 vlan; + u16 proto; +}; + +#pragma pack() + /* For each bit of TCAM entry, it uses a pair of 'x' and * 'y' to indicate which value to match, like below: * ---------------------------------- @@ -888,17 +899,6 @@ enum HCLGE_VPORT_STATE { HCLGE_VPORT_STATE_MAX };
-#pragma pack(1) -struct hclge_vf_vlan_cfg { - u8 mbx_cmd; - u8 subcode; - u8 is_kill; - u16 vlan; - u16 proto; -}; - -#pragma pack() - struct hclge_vlan_info { u16 vlan_proto; /* so far support 802.1Q only */ u16 qos;