wlan: LFR Enhancements To Channel Caching Algorithm.
LFR maintain an occupied channel list (aka channel cache) to keep track
of which channels to scan. Channel cache does not get updated if
neither the framework nor the driver issues a scan (i.e. outside of
LFR). Due to this, the channel cache only has channels obtained as part
of the scan during initial association at some location.
Change-Id: Iafbd3c3e602df437f06e461c58b33de4bd376284
CR-Fixed: 424880
diff --git a/CORE/HDD/inc/wlan_hdd_cfg.h b/CORE/HDD/inc/wlan_hdd_cfg.h
index f0ba338..33cd23f 100644
--- a/CORE/HDD/inc/wlan_hdd_cfg.h
+++ b/CORE/HDD/inc/wlan_hdd_cfg.h
@@ -773,13 +773,11 @@
* of any available candidate is better than the currently associated
* AP by at least gImmediateRoamRssiDiff, then being to roam
* immediately.
- * NOTE: Value of 0 means that we register for reassoc threshold and
- * wait for notification before triggering roam.
*/
#define CFG_IMMEDIATE_ROAM_RSSI_DIFF_NAME "gImmediateRoamRssiDiff"
#define CFG_IMMEDIATE_ROAM_RSSI_DIFF_MIN (0)
#define CFG_IMMEDIATE_ROAM_RSSI_DIFF_MAX (125)
-#define CFG_IMMEDIATE_ROAM_RSSI_DIFF_DEFAULT (0)
+#define CFG_IMMEDIATE_ROAM_RSSI_DIFF_DEFAULT (3)
#endif /* (WLAN_FEATURE_VOWIFI_11R) || defined (FEATURE_WLAN_CCX) || defined(FEATURE_WLAN_LFR) */
#define CFG_QOS_WMM_PKT_CLASSIFY_BASIS_NAME "PktClassificationBasis" // DSCP or 802.1Q
diff --git a/CORE/SME/inc/csrApi.h b/CORE/SME/inc/csrApi.h
index 38245b7..ffb1d39 100644
--- a/CORE/SME/inc/csrApi.h
+++ b/CORE/SME/inc/csrApi.h
@@ -283,7 +283,7 @@
tANI_U32 restTime; //in units of milliseconds //ignored when not connected
tANI_U32 throughputImpact; //specify whether BG scan cares about impacting throughput //ignored when not connected
tCsrBssid bssid; //how to use it?? Apple
-}tCsrBGScanRequest;
+}tCsrBGScanRequest, *tpCsrBGScanRequest;
typedef struct tagCsrScanResultInfo
diff --git a/CORE/SME/inc/csrNeighborRoam.h b/CORE/SME/inc/csrNeighborRoam.h
index bc21a92..a28d1dd 100644
--- a/CORE/SME/inc/csrNeighborRoam.h
+++ b/CORE/SME/inc/csrNeighborRoam.h
@@ -198,6 +198,7 @@
tCsrRoamConnectedProfile prevConnProfile; /* Previous connected profile. If the
new profile does not match previous
we re-initialize occupied channel list */
+ tANI_S8 lookupDOWNRssi;
#endif
} tCsrNeighborRoamControlInfo, *tpCsrNeighborRoamControlInfo;
diff --git a/CORE/SME/src/csr/csrApiScan.c b/CORE/SME/src/csr/csrApiScan.c
index d15c46f..f55aa76 100644
--- a/CORE/SME/src/csr/csrApiScan.c
+++ b/CORE/SME/src/csr/csrApiScan.c
@@ -437,8 +437,20 @@
/* split scan if any one of the following:
* - STA session is connected and the scan is not a P2P search
* - any P2P session is connected
+ * Do not split scans if no concurrent infra connections are
+ * active and if the scan is a BG scan triggered by LFR (OR)
+ * any scan if LFR is in the middle of a BG scan. Splitting
+ * the scan is delaying the time it takes for LFR to find
+ * candidates and resulting in disconnects.
*/
- if ( (csrIsStaSessionConnected(pMac) && (pScanCmd->u.scanCmd.u.scanRequest.p2pSearch != 1)) ||
+ if ( (csrIsStaSessionConnected(pMac) &&
+#ifdef FEATURE_WLAN_LFR
+ (csrIsConcurrentInfraConnected(pMac) ||
+ ((pScanCmd->u.scanCmd.reason != eCsrScanBgScan) &&
+ (pMac->roam.neighborRoamInfo.neighborRoamState !=
+ eCSR_NEIGHBOR_ROAM_STATE_CFG_CHAN_LIST_SCAN))) &&
+#endif
+ (pScanCmd->u.scanCmd.u.scanRequest.p2pSearch != 1)) ||
(csrIsP2pSessionConnected(pMac)) )
{
tCsrScanRequest scanReq;
@@ -598,6 +610,11 @@
}
else
{ //No concurrency case
+ smsLog( pMac, LOG2, FL("Queuing scan command (reason=%d, roamState=%d"
+ " numOfChannels=%d)\n"),
+ pScanCmd->u.scanCmd.reason,
+ pMac->roam.neighborRoamInfo.neighborRoamState,
+ pScanCmd->u.scanCmd.u.scanRequest.ChannelInfo.numOfChannels);
return csrQueueSmeCommand(pMac, pScanCmd, eANI_BOOLEAN_FALSE);
}
@@ -1841,12 +1858,12 @@
}
-#ifdef FEATURE_WLAN_LFR
+#ifdef FEATURE_WLAN_LFR
//Add the channel to the occupiedChannels array
static void csrScanAddToOccupiedChannels(
- tpAniSirGlobal pMac,
- tCsrScanResult *pResult,
- tCsrChannel *pOccupiedChannels,
+ tpAniSirGlobal pMac,
+ tCsrScanResult *pResult,
+ tCsrChannel *pOccupiedChannels,
tDot11fBeaconIEs *pIes)
{
eHalStatus status;
@@ -1859,15 +1876,15 @@
if (!csrIsChannelPresentInList(pOccupiedChannelList, numOccupiedChannels, channel)
&& csrNeighborRoamConnectedProfileMatch(pMac, pResult, pIes))
{
- status = csrAddToChannelListFront(pOccupiedChannelList, numOccupiedChannels, channel);
+ status = csrAddToChannelListFront(pOccupiedChannelList, numOccupiedChannels, channel);
if(HAL_STATUS_SUCCESS(status))
- {
+ {
pOccupiedChannels->numChannels++;
smsLog(pMac, LOG2, FL("%s: added channel %d to the list (count=%d)\n"),
__func__, channel, pOccupiedChannels->numChannels);
- if (pOccupiedChannels->numChannels > CSR_BG_SCAN_OCCUPIED_CHANNEL_LIST_LEN)
- pOccupiedChannels->numChannels = CSR_BG_SCAN_OCCUPIED_CHANNEL_LIST_LEN;
- }
+ if (pOccupiedChannels->numChannels > CSR_BG_SCAN_OCCUPIED_CHANNEL_LIST_LEN)
+ pOccupiedChannels->numChannels = CSR_BG_SCAN_OCCUPIED_CHANNEL_LIST_LEN;
+ }
}
}
#endif
@@ -1883,7 +1900,7 @@
pResult->preferValue = csrGetBssPreferValue(pMac, (int)pResult->Result.BssDescriptor.rssi);
pResult->capValue = csrGetBssCapValue(pMac, &pResult->Result.BssDescriptor, pIes);
csrLLInsertTail( &pMac->scan.scanResultList, &pResult->Link, LL_ACCESS_LOCK );
-#ifdef FEATURE_WLAN_LFR
+#ifdef FEATURE_WLAN_LFR
if(0 == pNeighborRoamInfo->cfgParams.channelInfo.numOfChannels)
{
/* Build the occupied channel list, only if "gNeighborScanChannelList" is
@@ -2998,7 +3015,7 @@
}
if( NV_CHANNEL_ENABLE == channelEnabledType)
{
- // Ignore the channel 165 for the country INDONESIA
+ // Ignore the channel 165 for the country INDONESIA
if (( pChannelList->channelList[i] == 165 )
&& ( pMac->scan.fIgnore_chan165 == VOS_TRUE )
&& vos_mem_compare(countryCode, "ID", VOS_COUNTRY_CODE_LEN ))
@@ -3012,8 +3029,8 @@
}
}
}
- ChannelList.numChannels = numChannels;
-
+ ChannelList.numChannels = numChannels;
+
csrSetCfgValidChannelList(pMac, ChannelList.channelList, ChannelList.numChannels);
// extend scan capability
csrSetCfgScanControlList(pMac, countryCode, &ChannelList); // build a scan list based on the channel list : channel# + active/passive scan
@@ -4445,7 +4462,7 @@
}
else
{
- smsLog( pMac, LOGW, " Scanrsp fail (0x%08X), length = %d (expected %d)\n",
+ smsLog( pMac, LOGW, " Scanrsp fail (0x%08X), length = %d (expected %d)\n",
pScanRsp->statusCode, pScanRsp->length, cbScanResult);
//HO bg scan/probe failed no need to try autonomously
if(eCsrScanBgScan == pCommand->u.scanCmd.reason ||
@@ -4475,14 +4492,27 @@
* remaining channels.
*
* Start timer to trigger processing of the next scan command.
+ * NOTE for LFR:
+ * Do not split scans if no concurrent infra connections are
+ * active and if the scan is a BG scan triggered by LFR (OR)
+ * any scan if LFR is in the middle of a BG scan. Splitting
+ * the scan is delaying the time it takes for LFR to find
+ * candidates and resulting in disconnects.
*/
- if ( (csrIsStaSessionConnected(pMac) && (pCommand->u.scanCmd.u.scanRequest.p2pSearch != 1)) ||
+ if ( (csrIsStaSessionConnected(pMac) &&
+#ifdef FEATURE_WLAN_LFR
+ (csrIsConcurrentInfraConnected(pMac) ||
+ ((pCommand->u.scanCmd.reason != eCsrScanBgScan) &&
+ (pMac->roam.neighborRoamInfo.neighborRoamState !=
+ eCSR_NEIGHBOR_ROAM_STATE_CFG_CHAN_LIST_SCAN))) &&
+#endif
+ (pCommand->u.scanCmd.u.scanRequest.p2pSearch != 1)) ||
(csrIsP2pSessionConnected(pMac)) )
{
/* if active connected sessions present then continue to split scan
* with specified interval between consecutive scans */
csrSetDefaultScanTiming(pMac, pCommand->u.scanCmd.u.scanRequest.scanType, &(pCommand->u.scanCmd.u.scanRequest));
- palTimerStart(pMac->hHdd, pMac->scan.hTimerStaApConcTimer,
+ palTimerStart(pMac->hHdd, pMac->scan.hTimerStaApConcTimer,
pCommand->u.scanCmd.u.scanRequest.restTime * PAL_TIMER_TO_MS_UNIT, eANI_BOOLEAN_FALSE);
} else {
/* if no connected sessions present then initiate next scan command immediately */
@@ -4579,7 +4609,7 @@
csrReleaseScanCommand(pMac, pCommand, scanStatus);
- }
+ }
smeProcessPendingQueue( pMac );
}
else
@@ -5392,10 +5422,34 @@
((eCSR_SCAN_P2P_DISCOVERY == pSrcReq->requestType) &&
CSR_IS_SOCIAL_CHANNEL(pSrcReq->ChannelInfo.ChannelList[index])))
{
-
- if( pSrcReq->skipDfsChnlInP2pSearch &&
+ if( (pSrcReq->skipDfsChnlInP2pSearch &&
(NV_CHANNEL_DFS == vos_nv_getChannelEnabledState(pSrcReq->ChannelInfo.ChannelList[index])) )
+#ifdef FEATURE_WLAN_LFR
+ /*
+ * If LFR is requesting a contiguous scan
+ * (i.e. numOfChannels > 1), then ignore
+ * DFS channels.
+ * TODO: vos_nv_getChannelEnabledState is returning
+ * 120, 124 and 128 as non-DFS channels. Hence, the
+ * use of direct check for channels below.
+ */
+ || ((eCSR_SCAN_HO_BG_SCAN == pSrcReq->requestType) &&
+ (pSrcReq->ChannelInfo.numOfChannels > 1) &&
+ (pSrcReq->ChannelInfo.ChannelList[index] > 48 &&
+ pSrcReq->ChannelInfo.ChannelList[index] < 149))
+#endif
+ )
+ {
+#ifdef FEATURE_WLAN_LFR
+ smsLog(pMac, LOG2,
+ "%s: reqType=%d, numOfChannels=%d,"
+ " ignoring DFS channel %d\n",
+ __func__, pSrcReq->requestType,
+ pSrcReq->ChannelInfo.numOfChannels,
+ pSrcReq->ChannelInfo.ChannelList[index]);
+#endif
continue;
+ }
pDstReq->ChannelInfo.ChannelList[new_index] =
pSrcReq->ChannelInfo.ChannelList[index];
@@ -5403,6 +5457,28 @@
}
}
pDstReq->ChannelInfo.numOfChannels = new_index;
+#ifdef FEATURE_WLAN_LFR
+ if ((eCSR_SCAN_HO_BG_SCAN == pSrcReq->requestType) &&
+ (0 == pDstReq->ChannelInfo.numOfChannels))
+ {
+ /*
+ * No valid channels found in the request.
+ * Only perform scan on the channels passed
+ * pSrcReq if it is a eCSR_SCAN_HO_BG_SCAN.
+ * Passing 0 to LIM will trigger a scan on
+ * all valid channels which is not desirable.
+ */
+ smsLog(pMac, LOGE, "%s: no valid channels found (request=%d)\n",
+ __func__, pSrcReq->requestType);
+ for ( index = 0; index < pSrcReq->ChannelInfo.numOfChannels ; index++ )
+ {
+ smsLog(pMac, LOGE, "pSrcReq index=%d channel=%d\n",
+ index, pSrcReq->ChannelInfo.ChannelList[index]);
+ }
+ status = eHAL_STATUS_FAILURE;
+ break;
+ }
+#endif
}
else
{
@@ -5566,9 +5642,21 @@
* any one of the following:
* - STA session is connected and the scan is not a P2P search
* - any P2P session is connected
+ * Do not split scans if no concurrent infra connections are
+ * active and if the scan is a BG scan triggered by LFR (OR)
+ * any scan if LFR is in the middle of a BG scan. Splitting
+ * the scan is delaying the time it takes for LFR to find
+ * candidates and resulting in disconnects.
*/
if ( (numChn > pMac->roam.configParam.nNumChanCombinedConc) &&
- ((csrIsStaSessionConnected(pMac) && (pScanCmd->u.scanCmd.u.scanRequest.p2pSearch != 1)) ||
+ ((csrIsStaSessionConnected(pMac) &&
+#ifdef FEATURE_WLAN_LFR
+ (csrIsConcurrentInfraConnected(pMac) ||
+ ((pScanCmd->u.scanCmd.reason != eCsrScanBgScan) &&
+ (pMac->roam.neighborRoamInfo.neighborRoamState !=
+ eCSR_NEIGHBOR_ROAM_STATE_CFG_CHAN_LIST_SCAN))) &&
+#endif
+ (pScanCmd->u.scanCmd.u.scanRequest.p2pSearch != 1)) ||
(csrIsP2pSessionConnected(pMac))))
{
palZeroMemory(pMac->hHdd, &scanReq, sizeof(tCsrScanRequest));
@@ -7091,7 +7179,7 @@
pIes = (tDot11fBeaconIEs *)( pBssDesc->Result.pvIes );
//At this time, pBssDescription->Result.pvIes may be NULL
- if( !pIes && (!HAL_STATUS_SUCCESS(csrGetParsedBssDescriptionIEs(pMac,
+ if( !pIes && (!HAL_STATUS_SUCCESS(csrGetParsedBssDescriptionIEs(pMac,
&pBssDesc->Result.BssDescriptor, &pIes))) )
{
continue;
@@ -7110,7 +7198,7 @@
pEntry = csrLLNext( &pMac->scan.scanResultList, pEntry, LL_ACCESS_NOLOCK );
}//while
csrLLUnlock(&pMac->scan.scanResultList);
-
+
}
#endif
diff --git a/CORE/SME/src/csr/csrNeighborRoam.c b/CORE/SME/src/csr/csrNeighborRoam.c
index aa674e2..ff66e0b 100644
--- a/CORE/SME/src/csr/csrNeighborRoam.c
+++ b/CORE/SME/src/csr/csrNeighborRoam.c
@@ -497,6 +497,7 @@
pNeighborRoamInfo->cfgParams.neighborLookupThreshold;
#ifdef FEATURE_WLAN_LFR
pNeighborRoamInfo->uEmptyScanCount = 0;
+ pNeighborRoamInfo->lookupDOWNRssi = 0;
#endif
}
@@ -533,7 +534,6 @@
vos_mem_zero(pNeighborRoamInfo->FTRoamInfo.neighboReportBssInfo, sizeof(tCsrNeighborReportBssInfo) * MAX_BSS_IN_NEIGHBOR_RPT);
palTimerStop(pMac->hHdd, pNeighborRoamInfo->FTRoamInfo.preAuthRspWaitTimer);
#endif
-
}
void csrNeighborRoamResetReportScanStateControlInfo(tpAniSirGlobal pMac)
@@ -1269,8 +1269,7 @@
csrLLInsertTail(&pNeighborRoamInfo->roamableAPList, &pBssInfo->List, LL_ACCESS_LOCK);
#if defined (WLAN_FEATURE_VOWIFI_11R) || defined (FEATURE_WLAN_CCX) || defined(FEATURE_WLAN_LFR)
- if (immediateRoamRssiDiff &&
- (abs(abs(CurrAPRssi) - abs(pScanResult->BssDescriptor.rssi)) >= immediateRoamRssiDiff))
+ if (abs(abs(CurrAPRssi) - abs(pScanResult->BssDescriptor.rssi)) >= immediateRoamRssiDiff)
{
VOS_TRACE (VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO,
"%s: [INFOLOG] potential candidate to roam immediately (diff=%d, expected=%d)",
@@ -1381,17 +1380,17 @@
vos_mem_zero(&pNeighborRoamInfo->FTRoamInfo.neighboReportBssInfo, sizeof(tCsrNeighborReportBssInfo) * MAX_BSS_IN_NEIGHBOR_RPT);
#endif
+ /* Transition to CONNECTED state */
+ CSR_NEIGHBOR_ROAM_STATE_TRANSITION(eCSR_NEIGHBOR_ROAM_STATE_CONNECTED);
+
+ /* Reset all the necessary variables before transitioning to the CONNECTED state */
+ csrNeighborRoamResetConnectedStateControlInfo(pMac);
+
#ifdef FEATURE_WLAN_LFR
if (pNeighborRoamInfo->uEmptyScanCount == eFirstEmptyScan)
{
#endif
/* Empty scan results for the first time */
- /* Transition to CONNECTED state */
- CSR_NEIGHBOR_ROAM_STATE_TRANSITION(eCSR_NEIGHBOR_ROAM_STATE_CONNECTED);
-
- /* Reset all the necessary variables before transitioning to the CONNECTED state */
- csrNeighborRoamResetConnectedStateControlInfo(pMac);
-
/* Re-register neighbor lookup DOWN threshold callback with TL */
NEIGHBOR_ROAM_DEBUG(pMac, LOGE,
FL("Registering DOWN event neighbor lookup callback with TL for RSSI = %d"),
@@ -1410,16 +1409,12 @@
" with TL: Status = %d\n"), status);
}
#ifdef FEATURE_WLAN_LFR
+ pNeighborRoamInfo->lookupDOWNRssi = 0;
}
else if ((pNeighborRoamInfo->uEmptyScanCount == eSecondEmptyScan) ||
(pNeighborRoamInfo->uEmptyScanCount == eFourthEmptyScan))
{
/* Empty scan results for the second or fourth time */
- /* Transition to CONNECTED state */
- CSR_NEIGHBOR_ROAM_STATE_TRANSITION(eCSR_NEIGHBOR_ROAM_STATE_CONNECTED);
-
- /* Reset all the necessary variables before transitioning to the CONNECTED state */
- csrNeighborRoamResetConnectedStateControlInfo(pMac);
/* Immediately scan on channels in non-occupied list */
csrNeighborRoamTransitToCFGChanScan(pMac);
@@ -1427,7 +1422,7 @@
else if (pNeighborRoamInfo->uEmptyScanCount == eThirdEmptyScan)
{
/* Empty scan results for the third time */
- /* Remain in eCSR_NEIGHBOR_ROAM_STATE_CFG_CHAN_LIST_SCAN */
+
/* Start neighbor scan results refresh timer */
if (eHAL_STATUS_SUCCESS !=
palTimerStart(pMac->hHdd, pNeighborRoamInfo->neighborResultsRefreshTimer,
@@ -1446,15 +1441,6 @@
(pNeighborRoamInfo->cfgParams.neighborResultsRefreshPeriod * PAL_TIMER_TO_MS_UNIT));
}
}
- else
- {
- /* Do nothing */
- /* Transition to CONNECTED state */
- CSR_NEIGHBOR_ROAM_STATE_TRANSITION(eCSR_NEIGHBOR_ROAM_STATE_CONNECTED);
-
- /* Reset all the necessary variables before transitioning to the CONNECTED state */
- csrNeighborRoamResetConnectedStateControlInfo(pMac);
- }
NEIGHBOR_ROAM_DEBUG(pMac, LOG2, "Neighbor roam empty scan count=%d",
pNeighborRoamInfo->uEmptyScanCount);
@@ -1462,68 +1448,15 @@
return vosStatus;
}
-/* ---------------------------------------------------------------------------
- \fn csrNeighborRoamScanRequestCallback
-
- \brief This function is the callback function registered in csrScanRequest() to
- indicate the completion of scan. If scan is completed for all the channels in
- the channel list, this function gets the scan result and starts the refresh results
- timer to avoid having stale results. If scan is not completed on all the channels,
- it restarts the neighbor scan timer which on expiry issues scan on the next
- channel
-
- \param halHandle - The handle returned by macOpen.
- pContext - not used
- scanId - not used
- status - not used
-
- \return eHAL_STATUS_SUCCESS on success, corresponding error code otherwise
-
----------------------------------------------------------------------------*/
-static eHalStatus csrNeighborRoamScanRequestCallback(tHalHandle halHandle, void *pContext,
- tANI_U32 scanId, eCsrScanStatus status)
+static eHalStatus csrNeighborRoamProcessScanComplete (tpAniSirGlobal pMac)
{
- tpAniSirGlobal pMac = (tpAniSirGlobal) halHandle;
tpCsrNeighborRoamControlInfo pNeighborRoamInfo = &pMac->roam.neighborRoamInfo;
- tANI_U8 currentChanIndex;
tCsrScanResultFilter scanFilter;
tScanResultHandle scanResult;
tANI_U32 tempVal = 0;
- eHalStatus hstatus;
tANI_BOOLEAN roamNow = eANI_BOOLEAN_FALSE;
-
- 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)
- {
- smsLog(pMac, LOGE, FL("Received in CONNECTED state. Must be because a UP event from TL after issuing scan request. Ignore it"));
- return eHAL_STATUS_SUCCESS;
- }
-
- /* -1 is done because the chanIndex would have got incremented after issuing a successful scan request */
- currentChanIndex = (pMac->roam.neighborRoamInfo.roamChannelInfo.currentChanIndex) ? (pMac->roam.neighborRoamInfo.roamChannelInfo.currentChanIndex - 1) : 0;
-
- /* Validate inputs */
- 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);
- }
- else
- {
- smsLog(pMac, LOG1, FL("Received during clean-up. Silently ignore scan completion event."));
- return eHAL_STATUS_SUCCESS;
- }
-
- if (eANI_BOOLEAN_FALSE == pNeighborRoamInfo->roamChannelInfo.chanListScanInProgress)
- {
- /* 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 */
- NEIGHBOR_ROAM_DEBUG(pMac, LOGW, FL("Channel list scan completed. Current chan index = %d"), currentChanIndex);
- VOS_ASSERT(pNeighborRoamInfo->roamChannelInfo.currentChanIndex == 0);
+ eHalStatus hstatus;
#if defined (WLAN_FEATURE_VOWIFI_11R) || defined (FEATURE_WLAN_CCX) || defined(FEATURE_WLAN_LFR)
/* If the state is REPORT_SCAN, then this must be the scan after the REPORT_QUERY state. So, we
@@ -1665,13 +1598,15 @@
return eHAL_STATUS_SUCCESS;
}
+ hstatus = palTimerStart(pMac->hHdd, pNeighborRoamInfo->neighborResultsRefreshTimer,
+ pNeighborRoamInfo->cfgParams.neighborResultsRefreshPeriod * PAL_TIMER_TO_MS_UNIT,
+ eANI_BOOLEAN_FALSE);
+
/* This timer should be started before registering the Reassoc callback with TL. This is because, it is very likely
* that the callback getting called immediately and the timer would never be stopped when pre-auth is in progress */
- if (eHAL_STATUS_SUCCESS != palTimerStart(pMac->hHdd, pNeighborRoamInfo->neighborResultsRefreshTimer,
- pNeighborRoamInfo->cfgParams.neighborResultsRefreshPeriod * PAL_TIMER_TO_MS_UNIT,
- eANI_BOOLEAN_FALSE))
+ if (eHAL_STATUS_SUCCESS != hstatus)
{
- smsLog(pMac, LOGE, FL("Neighbor results refresh timer failed to start, status = %d"), status);
+ smsLog(pMac, LOGE, FL("Neighbor results refresh timer failed to start, status = %d"), hstatus);
vos_mem_free(pNeighborRoamInfo->roamChannelInfo.currentChannelListInfo.ChannelList);
pNeighborRoamInfo->roamChannelInfo.currentChannelListInfo.ChannelList = NULL;
return eHAL_STATUS_FAILURE;
@@ -1691,6 +1626,78 @@
}
}
+
+ return eHAL_STATUS_SUCCESS;
+
+}
+
+
+/* ---------------------------------------------------------------------------
+
+ \fn csrNeighborRoamScanRequestCallback
+
+ \brief This function is the callback function registered in csrScanRequest() to
+ indicate the completion of scan. If scan is completed for all the channels in
+ the channel list, this function gets the scan result and starts the refresh results
+ timer to avoid having stale results. If scan is not completed on all the channels,
+ it restarts the neighbor scan timer which on expiry issues scan on the next
+ channel
+
+ \param halHandle - The handle returned by macOpen.
+ pContext - not used
+ scanId - not used
+ status - not used
+
+ \return eHAL_STATUS_SUCCESS on success, corresponding error code otherwise
+
+---------------------------------------------------------------------------*/
+static eHalStatus csrNeighborRoamScanRequestCallback(tHalHandle halHandle, void *pContext,
+ tANI_U32 scanId, eCsrScanStatus status)
+{
+ tpAniSirGlobal pMac = (tpAniSirGlobal) halHandle;
+ tpCsrNeighborRoamControlInfo pNeighborRoamInfo = &pMac->roam.neighborRoamInfo;
+ tANI_U8 currentChanIndex;
+ eHalStatus hstatus;
+
+ 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)
+ {
+ smsLog(pMac, LOGE, FL("Received in CONNECTED state. Must be because a UP event from TL after issuing scan request. Ignore it"));
+ return eHAL_STATUS_SUCCESS;
+ }
+
+ /* -1 is done because the chanIndex would have got incremented after issuing a successful scan request */
+ currentChanIndex = (pMac->roam.neighborRoamInfo.roamChannelInfo.currentChanIndex) ? (pMac->roam.neighborRoamInfo.roamChannelInfo.currentChanIndex - 1) : 0;
+
+ /* Validate inputs */
+ 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);
+ }
+ else
+ {
+ smsLog(pMac, LOG1, FL("Received during clean-up. Silently ignore scan completion event."));
+ return eHAL_STATUS_SUCCESS;
+ }
+
+ if (eANI_BOOLEAN_FALSE == pNeighborRoamInfo->roamChannelInfo.chanListScanInProgress)
+ {
+ /* 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 */
+ NEIGHBOR_ROAM_DEBUG(pMac, LOGW, FL("Channel list scan completed. Current chan index = %d"), currentChanIndex);
+ VOS_ASSERT(pNeighborRoamInfo->roamChannelInfo.currentChanIndex == 0);
+
+ hstatus = csrNeighborRoamProcessScanComplete(pMac);
+
+ if (eHAL_STATUS_SUCCESS != hstatus)
+ {
+ smsLog(pMac, LOGE, FL("Neighbor scan process complete failed with status %d"), hstatus);
+ return eHAL_STATUS_FAILURE;
+ }
}
else
{
@@ -1712,6 +1719,35 @@
return eHAL_STATUS_SUCCESS;
}
+#ifdef FEATURE_WLAN_LFR
+static eHalStatus csrNeighborRoamContiguousScanRequestCallback(tHalHandle halHandle,
+ void *pContext, tANI_U32 scanId, eCsrScanStatus status)
+{
+ tpAniSirGlobal pMac = (tpAniSirGlobal) halHandle;
+ tpCsrNeighborRoamControlInfo pNeighborRoamInfo = &pMac->roam.neighborRoamInfo;
+ eHalStatus hstatus = eHAL_STATUS_SUCCESS;
+
+ 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)
+ {
+ smsLog(pMac, LOGE, FL("Received in CONNECTED state. Must be because a UP event from TL after issuing scan request. Ignore it"));
+ return eHAL_STATUS_SUCCESS;
+ }
+
+ 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);
+ }
+
+ return hstatus;
+}
+#endif
+
/* ---------------------------------------------------------------------------
\fn csrNeighborRoamIssueBgScanRequest
@@ -1725,16 +1761,19 @@
\return eHAL_STATUS_SUCCESS on success, corresponding error code otherwise
---------------------------------------------------------------------------*/
-eHalStatus csrNeighborRoamIssueBgScanRequest(tpAniSirGlobal pMac, tCsrBGScanRequest *pBgScanParams)
+eHalStatus csrNeighborRoamIssueBgScanRequest(tpAniSirGlobal pMac,
+ tCsrBGScanRequest *pBgScanParams,
+ csrScanCompleteCallback callbackfn)
{
eHalStatus status = eHAL_STATUS_SUCCESS;
tANI_U32 scanId;
tCsrScanRequest scanReq;
tANI_U8 channel;
- NEIGHBOR_ROAM_DEBUG(pMac, LOGW, FL("csrNeighborRoamIssueBgScanRequest for Channel = %d, ChanIndex = %d"),
- pBgScanParams->ChannelInfo.ChannelList[0], pMac->roam.neighborRoamInfo.roamChannelInfo.currentChanIndex);
-
+ if (1 == pBgScanParams->ChannelInfo.numOfChannels)
+ NEIGHBOR_ROAM_DEBUG(pMac, LOGW, FL("Channel = %d, ChanIndex = %d"),
+ pBgScanParams->ChannelInfo.ChannelList[0],
+ pMac->roam.neighborRoamInfo.roamChannelInfo.currentChanIndex);
//send down the scan req for 1 channel on the associated SSID
palZeroMemory(pMac->hHdd, &scanReq, sizeof(tCsrScanRequest));
@@ -1754,9 +1793,15 @@
vos_mem_copy((void *)&scanReq.SSIDs.SSIDList[0].SSID, (void *)&pBgScanParams->SSID, sizeof(pBgScanParams->SSID));
scanReq.ChannelInfo.numOfChannels = pBgScanParams->ChannelInfo.numOfChannels;
-
- channel = pBgScanParams->ChannelInfo.ChannelList[0];
- scanReq.ChannelInfo.ChannelList = &channel;
+ if (1 == pBgScanParams->ChannelInfo.numOfChannels)
+ {
+ channel = pBgScanParams->ChannelInfo.ChannelList[0];
+ scanReq.ChannelInfo.ChannelList = &channel;
+ }
+ else
+ {
+ scanReq.ChannelInfo.ChannelList = pBgScanParams->ChannelInfo.ChannelList;
+ }
scanReq.BSSType = eCSR_BSS_TYPE_INFRASTRUCTURE;
scanReq.scanType = eSIR_ACTIVE_SCAN;
@@ -1764,7 +1809,7 @@
scanReq.maxChnTime = pBgScanParams->maxChnTime;
scanReq.minChnTime = pBgScanParams->minChnTime;
status = csrScanRequest(pMac, CSR_SESSION_ID_INVALID, &scanReq,
- &scanId, csrNeighborRoamScanRequestCallback, NULL);
+ &scanId, callbackfn, NULL);
if (eHAL_STATUS_SUCCESS != status)
{
smsLog(pMac, LOGE, FL("CSR Scan Request failed with status %d"), status);
@@ -1774,12 +1819,30 @@
pMac->roam.neighborRoamInfo.scanRspPending = eANI_BOOLEAN_TRUE;
vos_mem_free(scanReq.SSIDs.SSIDList);
- NEIGHBOR_ROAM_DEBUG(pMac, LOG1, FL("Channel List Address = %08x, Actual index = %d"),
- &pMac->roam.neighborRoamInfo.roamChannelInfo.currentChannelListInfo.ChannelList[0],
- pMac->roam.neighborRoamInfo.roamChannelInfo.currentChanIndex);
+ if (1 == pBgScanParams->ChannelInfo.numOfChannels)
+ NEIGHBOR_ROAM_DEBUG(pMac, LOG1, FL("Channel List Address = %08x, Actual index = %d"),
+ &pMac->roam.neighborRoamInfo.roamChannelInfo.currentChannelListInfo.ChannelList[0],
+ pMac->roam.neighborRoamInfo.roamChannelInfo.currentChanIndex);
+
return status;
}
+static void csrNeighborRoamFillNonChannelBgScanParams (tpAniSirGlobal pMac,
+ tpCsrBGScanRequest bgScanParams)
+{
+ tpCsrNeighborRoamControlInfo pNeighborRoamInfo = &pMac->roam.neighborRoamInfo;
+ tANI_U8 broadcastBssid[] = { 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF };
+
+ vos_mem_copy(bgScanParams->bssid, broadcastBssid, sizeof(tCsrBssid));
+ bgScanParams->SSID.length = pMac->roam.roamSession[pNeighborRoamInfo->csrSessionId].connectedProfile.SSID.length;
+ vos_mem_copy(bgScanParams->SSID.ssId,
+ pMac->roam.roamSession[pNeighborRoamInfo->csrSessionId].connectedProfile.SSID.ssId,
+ pMac->roam.roamSession[pNeighborRoamInfo->csrSessionId].connectedProfile.SSID.length);
+
+ bgScanParams->minChnTime = pNeighborRoamInfo->cfgParams.minChannelScanTime;
+ bgScanParams->maxChnTime = pNeighborRoamInfo->cfgParams.maxChannelScanTime;
+}
+
/* ---------------------------------------------------------------------------
\fn csrNeighborRoamPerformBgScan
@@ -1799,7 +1862,6 @@
eHalStatus status = eHAL_STATUS_SUCCESS;
tpCsrNeighborRoamControlInfo pNeighborRoamInfo = &pMac->roam.neighborRoamInfo;
tCsrBGScanRequest bgScanParams;
- tANI_U8 broadcastBssid[] = { 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF };
tANI_U8 channel = 0;
if (pNeighborRoamInfo->roamChannelInfo.currentChannelListInfo.ChannelList)
@@ -1817,19 +1879,17 @@
return status;
}
/* Need to perform scan here before getting the list */
- vos_mem_copy(bgScanParams.bssid, broadcastBssid, sizeof(tCsrBssid));
- bgScanParams.SSID.length = pMac->roam.roamSession[pNeighborRoamInfo->csrSessionId].connectedProfile.SSID.length;
- vos_mem_copy(bgScanParams.SSID.ssId, pMac->roam.roamSession[pNeighborRoamInfo->csrSessionId].connectedProfile.SSID.ssId,
- pMac->roam.roamSession[pNeighborRoamInfo->csrSessionId].connectedProfile.SSID.length);
+
+ palZeroMemory(pMac->hHdd, &bgScanParams, sizeof(tCsrBGScanRequest));
channel = pNeighborRoamInfo->roamChannelInfo.currentChannelListInfo.ChannelList[pNeighborRoamInfo->roamChannelInfo.currentChanIndex];
bgScanParams.ChannelInfo.numOfChannels = 1;
bgScanParams.ChannelInfo.ChannelList = &channel;
- bgScanParams.minChnTime = pNeighborRoamInfo->cfgParams.minChannelScanTime;
- bgScanParams.maxChnTime = pNeighborRoamInfo->cfgParams.maxChannelScanTime;
+ csrNeighborRoamFillNonChannelBgScanParams(pMac, &bgScanParams);
- status = csrNeighborRoamIssueBgScanRequest(pMac, &bgScanParams);
+ status = csrNeighborRoamIssueBgScanRequest(pMac, &bgScanParams,
+ csrNeighborRoamScanRequestCallback);
if (eHAL_STATUS_SUCCESS != status)
{
smsLog(pMac, LOGE, FL("Issue of BG Scan request failed: Status = %d"), status);
@@ -1856,6 +1916,60 @@
return status;
}
+#ifdef FEATURE_WLAN_LFR
+eHalStatus csrNeighborRoamPerformContiguousBgScan(tpAniSirGlobal pMac)
+{
+ eHalStatus status = eHAL_STATUS_SUCCESS;
+ tCsrBGScanRequest bgScanParams;
+ int numOfChannels = 0, i = 0;
+ tANI_U8 *channelList = NULL;
+
+ palZeroMemory(pMac->hHdd, &bgScanParams, sizeof(tCsrBGScanRequest));
+
+ /* Contiguously scan all channels from valid list */
+ NEIGHBOR_ROAM_DEBUG(pMac, LOG2, "%s: get valid channel list", __func__);
+ numOfChannels = sizeof(pMac->roam.validChannelList);
+
+ if(!HAL_STATUS_SUCCESS(csrGetCfgValidChannels(pMac,
+ (tANI_U8 *)pMac->roam.validChannelList,
+ (tANI_U32 *) &numOfChannels)))
+ {
+ smsLog(pMac, LOGE, FL("Could not get valid channel list"));
+ return eHAL_STATUS_FAILURE;
+ }
+
+ channelList = vos_mem_malloc( numOfChannels );
+ if( NULL == channelList )
+ {
+ smsLog(pMac, LOGE, FL("could not allocate memory for channelList"));
+ return eHAL_STATUS_FAILURE;
+ }
+ vos_mem_copy(channelList, (tANI_U8 *)pMac->roam.validChannelList,
+ numOfChannels * sizeof(tANI_U8));
+
+ bgScanParams.ChannelInfo.numOfChannels = numOfChannels;
+ bgScanParams.ChannelInfo.ChannelList = channelList;
+ for (i = 0; i < numOfChannels; i++)
+ {
+ NEIGHBOR_ROAM_DEBUG(pMac, LOGW, "%s: valid channel list = %d\n",
+ __func__, bgScanParams.ChannelInfo.ChannelList[i]);
+ }
+ csrNeighborRoamFillNonChannelBgScanParams(pMac, &bgScanParams);
+
+ status = csrNeighborRoamIssueBgScanRequest(pMac, &bgScanParams,
+ csrNeighborRoamContiguousScanRequestCallback);
+
+ vos_mem_free( channelList );
+
+ if (eHAL_STATUS_SUCCESS != status)
+ {
+ smsLog(pMac, LOGE, FL("Issue of BG Scan request failed: Status = %d"), status);
+ }
+
+ return status;
+}
+#endif
+
/* ---------------------------------------------------------------------------
\fn csrNeighborRoamNeighborScanTimerCallback
@@ -1966,7 +2080,7 @@
else
#endif
{
- NEIGHBOR_ROAM_DEBUG(pMac, LOGE, FL("Non 11R or CCX Association:Neighbor Lookup Down event received in CONNECTED state"));
+ NEIGHBOR_ROAM_DEBUG(pMac, LOGE, FL("Non 11R or CCX Association:results refresh timer expired"));
vosStatus = csrNeighborRoamTransitToCFGChanScan(pMac);
if (VOS_STATUS_SUCCESS != vosStatus)
{
@@ -2536,9 +2650,39 @@
vos_mem_copy(currChannelListInfo->ChannelList,
channelList, numOfChannels * sizeof(tANI_U8));
}
+#ifdef FEATURE_WLAN_LFR
+ else if (abs(pNeighborRoamInfo->lookupDOWNRssi) >
+ abs(pNeighborRoamInfo->cfgParams.neighborReassocThreshold))
+ {
+ /*
+ * Trigger a contiguous scan on all channels when the
+ * RSSI in the lookup DOWN notification is below reassoc
+ * threshold. This will help us find the best available
+ * candidate and also update the channel cache.
+ */
+ NEIGHBOR_ROAM_DEBUG(pMac, LOGW, "Triggering contiguous scan "
+ "(lookupDOWNRssi=%d,reassocThreshold=%d)",
+ pNeighborRoamInfo->lookupDOWNRssi,
+ pNeighborRoamInfo->cfgParams.neighborReassocThreshold*(-1));
+
+ pNeighborRoamInfo->scanRequestTimeStamp = (tANI_TIMESTAMP)palGetTickCount(pMac->hHdd);
+
+ palTimerStop(pMac->hHdd, pNeighborRoamInfo->neighborScanTimer);
+
+ /* We are about to start a fresh scan cycle,
+ * purge non-P2P results from the past */
+ csrScanFlushSelectiveResult(pMac, VOS_FALSE);
+
+ csrNeighborRoamPerformContiguousBgScan(pMac);
+
+ /* Transition to CFG_CHAN_LIST_SCAN */
+ CSR_NEIGHBOR_ROAM_STATE_TRANSITION(eCSR_NEIGHBOR_ROAM_STATE_CFG_CHAN_LIST_SCAN);
+
+ return VOS_STATUS_SUCCESS;
+ }
+#endif
else
{
- /* Get current list of valid channels. */
numOfChannels = pMac->scan.occupiedChannels.numChannels;
if (numOfChannels
#ifdef FEATURE_WLAN_LFR
@@ -2623,6 +2767,9 @@
/* Adjust for the actual number that are used */
currChannelListInfo->numOfChannels = numOfChannels;
+ NEIGHBOR_ROAM_DEBUG(pMac, LOGW,
+ "Number of channels from CFG (or) (non-)occupied list=%d",
+ currChannelListInfo->numOfChannels);
for (i = 0; i < currChannelListInfo->numOfChannels; i++)
{
NEIGHBOR_ROAM_DEBUG(pMac, LOGW, "Channel List from CFG (or) (non-)occupied list"
@@ -2694,6 +2841,9 @@
WLANTL_HO_THRESHOLD_DOWN,
csrNeighborRoamNeighborLookupDOWNCallback,
VOS_MODULE_ID_SME, pMac);
+#ifdef FEATURE_WLAN_LFR
+ pNeighborRoamInfo->lookupDOWNRssi = 0;
+#endif
if(!VOS_IS_STATUS_SUCCESS(vosStatus))
{
//err msg
@@ -2856,6 +3006,9 @@
rssiNotification,
avgRssi);
+#ifdef FEATURE_WLAN_LFR
+ pNeighborRoamInfo->lookupDOWNRssi = avgRssi;
+#endif
if(!csrIsConnStateConnectedInfra(pMac, pNeighborRoamInfo->csrSessionId))
{
smsLog(pMac, LOGW, "Ignoring the indication as we are not connected\n");
@@ -2940,6 +3093,12 @@
csrNeighborRoamDeregAllRssiIndication(pMac);
break;
+ case eCSR_NEIGHBOR_ROAM_STATE_CONNECTED:
+ CSR_NEIGHBOR_ROAM_STATE_TRANSITION(eCSR_NEIGHBOR_ROAM_STATE_INIT)
+ csrNeighborRoamResetConnectedStateControlInfo(pMac);
+ csrNeighborRoamDeregAllRssiIndication(pMac);
+ break;
+
case eCSR_NEIGHBOR_ROAM_STATE_CFG_CHAN_LIST_SCAN:
CSR_NEIGHBOR_ROAM_STATE_TRANSITION(eCSR_NEIGHBOR_ROAM_STATE_INIT);
csrNeighborRoamResetCfgListChanScanControlInfo(pMac);
@@ -3028,6 +3187,7 @@
pNeighborRoamInfo->cfgParams.neighborLookupThreshold;
#ifdef FEATURE_WLAN_LFR
pNeighborRoamInfo->uEmptyScanCount = 0;
+ pNeighborRoamInfo->lookupDOWNRssi = 0;
#endif
@@ -3088,7 +3248,9 @@
WLANTL_HO_THRESHOLD_DOWN,
csrNeighborRoamNeighborLookupDOWNCallback,
VOS_MODULE_ID_SME, pMac);
-
+#ifdef FEATURE_WLAN_LFR
+ pNeighborRoamInfo->lookupDOWNRssi = 0;
+#endif
if(!VOS_IS_STATUS_SUCCESS(vstatus))
{
//err msg
@@ -3253,6 +3415,7 @@
vos_mem_set(pNeighborRoamInfo->currAPbssid, sizeof(tCsrBssid), 0);
pNeighborRoamInfo->currentNeighborLookupThreshold = pMac->roam.neighborRoamInfo.cfgParams.neighborLookupThreshold;
#ifdef FEATURE_WLAN_LFR
+ pNeighborRoamInfo->lookupDOWNRssi = 0;
pNeighborRoamInfo->uEmptyScanCount = 0;
palZeroMemory(pMac->hHdd, &pNeighborRoamInfo->prevConnProfile,
sizeof(tCsrRoamConnectedProfile));
diff --git a/firmware_bin/WCNSS_qcom_cfg.ini b/firmware_bin/WCNSS_qcom_cfg.ini
index 3dc419a..33feb43 100644
--- a/firmware_bin/WCNSS_qcom_cfg.ini
+++ b/firmware_bin/WCNSS_qcom_cfg.ini
@@ -184,12 +184,6 @@
#Prefer 5GHz APs while roaming (default is gRoamPrefer5GHz=1)
gRoamPrefer5GHz=1
-# If the RSSI of any available candidate is better than currently associated
-# AP by at least gImmediateRoamRssiDiff, then being to roam immediately (without
-# registering for reassoc threshold).
-# NOTE: Value of 0 means that we would register for reassoc threshold.
-gImmediateRoamRssiDiff=10
-
# SAP Country code
# Default Country Code is 2 bytes, 3rd byte is optional indoor or out door.