Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fcbdbed0 authored by Joe Perches's avatar Joe Perches Committed by Greg Kroah-Hartman
Browse files

staging: brcm80211: Convert ETHER_TYPE_802_1X to ETH_P_PAE 



Remove now unused #define.

Signed-off-by: default avatarJoe Perches <joe@perches.com>
Acked-by: default avatarArend van Spriel <arend@broadcom.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent d7ec915a

drivers/staging/brcm80211/brcmfmac/dhd_linux.c

+2 −2
Original line number Diff line number Diff line
@@ -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);



}

drivers/staging/brcm80211/include/proto/ethernet.h

+0 −1
Original line number Diff line number Diff line
@@ -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)