wlan: LFR Roaming on Infra STA during concurrency
This is a new requirement to support legacy fast roaming for
infra STA link during concurrency. (Either SCC or MCC)
1. This feature is configurable via config item
2. This feature is disabled if Roam Scan offload is disabled
Change-Id: I4598ce5c4006a16fbcf6090e37becd09cbb17a35
CRs-Fixed: 454729
diff --git a/CORE/SME/src/csr/csrNeighborRoam.c b/CORE/SME/src/csr/csrNeighborRoam.c
index b4840bd..9047fe9 100644
--- a/CORE/SME/src/csr/csrNeighborRoam.c
+++ b/CORE/SME/src/csr/csrNeighborRoam.c
@@ -334,8 +334,8 @@
}
else
{
- smsLog(pMac, LOGE, FL("Non-11R Reassoc indication received in unexpected state %d"), pNeighborRoamInfo->neighborRoamState);
- VOS_ASSERT(0);
+ smsLog(pMac, LOGE, FL("Non-11R Reassoc indication received in unexpected state %d"
+ " or Roaming is disabled"), pNeighborRoamInfo->neighborRoamState);
}
}
}
@@ -2088,6 +2088,15 @@
if (NULL != pContext)
{
sessionId = *((tANI_U32*)pContext);
+
+ if (!csrRoamIsStaMode(pMac, sessionId))
+ {
+ smsLog(pMac, LOGE, FL("%s: Ignoring scan request callback on non-infra session %d in state %d"),
+ __FUNCTION__, sessionId, pNeighborRoamInfo->neighborRoamState);
+ vos_mem_free(pContext);
+ return eHAL_STATUS_SUCCESS;
+ }
+
if (!csrRoamIsFastRoamEnabled(pMac,sessionId))
{
smsLog(pMac, LOGE, FL("Received when fast roam is disabled. Ignore it"));
@@ -2111,7 +2120,7 @@
currentChanIndex = (pMac->roam.neighborRoamInfo.roamChannelInfo.currentChanIndex) ? (pMac->roam.neighborRoamInfo.roamChannelInfo.currentChanIndex - 1) : 0;
/* Validate inputs */
- if (pMac->roam.neighborRoamInfo.roamChannelInfo.currentChannelListInfo.ChannelList) {
+ if (pMac->roam.neighborRoamInfo.roamChannelInfo.currentChannelListInfo.ChannelList) {
NEIGHBOR_ROAM_DEBUG(pMac, LOGW, FL("csrNeighborRoamScanRequestCallback received for Channel = %d, ChanIndex = %d"),
pMac->roam.neighborRoamInfo.roamChannelInfo.currentChannelListInfo.ChannelList[currentChanIndex], currentChanIndex);
}
@@ -2125,7 +2134,7 @@
if (eANI_BOOLEAN_FALSE == pNeighborRoamInfo->roamChannelInfo.chanListScanInProgress)
{
- /* Scan is completed in the CFG_CHAN_SCAN state. We can transition to REPORT_SCAN state
+ /* Scan is completed in the CFG_CHAN_SCAN state. We can transition to REPORT_SCAN state
just to get the results and perform PREAUTH */
/* Now we have completed scanning the channel list. We have get the result by applying appropriate filter
sort the results based on neighborScore and RSSI and select the best candidate out of the list */
@@ -2146,10 +2155,10 @@
{
/* Restart the timer for the next scan sequence as scanning is not over */
- hstatus = palTimerStart(pMac->hHdd, pNeighborRoamInfo->neighborScanTimer,
- pNeighborRoamInfo->cfgParams.neighborScanPeriod * PAL_TIMER_TO_MS_UNIT,
+ hstatus = palTimerStart(pMac->hHdd, pNeighborRoamInfo->neighborScanTimer,
+ pNeighborRoamInfo->cfgParams.neighborScanPeriod * PAL_TIMER_TO_MS_UNIT,
eANI_BOOLEAN_FALSE);
-
+
if (eHAL_STATUS_SUCCESS != hstatus)
{
/* Timer start failed.. Should we ASSERT here??? */
@@ -2217,7 +2226,7 @@
#endif //WLAN_FEATURE_ROAM_SCAN_OFFLOAD
#ifdef FEATURE_WLAN_LFR
-static eHalStatus csrNeighborRoamContiguousScanRequestCallback(tHalHandle halHandle,
+static eHalStatus csrNeighborRoamContiguousScanRequestCallback(tHalHandle halHandle,
void *pContext, tANI_U32 scanId, eCsrScanStatus status)
{
tpAniSirGlobal pMac = (tpAniSirGlobal) halHandle;
@@ -2237,7 +2246,7 @@
}
pMac->roam.neighborRoamInfo.scanRspPending = eANI_BOOLEAN_FALSE;
-
+
/* This can happen when we receive a UP event from TL in any of the scan states. Silently ignore it */
if (eCSR_NEIGHBOR_ROAM_STATE_CONNECTED == pNeighborRoamInfo->neighborRoamState)
{
@@ -2257,12 +2266,12 @@
NEIGHBOR_ROAM_DEBUG(pMac, LOGW, "%s: process scan results", __func__);
hstatus = csrNeighborRoamProcessScanComplete(pMac);
-
+
if (eHAL_STATUS_SUCCESS != hstatus)
{
smsLog(pMac, LOGE, FL("Neighbor scan process complete failed with status %d"), hstatus);
}
-
+
if (NULL != pContext)
vos_mem_free(pContext);
@@ -2988,7 +2997,7 @@
pNeighborRoamInfo->neighborRoamState);
pNeighborRoamInfo->roamChannelInfo.IAPPNeighborListReceived = eANI_BOOLEAN_TRUE;
#ifdef WLAN_FEATURE_ROAM_SCAN_OFFLOAD
- if (pMac->roam.configParam.isRoamOffloadScanEnabled)
+ if (csrRoamIsRoamOffloadScanEnabled(pMac))
{
csrRoamOffloadScan(pMac, ROAM_SCAN_OFFLOAD_UPDATE_CFG, REASON_CHANNEL_LIST_CHANGED);
}
@@ -3894,7 +3903,7 @@
case eCSR_NEIGHBOR_ROAM_STATE_INIT:
csrNeighborRoamResetInitStateControlInfo(pMac);
#ifdef WLAN_FEATURE_ROAM_SCAN_OFFLOAD
- if(!pMac->roam.configParam.isRoamOffloadScanEnabled)
+ if (!csrRoamIsRoamOffloadScanEnabled(pMac))
{
#endif
csrNeighborRoamDeregAllRssiIndication(pMac);
@@ -3907,7 +3916,7 @@
CSR_NEIGHBOR_ROAM_STATE_TRANSITION(eCSR_NEIGHBOR_ROAM_STATE_INIT)
csrNeighborRoamResetConnectedStateControlInfo(pMac);
#ifdef WLAN_FEATURE_ROAM_SCAN_OFFLOAD
- if(!pMac->roam.configParam.isRoamOffloadScanEnabled)
+ if (!csrRoamIsRoamOffloadScanEnabled(pMac))
{
#endif
csrNeighborRoamDeregAllRssiIndication(pMac);
@@ -3920,7 +3929,7 @@
CSR_NEIGHBOR_ROAM_STATE_TRANSITION(eCSR_NEIGHBOR_ROAM_STATE_INIT);
csrNeighborRoamResetCfgListChanScanControlInfo(pMac);
#ifdef WLAN_FEATURE_ROAM_SCAN_OFFLOAD
- if (!pMac->roam.configParam.isRoamOffloadScanEnabled)
+ if (!csrRoamIsRoamOffloadScanEnabled(pMac))
{
#endif
csrNeighborRoamDeregAllRssiIndication(pMac);
@@ -3938,7 +3947,7 @@
csrNeighborRoamResetPreauthControlInfo(pMac);
csrNeighborRoamResetReportScanStateControlInfo(pMac);
#ifdef WLAN_FEATURE_ROAM_SCAN_OFFLOAD
- if (!pMac->roam.configParam.isRoamOffloadScanEnabled)
+ if (!csrRoamIsRoamOffloadScanEnabled(pMac))
{
#endif
csrNeighborRoamDeregAllRssiIndication(pMac);
@@ -3990,18 +3999,31 @@
smsLog(pMac, LOG2, FL("Connect indication received with session id %d in state %d"), sessionId, pNeighborRoamInfo->neighborRoamState);
- // Bail out if this is NOT a STA persona or if a concurrent session is running
- if ((pMac->roam.roamSession[sessionId].pCurRoamProfile->csrPersona != VOS_STA_MODE)||
- csrIsConcurrentSessionRunning(pMac))
+ // Bail out if this is NOT a STA persona
+ if (pMac->roam.roamSession[sessionId].pCurRoamProfile->csrPersona != VOS_STA_MODE)
{
smsLog(pMac, LOGE, FL("Ignoring Connect indication received from a non STA persona."
- "sessionId: %d, csrPersonna %d, is multisession %d"),
+ "sessionId: %d, csrPersonna %d"),
sessionId,
- (int)pMac->roam.roamSession[sessionId].pCurRoamProfile->csrPersona,
- csrIsConcurrentSessionRunning(pMac));
+ (int)pMac->roam.roamSession[sessionId].pCurRoamProfile->csrPersona);
return eHAL_STATUS_SUCCESS;
}
+ // if a concurrent session is running
+#ifdef WLAN_FEATURE_ROAM_SCAN_OFFLOAD
+ if (eANI_BOOLEAN_FALSE == CSR_IS_FASTROAM_IN_CONCURRENCY_INI_FEATURE_ENABLED(pMac))
+ {
+#endif
+ if (csrIsConcurrentSessionRunning(pMac))
+ {
+ smsLog(pMac, LOGE, FL("Ignoring Connect indication received in multisession %d"),
+ csrIsConcurrentSessionRunning(pMac));
+ return eHAL_STATUS_SUCCESS;
+ }
+#ifdef WLAN_FEATURE_ROAM_SCAN_OFFLOAD
+ }
+#endif
+
switch (pNeighborRoamInfo->neighborRoamState)
{
case eCSR_NEIGHBOR_ROAM_STATE_REASSOCIATING:
@@ -4091,7 +4113,7 @@
pNeighborRoamInfo->FTRoamInfo.currentNeighborRptRetryNum = 0;
csrNeighborRoamPurgePreauthFailedList(pMac);
#ifdef WLAN_FEATURE_ROAM_SCAN_OFFLOAD
- if (pMac->roam.configParam.isRoamOffloadScanEnabled)
+ if (csrRoamIsRoamOffloadScanEnabled(pMac))
{
/*If this is not a INFRA type BSS, then do not send the command
* down to firmware.Do not send the START command for other session
@@ -4099,7 +4121,7 @@
if(csrRoamIsStaMode(pMac, sessionId))
{
pNeighborRoamInfo->uOsRequestedHandoff = 0;
- csrRoamOffloadScan(pMac, ROAM_SCAN_OFFLOAD_START, REASON_CONNECT);
+ csrRoamOffloadScan(pMac, ROAM_SCAN_OFFLOAD_START, REASON_CONNECT);
}
} else {
#endif