ath10k: don't report unset rssi values to mac80211

The SDIO firmware does not provide RSSI value to the host, it's only set to
zero. In that case don't report the value to mac80211. One risk here is that
value zero might be a valid value with other firmware, currently there's no way
to detect that.

Without the fix, the rssi value indicated by iw changes between the actual
value and -95.

Tested with QCA6174 SDIO with firmware WLAN.RMH.4.4.1-00005-QCARMSWP-1.

Co-developed-by: Wen Gong <wgong@codeaurora.org>
Signed-off-by: Alagu Sankar <alagusankar@silex-india.com>
Signed-off-by: Wen Gong <wgong@codeaurora.org>
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>

diff --git a/drivers/net/wireless/ath/ath10k/htt_rx.c b/drivers/net/wireless/ath/ath10k/htt_rx.c
index b3d76263417eff2316284539a106b855591f2738..129fd15e9cc931599b49985e9e54275d8cb39342 100644 (file)
--- a/drivers/net/wireless/ath/ath10k/htt_rx.c
+++ b/drivers/net/wireless/ath/ath10k/htt_rx.c
@@ -2119,9 +2119,15 @@ static bool ath10k_htt_rx_proc_rx_ind_hl(struct ath10k_htt *htt,
        hdr = (struct ieee80211_hdr *)skb->data;
        rx_status = IEEE80211_SKB_RXCB(skb);
        rx_status->chains |= BIT(0);
-       rx_status->signal = ATH10K_DEFAULT_NOISE_FLOOR +
-                           rx->ppdu.combined_rssi;
-       rx_status->flag &= ~RX_FLAG_NO_SIGNAL_VAL;
+       if (rx->ppdu.combined_rssi == 0) {
+               /* SDIO firmware does not provide signal */
+               rx_status->signal = 0;
+               rx_status->flag |= RX_FLAG_NO_SIGNAL_VAL;
+       } else {
+               rx_status->signal = ATH10K_DEFAULT_NOISE_FLOOR +
+                       rx->ppdu.combined_rssi;
+               rx_status->flag &= ~RX_FLAG_NO_SIGNAL_VAL;
+       }
 
        spin_lock_bh(&ar->data_lock);
        ch = ar->scan_channel;