From 1abcceac6a3d02f377bf4196336b96a0646f5d4f Mon Sep 17 00:00:00 2001
From: Joe Perches <joe@perches.com>
Date: Mon, 13 Dec 2010 16:57:02 -0800
Subject: [PATCH] --- yaml --- r: 228392 b: refs/heads/master c:
 d659a3ec838866482779f594c4520f553468c492 h: refs/heads/master v: v3

---
 [refs]                                                   | 2 +-
 trunk/drivers/staging/brcm80211/include/proto/ethernet.h | 1 -
 trunk/drivers/staging/brcm80211/sys/wlc_mac80211.c       | 2 +-
 3 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 6105f65aafc9..c3734d11be3d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b8d6307894a73a10be6395b8ed3ffb3cb9255f9d
+refs/heads/master: d659a3ec838866482779f594c4520f553468c492
diff --git a/trunk/drivers/staging/brcm80211/include/proto/ethernet.h b/trunk/drivers/staging/brcm80211/include/proto/ethernet.h
index a8638db431db..888165e1ab5c 100644
--- a/trunk/drivers/staging/brcm80211/include/proto/ethernet.h
+++ b/trunk/drivers/staging/brcm80211/include/proto/ethernet.h
@@ -23,7 +23,6 @@
 
 #define	ETHER_TYPE_LEN		2
 #define	ETHER_CRC_LEN		4
-#define	ETHER_HDR_LEN		(ETH_ALEN * 2 + ETHER_TYPE_LEN)
 #define	ETHER_MIN_LEN		64
 #define	ETHER_MIN_DATA		46
 #define	ETHER_MAX_LEN		1518
diff --git a/trunk/drivers/staging/brcm80211/sys/wlc_mac80211.c b/trunk/drivers/staging/brcm80211/sys/wlc_mac80211.c
index 407f5ec55230..8a89b5fe8e60 100644
--- a/trunk/drivers/staging/brcm80211/sys/wlc_mac80211.c
+++ b/trunk/drivers/staging/brcm80211/sys/wlc_mac80211.c
@@ -1727,7 +1727,7 @@ void *wlc_attach(void *wl, u16 vendor, u16 device, uint unit, bool piomode,
 
 	/* some code depends on packed structures */
 	ASSERT(sizeof(struct ether_addr) == ETH_ALEN);
-	ASSERT(sizeof(struct ether_header) == ETHER_HDR_LEN);
+	ASSERT(sizeof(struct ether_header) == ETH_HLEN);
 	ASSERT(sizeof(d11regs_t) == SI_CORE_SIZE);
 	ASSERT(sizeof(ofdm_phy_hdr_t) == D11_PHY_HDR_LEN);
 	ASSERT(sizeof(cck_phy_hdr_t) == D11_PHY_HDR_LEN);