wlan: Add callback handler for SSID scan request
SSID scan is done as part of join request, if scan aborted it
should be informed to HDD otherwise HDD may have incorrect
connection state.
Add changes to inform scan status using callback handler.
Change-Id: Ia2b064a78554a2c0260e0f87609b3e274698f7a4
CRs-Fixed: 1081496
diff --git a/CORE/SME/src/csr/csrApiScan.c b/CORE/SME/src/csr/csrApiScan.c
index 51a59c6..f5944bc 100644
--- a/CORE/SME/src/csr/csrApiScan.c
+++ b/CORE/SME/src/csr/csrApiScan.c
@@ -7023,14 +7023,17 @@
if(pCommand->u.scanCmd.callback)
{
if (pCommand->u.scanCmd.abortScanIndication){
- smsLog( pMac, LOG1, FL("scanDone due to abort"));
- scanStatus = eCSR_SCAN_ABORT;
+ if ((pCommand->u.scanCmd.reason != eCsrScanForSsid) ||
+ (scanStatus != eCSR_SCAN_SUCCESS)) {
+ smsLog( pMac, LOG1, FL("scanDone due to abort"));
+ scanStatus = eCSR_SCAN_ABORT;
+ }
}
-// sme_ReleaseGlobalLock( &pMac->sme );
pCommand->u.scanCmd.callback(pMac, pCommand->u.scanCmd.pContext, pCommand->u.scanCmd.scanID, scanStatus);
-// sme_AcquireGlobalLock( &pMac->sme );
} else {
- smsLog( pMac, LOG2, "%s:%d - Callback NULL!!!", __func__, __LINE__);
+ smsLog(pMac, LOG2,
+ FL("Callback NULL cmd reason %d"),
+ pCommand->u.scanCmd.reason);
}
}
@@ -7919,6 +7922,37 @@
}
#endif
+/**
+ * csr_ssid_scan_done_callback() - Callback to indicate
+ * scan is done for ssid scan
+ * @halHandle: handle to hal
+ * @context: SSID scan context
+ * @scanId: Scan id for the scheduled scan
+ * @status: scan done status
+ *
+ * Return - eHalStatus
+ */
+static eHalStatus csr_ssid_scan_done_callback(tHalHandle halHandle,
+ void *context,
+ tANI_U32 scanId,
+ eCsrScanStatus status)
+{
+ struct csr_scan_for_ssid_context *scan_context =
+ (struct csr_scan_for_ssid_context *)context;
+
+ if (NULL == scan_context)
+ VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR,
+ FL("scan for ssid context not found"));
+
+ if (eCSR_SCAN_ABORT == status)
+ csrRoamCallCallback(scan_context->pMac, scan_context->sessionId,
+ NULL, scan_context->roamId,
+ eCSR_ROAM_ASSOCIATION_FAILURE,
+ eCSR_ROAM_RESULT_SCAN_FOR_SSID_FAILURE);
+ vos_mem_free(scan_context);
+ return eHAL_STATUS_SUCCESS;
+}
+
//This function is usually used for BSSs that suppresses SSID so the profile
//shall have one and only one SSID
eHalStatus csrScanForSSID(tpAniSirGlobal pMac, tANI_U32 sessionId, tCsrRoamProfile *pProfile, tANI_U32 roamId, tANI_BOOLEAN notify)
@@ -7928,6 +7962,7 @@
tANI_U8 bAddr[6] = {0xff, 0xff, 0xff, 0xff, 0xff, 0xff};
tANI_U8 index = 0;
tANI_U32 numSsid = pProfile->SSIDs.numOfSSIDs;
+ struct csr_scan_for_ssid_context *context;
smsLog(pMac, LOG2, FL("called"));
//For WDS, we use the index 0. There must be at least one in there
@@ -7955,13 +7990,23 @@
{
status = csrRoamCopyProfile(pMac, pScanCmd->u.scanCmd.pToRoamProfile, pProfile);
}
+ context = vos_mem_malloc(sizeof(*context));
+ if (NULL == context)
+ {
+ smsLog(pMac, LOGE,
+ "Failed to allocate memory for ssid scan context");
+ status = eHAL_STATUS_FAILED_ALLOC;
+ }
if(!HAL_STATUS_SUCCESS(status))
break;
+ context->pMac = pMac;
+ context->sessionId = sessionId;
+ context->roamId = roamId;
pScanCmd->u.scanCmd.roamId = roamId;
pScanCmd->command = eSmeCommandScan;
pScanCmd->sessionId = (tANI_U8)sessionId;
- pScanCmd->u.scanCmd.callback = NULL;
- pScanCmd->u.scanCmd.pContext = NULL;
+ pScanCmd->u.scanCmd.callback = csr_ssid_scan_done_callback;
+ pScanCmd->u.scanCmd.pContext = context;
pScanCmd->u.scanCmd.reason = eCsrScanForSsid;//Need to check: might need a new reason for SSID scan for LFR during multisession with p2p
pScanCmd->u.scanCmd.scanID = pMac->scan.nextScanID++; //let it wrap around
vos_mem_set(&pScanCmd->u.scanCmd.u.scanRequest, sizeof(tCsrScanRequest), 0);