qcacld: get the correct RSSI/signal level of the connected AP

Instead of pAdapter->rssi, we use the rssi from the scan result
(bss descriptor rssi) to show the rssi/signal level no matter
station connected to AP or not.
This change solves the problem that users run "iwlist wlanX scan"
and it will get zero for rssi/signal level when station has
connected to AP but users have never triggered "iw wlan link" or
"iwpriv wlanX getRSSI" to update pAdapter->rssi before.
Also, it uses the same way to get the rssi/signal level with the
command of "iw wlanX scan" and "wpa_cli wlanX scan".

Change-Id: I763ae5e800dad2335586fd2fbf3697148c869452
CRs-Fixed: 763114

1 files changed, 1 insertions, 14 deletions

diff --git a/CORE/HDD/src/wlan_hdd_scan.c b/CORE/HDD/src/wlan_hdd_scan.c
index 922732693199..3de47879f822 100644
--- a/CORE/HDD/src/wlan_hdd_scan.c
+++ b/CORE/HDD/src/wlan_hdd_scan.c
@@ -479,20 +479,7 @@ static eHalStatus hdd_IndicateScanResult(hdd_scan_info_t *scanInfo, tCsrScanResu
    event.u.qual.qual = descriptor->rssi;
    event.u.qual.noise = descriptor->sinr;
 
-   /*To keep the rssi icon of the connected AP in the scan window
-    *and the rssi icon of the wireless networks in sync */
-   if (( eConnectionState_Associated ==
-              pAdapter->sessionCtx.station.conn_info.connState ) &&
-              ( VOS_TRUE == vos_mem_compare(descriptor->bssId,
-                             pAdapter->sessionCtx.station.conn_info.bssId,
-                             VOS_MAC_ADDR_SIZE)))
-   {
-      event.u.qual.level = pAdapter->rssi;
-   }
-   else
-   {
-      event.u.qual.level = VOS_MIN ((descriptor->rssi + descriptor->sinr), 0);
-   }
+   event.u.qual.level = VOS_MIN ((descriptor->rssi + descriptor->sinr), 0);
 
    event.u.qual.updated = IW_QUAL_ALL_UPDATED;