wlan: Update RRM scan results to user space
qcacld-2.0 to prima propagation
Currently RRM scan results are sent out to the requesting AP, but
are not updated to the kernel.
Update the results to the kernel so that it will be useful in future
in the userspace if a BTM request is received and the lookup of
scan cache can fetch a result for the target AP and an additional
scan can be avoided.
Git-commit: 5716d9290f095a4af6d25810f5da810c1e1b1ea7
Change-Id: Ie56b86e5c54910648cb2ae8bf2a7dac2ee873e00
CRs-Fixed: 1010596
diff --git a/CORE/HDD/inc/wlan_hdd_cfg80211.h b/CORE/HDD/inc/wlan_hdd_cfg80211.h
index 559e0b9..82c8c70 100644
--- a/CORE/HDD/inc/wlan_hdd_cfg80211.h
+++ b/CORE/HDD/inc/wlan_hdd_cfg80211.h
@@ -1425,4 +1425,6 @@
}
#endif
+struct cfg80211_bss *wlan_hdd_cfg80211_inform_bss_frame(hdd_adapter_t *pAdapter,
+ tSirBssDescription *bss_desc);
#endif
diff --git a/CORE/HDD/src/wlan_hdd_assoc.c b/CORE/HDD/src/wlan_hdd_assoc.c
index d44850e..717615b 100644
--- a/CORE/HDD/src/wlan_hdd_assoc.c
+++ b/CORE/HDD/src/wlan_hdd_assoc.c
@@ -3227,6 +3227,7 @@
hdd_wext_state_t *pWextState = NULL;
hdd_station_ctx_t *pHddStaCtx = NULL;
VOS_STATUS status = VOS_STATUS_SUCCESS;
+ struct cfg80211_bss *bss_status;
hdd_context_t *pHddCtx = NULL;
VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_INFO_HIGH,
@@ -3591,6 +3592,20 @@
pAdapter->maxRateFlags = roamResult;
break;
}
+ case eCSR_ROAM_UPDATE_SCAN_RESULT:
+ if (pRoamInfo && pRoamInfo->pBssDesc) {
+ bss_status = wlan_hdd_cfg80211_inform_bss_frame(pAdapter,
+ pRoamInfo->pBssDesc);
+ if (bss_status)
+ cfg80211_put_bss(
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 9, 0)) || defined(WITH_BACKPORTS)
+ (WLAN_HDD_GET_CTX(pAdapter))->wiphy,
+#endif
+ bss_status);
+ else
+ hddLog(LOG1, FL("UPDATE_SCAN_RESULT returned NULL"));
+ }
+ break;
default:
break;
}
diff --git a/CORE/SME/inc/csrApi.h b/CORE/SME/inc/csrApi.h
index 0a93a95..7f7820a 100644
--- a/CORE/SME/inc/csrApi.h
+++ b/CORE/SME/inc/csrApi.h
@@ -515,6 +515,7 @@
#endif /* FEATURE_WLAN_ESE && FEATURE_WLAN_ESE_UPLOAD */
eCSR_ROAM_UPDATE_MAX_RATE_IND,
eCSR_ROAM_LOST_LINK_PARAMS_IND,
+ eCSR_ROAM_UPDATE_SCAN_RESULT,
}eRoamCmdStatus;
diff --git a/CORE/SME/src/rrm/sme_rrm.c b/CORE/SME/src/rrm/sme_rrm.c
index d4f33e9..af18b4f 100644
--- a/CORE/SME/src/rrm/sme_rrm.c
+++ b/CORE/SME/src/rrm/sme_rrm.c
@@ -470,6 +470,7 @@
tANI_U8 counter=0;
tpRrmSMEContext pSmeRrmContext = &pMac->rrm.rrmSmeContext;
tANI_U32 sessionId;
+ tCsrRoamInfo *roam_info;
#if defined WLAN_VOWIFI_DEBUG
smsLog( pMac, LOGE, "Send scan result to PE ");
@@ -579,8 +580,20 @@
pNextResult = sme_ScanResultGetNext(pMac, pResult);
smsLog(pMac, LOG1, "Scan res timer:%lu, rrm scan timer:%lu",
pScanResult->timer, RRM_scan_timer);
- if(pScanResult->timer >= RRM_scan_timer)
- pScanResultsArr[counter++] = pScanResult;
+ if (pScanResult->timer >= RRM_scan_timer) {
+ roam_info = vos_mem_malloc(sizeof(*roam_info));
+ if (NULL == roam_info) {
+ smsLog(pMac, LOGW, FL("vos_mem_malloc failed:"));
+ status = eHAL_STATUS_FAILED_ALLOC;
+ goto rrm_send_scan_results_done;
+ }
+ vos_mem_zero(roam_info, sizeof(*roam_info));
+ roam_info->pBssDesc = &pScanResult->BssDescriptor;
+ csrRoamCallCallback(pMac, sessionId, roam_info, 0,
+ eCSR_ROAM_UPDATE_SCAN_RESULT, eCSR_ROAM_RESULT_NONE);
+ vos_mem_free(roam_info);
+ pScanResultsArr[counter++] = pScanResult;
+ }
pScanResult = pNextResult; //sme_ScanResultGetNext(hHal, pResult);
if (counter >= SIR_BCN_REPORT_MAX_BSS_DESC)
break;
@@ -617,6 +630,7 @@
counter);
}
+rrm_send_scan_results_done:
sme_ScanResultPurge(pMac, pResult);
return status;