]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
ixgbe: Use LLDP ethertype define ETH_P_LLDP
authorAnirudh Venkataramanan <anirudh.venkataramanan@intel.com>
Thu, 11 Apr 2019 16:11:35 +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 IXGBE_ETH_P_LLD 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/intel/ixgbe/ixgbe.h
drivers/net/ethernet/intel/ixgbe/ixgbe_sriov.c

index aa923d6d596bce77194633aa1feabdcc0562fc65..39e73ad60352fcdd54de13075d37cbbe167cfc9e 100644 (file)
@@ -50,8 +50,6 @@
 #define IXGBE_MAX_RXD                     4096
 #define IXGBE_MIN_RXD                       64
 
-#define IXGBE_ETH_P_LLDP                0x88CC
-
 /* flow control */
 #define IXGBE_MIN_FCRTL                           0x40
 #define IXGBE_MAX_FCRTL                        0x7FF80
index 345701af7749c2e983813b76589baf7e79202fc5..537dfff585e0dfa719201202d5cafa1364a474c4 100644 (file)
@@ -1645,7 +1645,7 @@ int ixgbe_ndo_set_vf_spoofchk(struct net_device *netdev, int vf, bool setting)
                IXGBE_WRITE_REG(hw, IXGBE_ETQF(IXGBE_ETQF_FILTER_LLDP),
                                (IXGBE_ETQF_FILTER_EN    |
                                 IXGBE_ETQF_TX_ANTISPOOF |
-                                IXGBE_ETH_P_LLDP));
+                                ETH_P_LLDP));
 
                IXGBE_WRITE_REG(hw, IXGBE_ETQF(IXGBE_ETQF_FILTER_FC),
                                (IXGBE_ETQF_FILTER_EN |