From 425481d944ce7131ef7db6304d83ef2731430b4b Mon Sep 17 00:00:00 2001 From: liaoguojia Date: Mon, 2 Sep 2019 21:25:58 +0800 Subject: [PATCH] net: hns3: optimized the mac addr in management table. driver inclusion category: bugfix bugzilla: NA CVE: NA Now we using two parameters, mac_addr_hi32 and mac_addr_lo16, to store the MAC address for management table. But using array of mac_addr[ETH_ALEN] would be more General and need'nt to care about the Big-endian mode in cpu. Feature or Bugfix:Bugfix Signed-off-by: liaoguojia Reviewed-by: lipeng Reviewed-by: Yunsheng Lin Reviewed-by: Yang Yingliang Signed-off-by: Yang Yingliang --- drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_cmd.h | 3 +-- drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_cmd.h b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_cmd.h index faea85947864..5742ea4d42a3 100644 --- a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_cmd.h +++ b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_cmd.h @@ -724,8 +724,7 @@ struct hclge_mac_mgr_tbl_entry_cmd { u8 flags; u8 resp_code; __le16 vlan_tag; - __le32 mac_addr_hi32; - __le16 mac_addr_lo16; + u8 mac_addr[ETH_ALEN]; __le16 rsv1; __le16 ethter_type; __le16 egress_port; diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c index 74add8474f78..dff8c85d8fe4 100644 --- a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c +++ b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c @@ -326,8 +326,7 @@ static const struct hclge_mac_mgr_tbl_entry_cmd hclge_mgr_table[] = { { .flags = HCLGE_MAC_MGR_MASK_VLAN_B, .ethter_type = cpu_to_le16(HCLGE_MAC_ETHERTYPE_LLDP), - .mac_addr_hi32 = cpu_to_le32(ntohl(0x0180C200)), - .mac_addr_lo16 = cpu_to_le16(ntohs(0x000E)), + .mac_addr = {0x01, 0x80, 0xc2, 0x00, 0x00, 0x0e}, .i_port_bitmap = 0x1, }, }; -- GitLab