From 1741f5949fa955a03e824008c476a6e334414758 Mon Sep 17 00:00:00 2001 From: Arend van Spriel Date: Thu, 29 Sep 2011 15:34:33 -0700 Subject: [PATCH] --- yaml --- r: 268626 b: refs/heads/master c: 28bb0f60ce2ae66831735c650804942fa9da0b70 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/staging/brcm80211/brcmsmac/main.c | 7 +------ 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index 19cab0c3219b..952528d5ff4a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 776dddc52d67e67c74d7cc9a60e915a4dab73a3d +refs/heads/master: 28bb0f60ce2ae66831735c650804942fa9da0b70 diff --git a/trunk/drivers/staging/brcm80211/brcmsmac/main.c b/trunk/drivers/staging/brcm80211/brcmsmac/main.c index 3e39407c692b..bdc0611bb274 100644 --- a/trunk/drivers/staging/brcm80211/brcmsmac/main.c +++ b/trunk/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 */