diff options
| author | Arend van Spriel <arend@broadcom.com> | 2011-09-29 15:34:30 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-10-03 16:12:31 -0700 |
| commit | e053edb69abd8b8ac0501b21f3bc7e61c9a532ad (patch) | |
| tree | 2d29997e64f2fa97726283689e68657b301f3164 /drivers/staging | |
| parent | d6cf28b310b497b001af755d88394df005dc7b5a (diff) | |
| download | op-kernel-dev-e053edb69abd8b8ac0501b21f3bc7e61c9a532ad.zip op-kernel-dev-e053edb69abd8b8ac0501b21f3bc7e61c9a532ad.tar.gz | |
staging: brcm80211: change interface for common rssi compute function
The function wlc_phy_rssi_compute() now uses d11rxhdr struct as
purely input parameter and returns the computed rssi value.
Reviewed-by: Roland Vossen <rvossen@broadcom.com>
Reviewed-by: Pieter-Paul Giesberts <pieterpg@broadcom.com>
Signed-off-by: Franky Lin <frankyl@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging')
| -rw-r--r-- | drivers/staging/brcm80211/brcmsmac/main.c | 4 | ||||
| -rw-r--r-- | drivers/staging/brcm80211/brcmsmac/phy/phy_cmn.c | 7 | ||||
| -rw-r--r-- | drivers/staging/brcm80211/brcmsmac/phy/phy_hal.h | 4 |
3 files changed, 8 insertions, 7 deletions
diff --git a/drivers/staging/brcm80211/brcmsmac/main.c b/drivers/staging/brcm80211/brcmsmac/main.c index e34b511..ef96358 100644 --- a/drivers/staging/brcm80211/brcmsmac/main.c +++ b/drivers/staging/brcm80211/brcmsmac/main.c @@ -806,15 +806,17 @@ brcms_b_recv(struct brcms_hardware *wlc_hw, uint fifo, bool bound) /* process each frame */ while ((p = head) != NULL) { + struct d11rxhdr *rxh; head = head->prev; p->prev = NULL; wlc_rxhdr = (struct brcms_d11rxhdr *) p->data; + rxh = (struct d11rxhdr *)p->data; /* * compute the RSSI from d11rxhdr and record it in wlc_rxd11hr */ - wlc_phy_rssi_compute(wlc_hw->band->pi, wlc_rxhdr); + wlc_rxhdr->rssi = wlc_phy_rssi_compute(wlc_hw->band->pi, rxh); brcms_c_recv(wlc_hw->wlc, p); } diff --git a/drivers/staging/brcm80211/brcmsmac/phy/phy_cmn.c b/drivers/staging/brcm80211/brcmsmac/phy/phy_cmn.c index 8025247..c359a10 100644 --- a/drivers/staging/brcm80211/brcmsmac/phy/phy_cmn.c +++ b/drivers/staging/brcm80211/brcmsmac/phy/phy_cmn.c @@ -2610,10 +2610,9 @@ void wlc_phy_compute_dB(u32 *cmplx_pwr, s8 *p_cmplx_pwr_dB, u8 core) } } -void wlc_phy_rssi_compute(struct brcms_phy_pub *pih, - struct brcms_d11rxhdr *wlc_rxhdr) +int wlc_phy_rssi_compute(struct brcms_phy_pub *pih, + struct d11rxhdr *rxh) { - struct d11rxhdr *rxh = &wlc_rxhdr->rxhdr; int rssi = le16_to_cpu(rxh->PhyRxStatus_1) & PRXS1_JSSI_MASK; uint radioid = pih->radioid; struct brcms_phy *pi = (struct brcms_phy *) pih; @@ -2650,7 +2649,7 @@ void wlc_phy_rssi_compute(struct brcms_phy_pub *pih, } end: - wlc_rxhdr->rssi = (s8) rssi; + return rssi; } void wlc_phy_freqtrack_start(struct brcms_phy_pub *pih) diff --git a/drivers/staging/brcm80211/brcmsmac/phy/phy_hal.h b/drivers/staging/brcm80211/brcmsmac/phy/phy_hal.h index 1dbfaa3..39c3c22 100644 --- a/drivers/staging/brcm80211/brcmsmac/phy/phy_hal.h +++ b/drivers/staging/brcm80211/brcmsmac/phy/phy_hal.h @@ -212,8 +212,8 @@ extern void wlc_phy_chanspec_radio_set(struct brcms_phy_pub *ppi, extern u16 wlc_phy_bw_state_get(struct brcms_phy_pub *ppi); extern void wlc_phy_bw_state_set(struct brcms_phy_pub *ppi, u16 bw); -extern void wlc_phy_rssi_compute(struct brcms_phy_pub *pih, - struct brcms_d11rxhdr *wlc_rxhdr); +extern int wlc_phy_rssi_compute(struct brcms_phy_pub *pih, + struct d11rxhdr *rxh); extern void wlc_phy_por_inform(struct brcms_phy_pub *ppi); extern void wlc_phy_noise_sample_intr(struct brcms_phy_pub *ppi); extern bool wlc_phy_bist_check_phy(struct brcms_phy_pub *ppi); |
