From: shenhao <shenhao21@huawei.com> driver inclusion category: bugfix bugzilla: NA CVE: NA -------------------------------------------- This patch just modifies definition location of struct hclge_mac_ethertype_idx_rd_cmd 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> --- .../net/ethernet/hisilicon/hns3/hns3pf/hclge_cmd.h | 33 ++++++++++++---------- 1 file changed, 18 insertions(+), 15 deletions(-) diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_cmd.h b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_cmd.h index 8813a35..cf529cf 100644 --- a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_cmd.h +++ b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_cmd.h @@ -781,21 +781,6 @@ struct hclge_mac_vlan_idx_rd_cmd { __le32 index; }; -struct hclge_mac_ethertype_idx_rd_cmd { - u8 flags; - u8 resp_code; - __le16 vlan_tag; - u8 mac_addr[ETH_ALEN]; - __le16 index; - __le16 ethter_type; - __le16 egress_port; - __le16 egress_queue; - __le16 rev0; - u8 i_port_bitmap; - u8 i_port_direction; - u8 rev1[2]; -}; - #pragma pack() struct hclge_vlan_filter_ctrl_cmd { @@ -914,6 +899,24 @@ struct hclge_cfg_tx_queue_pointer_cmd { u8 rsv[14]; }; +#pragma pack(1) +struct hclge_mac_ethertype_idx_rd_cmd { + u8 flags; + u8 resp_code; + __le16 vlan_tag; + u8 mac_addr[ETH_ALEN]; + __le16 index; + __le16 ethter_type; + __le16 egress_port; + __le16 egress_queue; + __le16 rev0; + u8 i_port_bitmap; + u8 i_port_direction; + u8 rev1[2]; +}; + +#pragma pack() + #define HCLGE_TSO_MSS_MIN_S 0 #define HCLGE_TSO_MSS_MIN_M GENMASK(13, 0) -- 1.8.3