---

yaml --- r: 228394 b: refs/heads/master c: fcbdbed h: refs/heads/master v: v3
git-mirror · Dec 16, 2010 · 7615752 · 7615752
1 parent de024f3
commit 7615752
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 4 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d7ec915abc98795a4cb88e369e2918696dd0ea01
+refs/heads/master: fcbdbed01633bac6271708d86d569e06ed3e4c34
diff --git a/trunk/drivers/staging/brcm80211/brcmfmac/dhd_linux.c b/trunk/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/trunk/drivers/staging/brcm80211/include/proto/ethernet.h b/trunk/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)