diff options
| author | Greg Kroah-Hartman <gregkh@suse.de> | 2010-10-08 11:44:45 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-10-08 11:44:45 -0700 |
| commit | ce0f1b8cd1526e800b8f3c1e978ac7c23ed91e2f (patch) | |
| tree | 5f65b06399130f12a6cfc59cd450a205d2cd0036 /drivers/staging/brcm80211/sys | |
| parent | 3ea2f4d640479a40847e311282ee73695b6e82cf (diff) | |
| download | op-kernel-dev-ce0f1b8cd1526e800b8f3c1e978ac7c23ed91e2f.zip op-kernel-dev-ce0f1b8cd1526e800b8f3c1e978ac7c23ed91e2f.tar.gz | |
Staging: brcm80211: remove OFFSETOF macro
Use the real 'offsetof' definition instead.
Cc: Brett Rudley <brudley@broadcom.com>
Cc: Henry Ptasinski <henryp@broadcom.com>
Cc: Nohee Ko <noheek@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/brcm80211/sys')
| -rw-r--r-- | drivers/staging/brcm80211/sys/wlc_alloc.c | 2 | ||||
| -rw-r--r-- | drivers/staging/brcm80211/sys/wlc_ampdu.c | 2 | ||||
| -rw-r--r-- | drivers/staging/brcm80211/sys/wlc_bmac.c | 8 | ||||
| -rw-r--r-- | drivers/staging/brcm80211/sys/wlc_mac80211.c | 6 |
4 files changed, 9 insertions, 9 deletions
diff --git a/drivers/staging/brcm80211/sys/wlc_alloc.c b/drivers/staging/brcm80211/sys/wlc_alloc.c index e26c053..2d1cf10 100644 --- a/drivers/staging/brcm80211/sys/wlc_alloc.c +++ b/drivers/staging/brcm80211/sys/wlc_alloc.c @@ -147,7 +147,7 @@ void wlc_bsscfg_mfree(osl_t *osh, wlc_bsscfg_t *cfg) if (cfg->maclist) { MFREE(osh, cfg->maclist, - (int)(OFFSETOF(struct maclist, ea) + + (int)(offsetof(struct maclist, ea) + cfg->nmac * ETHER_ADDR_LEN)); cfg->maclist = NULL; } diff --git a/drivers/staging/brcm80211/sys/wlc_ampdu.c b/drivers/staging/brcm80211/sys/wlc_ampdu.c index 094ba23..8a22536 100644 --- a/drivers/staging/brcm80211/sys/wlc_ampdu.c +++ b/drivers/staging/brcm80211/sys/wlc_ampdu.c @@ -348,7 +348,7 @@ static int wlc_ffpld_check_txfunfl(wlc_info_t *wlc, int fid) /* return if we got here for a different reason than underflows */ cur_txunfl = wlc_read_shm(wlc, - M_UCODE_MACSTAT + OFFSETOF(macstat_t, txfunfl[fid])); + M_UCODE_MACSTAT + offsetof(macstat_t, txfunfl[fid])); new_txunfl = (u16) (cur_txunfl - fifo->prev_txfunfl); if (new_txunfl == 0) { WL_FFPLD(("check_txunfl : TX status FRAG set but no tx underflows\n")); diff --git a/drivers/staging/brcm80211/sys/wlc_bmac.c b/drivers/staging/brcm80211/sys/wlc_bmac.c index 5e77896..33c03f4 100644 --- a/drivers/staging/brcm80211/sys/wlc_bmac.c +++ b/drivers/staging/brcm80211/sys/wlc_bmac.c @@ -2003,16 +2003,16 @@ void wlc_bmac_core_phypll_reset(wlc_hw_info_t *wlc_hw) WL_TRACE(("wl%d: wlc_bmac_core_phypll_reset\n", wlc_hw->unit)); si_corereg(wlc_hw->sih, SI_CC_IDX, - OFFSETOF(chipcregs_t, chipcontrol_addr), ~0, 0); + offsetof(chipcregs_t, chipcontrol_addr), ~0, 0); OSL_DELAY(1); si_corereg(wlc_hw->sih, SI_CC_IDX, - OFFSETOF(chipcregs_t, chipcontrol_data), 0x4, 0); + offsetof(chipcregs_t, chipcontrol_data), 0x4, 0); OSL_DELAY(1); si_corereg(wlc_hw->sih, SI_CC_IDX, - OFFSETOF(chipcregs_t, chipcontrol_data), 0x4, 4); + offsetof(chipcregs_t, chipcontrol_data), 0x4, 4); OSL_DELAY(1); si_corereg(wlc_hw->sih, SI_CC_IDX, - OFFSETOF(chipcregs_t, chipcontrol_data), 0x4, 0); + offsetof(chipcregs_t, chipcontrol_data), 0x4, 0); OSL_DELAY(1); } diff --git a/drivers/staging/brcm80211/sys/wlc_mac80211.c b/drivers/staging/brcm80211/sys/wlc_mac80211.c index 460587c..86eeeba 100644 --- a/drivers/staging/brcm80211/sys/wlc_mac80211.c +++ b/drivers/staging/brcm80211/sys/wlc_mac80211.c @@ -1791,9 +1791,9 @@ void *BCMATTACHFN(wlc_attach) (void *wl, u16 vendor, u16 device, ASSERT(sizeof(struct dot11_bcn_prb) == DOT11_BCN_PRB_LEN); ASSERT(sizeof(tx_status_t) == TXSTATUS_LEN); ASSERT(sizeof(ht_cap_ie_t) == HT_CAP_IE_LEN); - ASSERT(OFFSETOF(wl_scan_params_t, channel_list) == + ASSERT(offsetof(wl_scan_params_t, channel_list) == WL_SCAN_PARAMS_FIXED_SIZE); - ASSERT(ISALIGNED(OFFSETOF(wsec_key_t, data), sizeof(u32))); + ASSERT(ISALIGNED(offsetof(wsec_key_t, data), sizeof(u32))); ASSERT(ISPOWEROF2(MA_WINDOW_SZ)); ASSERT(sizeof(wlc_d11rxhdr_t) <= WL_HWRXOFF); @@ -8123,7 +8123,7 @@ int wlc_get_revision_info(wlc_info_t *wlc, void *buf, uint len) rinfo->bus = wlc->pub->sih->bustype; rinfo->chipnum = wlc->pub->sih->chip; - if (len >= (OFFSETOF(wlc_rev_info_t, chippkg))) { + if (len >= (offsetof(wlc_rev_info_t, chippkg))) { rinfo->phytype = wlc->band->phytype; rinfo->phyrev = wlc->band->phyrev; rinfo->anarev = 0; /* obsolete stuff, suppress */ |
