diff options
| author | Joe Perches <joe@perches.com> | 2010-12-13 16:57:02 -0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-12-16 12:21:28 -0800 |
| commit | d659a3ec838866482779f594c4520f553468c492 (patch) | |
| tree | 89acffd97e29dfe8e08034c5edb0dcfca3028913 /drivers | |
| parent | b8d6307894a73a10be6395b8ed3ffb3cb9255f9d (diff) | |
| download | linux-d659a3ec838866482779f594c4520f553468c492.tar.gz linux-d659a3ec838866482779f594c4520f553468c492.tar.bz2 linux-d659a3ec838866482779f594c4520f553468c492.zip | |
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>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/staging/brcm80211/include/proto/ethernet.h | 1 | ||||
| -rw-r--r-- | drivers/staging/brcm80211/sys/wlc_mac80211.c | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/drivers/staging/brcm80211/include/proto/ethernet.h b/drivers/staging/brcm80211/include/proto/ethernet.h index a8638db431db..888165e1ab5c 100644 --- 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 407f5ec55230..8a89b5fe8e60 100644 --- 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); |