diff options
Diffstat (limited to 'drivers/staging')
-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 @@ | |||
23 | 23 | ||
24 | #define ETHER_TYPE_LEN 2 | 24 | #define ETHER_TYPE_LEN 2 |
25 | #define ETHER_CRC_LEN 4 | 25 | #define ETHER_CRC_LEN 4 |
26 | #define ETHER_HDR_LEN (ETH_ALEN * 2 + ETHER_TYPE_LEN) | ||
27 | #define ETHER_MIN_LEN 64 | 26 | #define ETHER_MIN_LEN 64 |
28 | #define ETHER_MIN_DATA 46 | 27 | #define ETHER_MIN_DATA 46 |
29 | #define ETHER_MAX_LEN 1518 | 28 | #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, | |||
1727 | 1727 | ||
1728 | /* some code depends on packed structures */ | 1728 | /* some code depends on packed structures */ |
1729 | ASSERT(sizeof(struct ether_addr) == ETH_ALEN); | 1729 | ASSERT(sizeof(struct ether_addr) == ETH_ALEN); |
1730 | ASSERT(sizeof(struct ether_header) == ETHER_HDR_LEN); | 1730 | ASSERT(sizeof(struct ether_header) == ETH_HLEN); |
1731 | ASSERT(sizeof(d11regs_t) == SI_CORE_SIZE); | 1731 | ASSERT(sizeof(d11regs_t) == SI_CORE_SIZE); |
1732 | ASSERT(sizeof(ofdm_phy_hdr_t) == D11_PHY_HDR_LEN); | 1732 | ASSERT(sizeof(ofdm_phy_hdr_t) == D11_PHY_HDR_LEN); |
1733 | ASSERT(sizeof(cck_phy_hdr_t) == D11_PHY_HDR_LEN); | 1733 | ASSERT(sizeof(cck_phy_hdr_t) == D11_PHY_HDR_LEN); |