diff options
author | Brett Rudley <brudley@broadcom.com> | 2010-10-08 17:35:02 -0700 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-10-08 19:53:10 -0700 |
commit | a9a6073c51ddc4f562b1918ded7e27830e0d9d9f (patch) | |
tree | 826415ef85fe44a013ba1c8841dc15baaa294eb1 /drivers/staging/brcm80211/sys | |
parent | fb693a712cce5a52bec5d5769b17c2ca93662c61 (diff) | |
download | op-kernel-dev-a9a6073c51ddc4f562b1918ded7e27830e0d9d9f.zip op-kernel-dev-a9a6073c51ddc4f562b1918ded7e27830e0d9d9f.tar.gz |
staging: brcm80211: Purge unused packet engine
We're not using the packet engine anymore - goodbye.
Signed-off-by: Brett Rudley <brudley@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_mac80211.c | 60 | ||||
-rw-r--r-- | drivers/staging/brcm80211/sys/wlc_mac80211.h | 2 | ||||
-rw-r--r-- | drivers/staging/brcm80211/sys/wlc_phy_shim.c | 7 | ||||
-rw-r--r-- | drivers/staging/brcm80211/sys/wlc_phy_shim.h | 3 |
4 files changed, 0 insertions, 72 deletions
diff --git a/drivers/staging/brcm80211/sys/wlc_mac80211.c b/drivers/staging/brcm80211/sys/wlc_mac80211.c index ae6a2fd..7bdd60e 100644 --- a/drivers/staging/brcm80211/sys/wlc_mac80211.c +++ b/drivers/staging/brcm80211/sys/wlc_mac80211.c @@ -8347,66 +8347,6 @@ wlc_duty_cycle_set(wlc_info_t *wlc, int duty_cycle, bool isOFDM, return BCME_OK; } -void -wlc_pktengtx(wlc_info_t *wlc, wl_pkteng_t *pkteng, u8 rate, - struct ether_addr *sa, u32 wait_delay) -{ - bool suspend; - u16 val = M_PKTENG_MODE_TX; - volatile u16 frame_cnt_check; - u8 counter = 0; - - wlc_bmac_set_deaf(wlc->hw, TRUE); - - suspend = - (0 == (R_REG(wlc->hw->osh, &wlc->regs->maccontrol) & MCTL_EN_MAC)); - if (suspend) - wlc_enable_mac(wlc); - - /* set nframes */ - if (pkteng->nframes) { - /* retry counter is used to replay the packet */ - wlc_bmac_write_shm(wlc->hw, M_PKTENG_FRMCNT_LO, - (pkteng->nframes & 0xffff)); - wlc_bmac_write_shm(wlc->hw, M_PKTENG_FRMCNT_HI, - ((pkteng->nframes >> 16) & 0xffff)); - val |= M_PKTENG_FRMCNT_VLD; - } - - if (pkteng->length) { - /* DATA frame */ - wlc_bmac_write_shm(wlc->hw, M_PKTENG_CTRL, val); - /* we write to M_MFGTEST_IFS the IFS required in 1/8us factor */ - /* 10 : for factoring difference b/w Tx.crs and energy in air */ - /* 44 : amount of time spent after TX_RRSP to frame start */ - /* IFS */ - wlc_bmac_write_shm(wlc->hw, M_PKTENG_IFS, - (pkteng->delay - 10) * 8 - 44); - } else { - /* CTS frame */ - val |= M_PKTENG_MODE_TX_CTS; - wlc_bmac_write_shm(wlc->hw, M_PKTENG_IFS, - (u16) pkteng->delay); - wlc_bmac_write_shm(wlc->hw, M_PKTENG_CTRL, val); - } - - /* Wait for packets to finish */ - frame_cnt_check = wlc_bmac_read_shm(wlc->hw, M_PKTENG_FRMCNT_LO); - while ((counter < 100) && (frame_cnt_check != 0)) { - OSL_DELAY(100); - frame_cnt_check = - wlc_bmac_read_shm(wlc->hw, M_PKTENG_FRMCNT_LO); - counter++; - } - - wlc_bmac_write_shm(wlc->hw, M_PKTENG_CTRL, 0); - - if (suspend) - wlc_suspend_mac_and_wait(wlc); - - wlc_bmac_set_deaf(wlc->hw, FALSE); -} - /* Read a single u16 from shared memory. * SHM 'offset' needs to be an even address */ diff --git a/drivers/staging/brcm80211/sys/wlc_mac80211.h b/drivers/staging/brcm80211/sys/wlc_mac80211.h index 8a726be..1fb055e 100644 --- a/drivers/staging/brcm80211/sys/wlc_mac80211.h +++ b/drivers/staging/brcm80211/sys/wlc_mac80211.h @@ -902,8 +902,6 @@ extern void wlc_reset_bmac_done(wlc_info_t *wlc); extern void wlc_protection_upd(wlc_info_t *wlc, uint idx, int val); extern void wlc_hwtimer_gptimer_set(wlc_info_t *wlc, uint us); extern void wlc_hwtimer_gptimer_abort(wlc_info_t *wlc); -extern void wlc_pktengtx(wlc_info_t *wlc, wl_pkteng_t *pkteng, u8 rate, - struct ether_addr *sa, u32 wait_delay); #if defined(BCMDBG) extern void wlc_print_rxh(d11rxhdr_t *rxh); diff --git a/drivers/staging/brcm80211/sys/wlc_phy_shim.c b/drivers/staging/brcm80211/sys/wlc_phy_shim.c index 9e8f196..7c8193a 100644 --- a/drivers/staging/brcm80211/sys/wlc_phy_shim.c +++ b/drivers/staging/brcm80211/sys/wlc_phy_shim.c @@ -244,10 +244,3 @@ wlapi_copyto_objmem(wlc_phy_shim_info_t *physhim, uint offset, const void *buf, { wlc_bmac_copyto_objmem(physhim->wlc_hw, offset, buf, l, sel); } - -void -wlapi_bmac_pktengtx(wlc_phy_shim_info_t *physhim, wl_pkteng_t *pkteng, - u8 rate, struct ether_addr *sa, u32 wait_delay) -{ - wlc_pktengtx(physhim->wlc, pkteng, rate, sa, wait_delay); -} diff --git a/drivers/staging/brcm80211/sys/wlc_phy_shim.h b/drivers/staging/brcm80211/sys/wlc_phy_shim.h index c5d9119..c151a5d 100644 --- a/drivers/staging/brcm80211/sys/wlc_phy_shim.h +++ b/drivers/staging/brcm80211/sys/wlc_phy_shim.h @@ -108,8 +108,5 @@ extern void wlapi_copyto_objmem(wlc_phy_shim_info_t *physhim, uint, extern void wlapi_high_update_phy_mode(wlc_phy_shim_info_t *physhim, u32 phy_mode); -extern void wlapi_bmac_pktengtx(wlc_phy_shim_info_t *physhim, - wl_pkteng_t *pkteng, u8 rate, - struct ether_addr *sa, u32 wait_delay); extern u16 wlapi_bmac_get_txant(wlc_phy_shim_info_t *physhim); #endif /* _wlc_phy_shim_h_ */ |