diff options
| author | Bartosz Markowski <bartosz.markowski@tieto.com> | 2012-02-29 15:15:34 +0100 |
|---|---|---|
| committer | Philippe Langlais <philippe.langlais@stericsson.com> | 2012-05-22 11:06:49 +0200 |
| commit | b23b9fe752a732812e5ac57f7d11464efcedf629 (patch) | |
| tree | c3d33a50261b817f293d81673a9237858d174315 | |
| parent | 1780db0bfde8da1b36c5c2087407ef9ea8744d23 (diff) | |
cw1200: Makes the FW report RCPI instead of RSSI
ST-Ericsson ID: 413663
ST-Ericsson FOSS-OUT ID: NA
Change-Id: Ic86d0e6142ac57ed8fe40c3a3a9366235ab8e78b
Signed-off-by: Bartosz Markowski <bartosz.markowski@tieto.com>
Signed-off-by: Johan Lilje <johan.lilje@sonyericsson.com>
Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/48364
Reviewed-by: QATOOLS
Reviewed-by: QABUILD
| -rw-r--r-- | drivers/staging/cw1200/ap.c | 1 | ||||
| -rw-r--r-- | drivers/staging/cw1200/sta.c | 3 | ||||
| -rw-r--r-- | drivers/staging/cw1200/wsm.c | 2 |
3 files changed, 2 insertions, 4 deletions
diff --git a/drivers/staging/cw1200/ap.c b/drivers/staging/cw1200/ap.c index 17de92d5da0..b30afe0ce98 100644 --- a/drivers/staging/cw1200/ap.c +++ b/drivers/staging/cw1200/ap.c @@ -560,7 +560,6 @@ void cw1200_bss_info_changed(struct ieee80211_hw *dev, } if (changed & (BSS_CHANGED_ASSOC | BSS_CHANGED_CQM)) { struct wsm_rcpi_rssi_threshold threshold = { - .rssiRcpiMode = WSM_RCPI_RSSI_USE_RSSI, .rollingAverageCount = 1, }; diff --git a/drivers/staging/cw1200/sta.c b/drivers/staging/cw1200/sta.c index 2dd90c3b929..2d2392f7a75 100644 --- a/drivers/staging/cw1200/sta.c +++ b/drivers/staging/cw1200/sta.c @@ -1150,8 +1150,7 @@ int cw1200_setup_mac(struct cw1200_common *priv) * as RSSI if RSSI subscription is enabled. * It's not enough to set WSM_RCPI_RSSI_USE_RSSI. */ struct wsm_rcpi_rssi_threshold threshold = { - .rssiRcpiMode = WSM_RCPI_RSSI_USE_RSSI | - WSM_RCPI_RSSI_THRESHOLD_ENABLE | + .rssiRcpiMode = WSM_RCPI_RSSI_THRESHOLD_ENABLE | WSM_RCPI_RSSI_DONT_USE_UPPER | WSM_RCPI_RSSI_DONT_USE_LOWER, .rollingAverageCount = 16, diff --git a/drivers/staging/cw1200/wsm.c b/drivers/staging/cw1200/wsm.c index 834524666a7..f47950f1d24 100644 --- a/drivers/staging/cw1200/wsm.c +++ b/drivers/staging/cw1200/wsm.c @@ -866,7 +866,7 @@ static int wsm_receive_indication(struct cw1200_common *priv, rx.status = WSM_GET32(buf); rx.channelNumber = WSM_GET16(buf); rx.rxedRate = WSM_GET8(buf); - rx.rcpiRssi = WSM_GET8(buf); + rx.rcpiRssi = (WSM_GET8(buf) / 2 - 110); rx.flags = WSM_GET32(buf); /* FW Workaround: Drop probe resp or |