summaryrefslogtreecommitdiffstats
path: root/drivers/staging
diff options
context:
space:
mode:
authorArend van Spriel <arend@broadcom.com>2011-09-29 15:34:33 -0700
committerGreg Kroah-Hartman <gregkh@suse.de>2011-10-03 16:12:32 -0700
commit28bb0f60ce2ae66831735c650804942fa9da0b70 (patch)
tree657064a16e0d1919a53b5e99ff8ee451fa9d6882 /drivers/staging
parent776dddc52d67e67c74d7cc9a60e915a4dab73a3d (diff)
downloadop-kernel-dev-28bb0f60ce2ae66831735c650804942fa9da0b70.zip
op-kernel-dev-28bb0f60ce2ae66831735c650804942fa9da0b70.tar.gz
staging: brcm80211: move rssi computation to place we need it
The rssi computation was done upon getting the frame from the queue, but the value is needed when filling in the receive status data for mac80211. The call to wlc_phy_rssi_compute() has been deferred. 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.c7
1 files changed, 1 insertions, 6 deletions
diff --git a/drivers/staging/brcm80211/brcmsmac/main.c b/drivers/staging/brcm80211/brcmsmac/main.c
index 3e39407..bdc0611 100644
--- a/drivers/staging/brcm80211/brcmsmac/main.c
+++ b/drivers/staging/brcm80211/brcmsmac/main.c
@@ -828,11 +828,6 @@ brcms_b_recv(struct brcms_hardware *wlc_hw, uint fifo, bool bound)
rxh->RxTSFTime = le16_to_cpu(rxh_le->RxTSFTime);
rxh->RxChan = le16_to_cpu(rxh_le->RxChan);
- /*
- * compute the RSSI from d11rxhdr and record it in wlc_rxd11hr
- */
- wlc_rxhdr->rssi = (s8)wlc_phy_rssi_compute(wlc_hw->band->pi,
- rxh);
brcms_c_recv(wlc_hw->wlc, p);
}
@@ -8172,7 +8167,7 @@ prep_mac80211_status(struct brcms_c_info *wlc, struct d11rxhdr *rxh,
rx_status->freq = ieee80211_dsss_chan_to_freq(channel);
}
- rx_status->signal = wlc_rxh->rssi;
+ rx_status->signal = wlc_phy_rssi_compute(wlc->hw->band->pi, rxh);
/* noise */
/* qual */
OpenPOWER on IntegriCloud