diff options
| author | Varun Reddy Yeturu <vyeturu@qca.qualcomm.com> | 2016-03-09 15:52:29 -0800 |
|---|---|---|
| committer | Anjaneedevi Kapparapu <akappa@codeaurora.org> | 2016-03-11 12:21:43 +0530 |
| commit | 7921af4f20bba9cc48bbdf12f213b21e28bcdfdb (patch) | |
| tree | 0754d1f91e55600c7269a05d366f22ad085192cb | |
| parent | 25a708a1554590afa97eba8c6147743bd2b79a69 (diff) | |
qcacld-2.0: Enhancement to RRM measurement
Before sending the 11k measurement report, check if there is a
valid scan result or if the measurement is done to send out a
report or cleanup the RRM state machine.
CRs-Fixed: 982133
Change-Id: I3f98450f3d139dd7a7c1548dc80070cf780ada88
| -rw-r--r-- | CORE/MAC/src/cfg/cfgApi.c | 2 | ||||
| -rw-r--r-- | CORE/SME/src/rrm/sme_rrm.c | 27 |
2 files changed, 13 insertions, 16 deletions
diff --git a/CORE/MAC/src/cfg/cfgApi.c b/CORE/MAC/src/cfg/cfgApi.c index 3471348cb828..f5760c332443 100644 --- a/CORE/MAC/src/cfg/cfgApi.c +++ b/CORE/MAC/src/cfg/cfgApi.c @@ -974,7 +974,7 @@ cfgGetCapabilityInfo(tpAniSirGlobal pMac, tANI_U16 *pCap,tpPESession sessionEntr #if defined WLAN_FEATURE_VOWIFI pCapInfo->rrm = pMac->rrm.rrmSmeContext.rrmConfig.rrm_enabled; #if defined WLAN_VOWIFI_DEBUG - cfgLog( pMac, LOGE, "RRM = %d", pCapInfo->rrm); + cfgLog( pMac, LOG1, "RRM = %d", pCapInfo->rrm); #endif #endif diff --git a/CORE/SME/src/rrm/sme_rrm.c b/CORE/SME/src/rrm/sme_rrm.c index 7fd41e3288fe..1d10b10e6c19 100644 --- a/CORE/SME/src/rrm/sme_rrm.c +++ b/CORE/SME/src/rrm/sme_rrm.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011-2014 The Linux Foundation. All rights reserved. + * Copyright (c) 2011-2014, 2016 The Linux Foundation. All rights reserved. * * Previously licensed under the ISC license by Qualcomm Atheros, Inc. * @@ -531,6 +531,7 @@ static eHalStatus sme_RrmSendScanResult( tpAniSirGlobal pMac, #endif } + smsLog(pMac, LOG1, FL("RRM Measurement Done %d"), measurementDone); if (NULL == pResult) { /* @@ -612,22 +613,18 @@ static eHalStatus sme_RrmSendScanResult( tpAniSirGlobal pMac, * The next level routine does a check for the measurementDone to determine * whether to send a report or not. */ + if (counter || measurementDone) { #if defined(FEATURE_WLAN_ESE_UPLOAD) - if (eRRM_MSG_SOURCE_ESE_UPLOAD == pSmeRrmContext->msgSource) - { - status = sme_EseSendBeaconReqScanResults(pMac, - sessionId, - chanList[0], - pScanResultsArr, - measurementDone, - counter); - } + if (eRRM_MSG_SOURCE_ESE_UPLOAD == pSmeRrmContext->msgSource) + status = sme_EseSendBeaconReqScanResults(pMac, sessionId, + chanList[0], pScanResultsArr, + measurementDone, counter); else -#endif /*FEATURE_WLAN_ESE_UPLOAD*/ - status = sme_RrmSendBeaconReportXmitInd(pMac, - pScanResultsArr, - measurementDone, - counter); +#endif + status = sme_RrmSendBeaconReportXmitInd(pMac, + pScanResultsArr, + measurementDone, counter); + } sme_ScanResultPurge(pMac, pResult); return status; |