lkml.org 
[lkml]   [2010]   [Dec]   [13]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 6/8] staging: brcm80211: Remove ETHER_HDR_LEN, use ETH_HLEN
    Date
    Signed-off-by: Joe Perches <joe@perches.com>
    ---
    drivers/staging/brcm80211/include/proto/ethernet.h | 1 -
    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 a8638db..888165e 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 407f5ec..8a89b5f 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);
    --
    1.7.3.3.398.g0b0cd.dirty


    \
     
     \ /
      Last update: 2010-12-14 02:01    [W:0.026 / U:156.968 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site