OSDN Git Service

net: hns3: Use LLDP ethertype define ETH_P_LLDP
authorAnirudh Venkataramanan <anirudh.venkataramanan@intel.com>
Thu, 11 Apr 2019 16:11:36 +0000 (09:11 -0700)
committerJeff Kirsher <jeffrey.t.kirsher@intel.com>
Wed, 5 Jun 2019 20:04:29 +0000 (13:04 -0700)
Remove references to HCLGE_MAC_ETHERTYPE_LLDP and use ETH_P_LLDP instead.

Signed-off-by: Anirudh Venkataramanan <anirudh.venkataramanan@intel.com>
Tested-by: Andrew Bowers <andrewx.bowers@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_cmd.h
drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c

index 61cb10d..7a14d80 100644 (file)
@@ -677,7 +677,6 @@ struct hclge_umv_spc_alc_cmd {
 #define HCLGE_MAC_MGR_MASK_VLAN_B              BIT(0)
 #define HCLGE_MAC_MGR_MASK_MAC_B               BIT(1)
 #define HCLGE_MAC_MGR_MASK_ETHERTYPE_B         BIT(2)
-#define HCLGE_MAC_ETHERTYPE_LLDP               0x88cc
 
 struct hclge_mac_mgr_tbl_entry_cmd {
        u8      flags;
index 35d2a45..cda1b3d 100644 (file)
@@ -292,7 +292,7 @@ static const struct hclge_comm_stats_str g_mac_stats_string[] = {
 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),
+               .ethter_type = cpu_to_le16(ETH_P_LLDP),
                .mac_addr_hi32 = cpu_to_le32(htonl(0x0180C200)),
                .mac_addr_lo16 = cpu_to_le16(htons(0x000E)),
                .i_port_bitmap = 0x1,