staging: brcm80211: Convert ETHER_TYPE_802_1X to ETH_P_PAE

Remove now unused #define.

Signed-off-by: Joe Perches <joe@perches.com>
Acked-by: Arend van Spriel <arend@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

diff --git a/drivers/staging/brcm80211/brcmfmac/dhd_linux.c b/drivers/staging/brcm80211/brcmfmac/dhd_linux.c
index ec6202b117f9b4e34318522446ebf98b05bcfd5c..db4508378775ad9b894f1a61e72823f661ff6b29 100644 (file)
--- a/drivers/staging/brcm80211/brcmfmac/dhd_linux.c
+++ b/drivers/staging/brcm80211/brcmfmac/dhd_linux.c
@@ -1034,7 +1034,7 @@ int dhd_sendpkt(dhd_pub_t *dhdp, int ifidx, struct sk_buff *pktbuf)
 
                if (is_multicast_ether_addr(eh->ether_dhost))
                        dhdp->tx_multicast++;
-               if (ntoh16(eh->ether_type) == ETHER_TYPE_802_1X)
+               if (ntoh16(eh->ether_type) == ETH_P_PAE)
                        atomic_inc(&dhd->pend_8021x_cnt);
        }
 
@@ -1262,7 +1262,7 @@ void dhd_txcomplete(dhd_pub_t *dhdp, struct sk_buff *txp, bool success)
        eh = (struct ether_header *)(txp->data);
        type = ntoh16(eh->ether_type);
 
-       if (type == ETHER_TYPE_802_1X)
+       if (type == ETH_P_PAE)
                atomic_dec(&dhd->pend_8021x_cnt);
 
 }

diff --git a/drivers/staging/brcm80211/include/proto/ethernet.h b/drivers/staging/brcm80211/include/proto/ethernet.h
index ad55b565c847ebabdcc88cb9a5aa0f9db37cb8f2..567407de020ef7a520bfa3fffbc660e5f7375368 100644 (file)
--- a/drivers/staging/brcm80211/include/proto/ethernet.h
+++ b/drivers/staging/brcm80211/include/proto/ethernet.h
@@ -29,7 +29,6 @@
 #define        ETHER_MAX_DATA          1500
 
 #define        ETHER_TYPE_BRCM         0x886c
-#define        ETHER_TYPE_802_1X       0x888e
 
 #define ETHER_DEST_OFFSET      (0 * ETH_ALEN)
 #define ETHER_SRC_OFFSET       (1 * ETH_ALEN)