staging: brcm80211: Remove ETHER_HDR_LEN, use ETH_HLEN

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>

diff --git a/drivers/staging/brcm80211/include/proto/ethernet.h b/drivers/staging/brcm80211/include/proto/ethernet.h
index a8638db431dbb64a3f50147050b41c070e8bccc7..888165e1ab5cae4d6bb6985d29d8ca53fb006695 100644 (file)
--- a/drivers/staging/brcm80211/include/proto/ethernet.h
+++ b/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/drivers/staging/brcm80211/sys/wlc_mac80211.c b/drivers/staging/brcm80211/sys/wlc_mac80211.c
index 407f5ec5523087b8b6b0983e2b7f5ea53db76096..8a89b5fe8e60dc22f7e3304316f36a90d374dac6 100644 (file)
--- a/drivers/staging/brcm80211/sys/wlc_mac80211.c
+++ b/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);