staging: brcm80211: Convert ETHER_TYPE_802_1X to ETH_P_PAE

Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git

kernel os linux

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>

authored by

Joe Perches and committed by

Greg Kroah-Hartman 15 years ago fcbdbed0 d7ec915a

+2 -3

2 changed files

expand all

drivers

staging

brcm80211

brcmfmac

dhd_linux.c

include

proto

ethernet.h

+2 -2

drivers/staging/brcm80211/brcmfmac/dhd_linux.c

··· 1034 1034 1035 1035 if (is_multicast_ether_addr(eh->ether_dhost)) 1036 1036 dhdp->tx_multicast++; 1037 - if (ntoh16(eh->ether_type) == ETHER_TYPE_802_1X) 1037 + if (ntoh16(eh->ether_type) == ETH_P_PAE) 1038 1038 atomic_inc(&dhd->pend_8021x_cnt); 1039 1039 } 1040 1040 ··· 1262 1262 eh = (struct ether_header *)(txp->data); 1263 1263 type = ntoh16(eh->ether_type); 1264 1264 1265 - if (type == ETHER_TYPE_802_1X) 1265 + if (type == ETH_P_PAE) 1266 1266 atomic_dec(&dhd->pend_8021x_cnt); 1267 1267 1268 1268 }

-1

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

··· 29 29 #define ETHER_MAX_DATA 1500 30 30 31 31 #define ETHER_TYPE_BRCM 0x886c 32 - #define ETHER_TYPE_802_1X 0x888e 33 32 34 33 #define ETHER_DEST_OFFSET (0 * ETH_ALEN) 35 34 #define ETHER_SRC_OFFSET (1 * ETH_ALEN)