Skip to content

Commit

Permalink
staging: brcm80211: Convert ETHER_TYPE_802_1X to ETH_P_PAE
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Joe Perches authored and Greg Kroah-Hartman committed Dec 16, 2010
1 parent d7ec915 commit fcbdbed
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 3 deletions.
4 changes: 2 additions & 2 deletions drivers/staging/brcm80211/brcmfmac/dhd_linux.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}

Expand Down Expand Up @@ -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);

}
Expand Down
1 change: 0 additions & 1 deletion drivers/staging/brcm80211/include/proto/ethernet.h
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down

0 comments on commit fcbdbed

Please sign in to comment.