qcacld-3.0: Compute RSSI and BSS adjustment correctly
When hw_mode=any (both 2.4Ghz nad 5Ghz bands included),
RSSI and BSS adjustment for 2.4Ghz channels happens 2
times, once in sap_interference_rssi_count() and once
in sap_interference_rssi_count_5G() which leads to wrong
computation of weight.
Check whether a channel is 2.4Ghz or 5Ghz channel before
calling the corresponding RSSI, BSS adjustment function.
Change-Id: I6c318e489cfa177c6de088e7cdfb4779ceb99b2f
CRs-Fixed: 2208069
diff --git a/core/sap/src/sap_ch_select.c b/core/sap/src/sap_ch_select.c
index 6641415..e0671ac 100644
--- a/core/sap/src/sap_ch_select.c
+++ b/core/sap/src/sap_ch_select.c
@@ -1633,16 +1633,21 @@
break;
case eCSR_DOT11_MODE_abg:
- sap_interference_rssi_count_5G(
- pSpectCh, channelWidth,
- secondaryChannelOffset,
- centerFreq,
- centerFreq_2,
- channel_id,
- spectch_start,
- spectch_end);
- sap_interference_rssi_count(pSpectCh,
- spectch_start, spectch_end);
+ if (pSpectCh->chNum >=
+ SIR_11A_CHANNEL_BEGIN)
+ sap_interference_rssi_count_5G(
+ pSpectCh, channelWidth,
+ secondaryChannelOffset,
+ centerFreq,
+ centerFreq_2,
+ channel_id,
+ spectch_start,
+ spectch_end);
+ else
+ sap_interference_rssi_count(
+ pSpectCh,
+ spectch_start,
+ spectch_end);
break;
}