wlan: Enterprise Security Enhancements
A proper nomenclature is being put in place, to make
the code reflect the appropriate functionality
that is associated with it.
Change-Id: I3e0c869a1259b77c4e692fe02f93cbcef9001104
CRs-Fixed: 622164
(cherry picked from commit 39aef9ead739f8574c2e88a2465f81e2091174a3)
diff --git a/CORE/SME/src/QoS/sme_Qos.c b/CORE/SME/src/QoS/sme_Qos.c
index 7768fb6..b757dde 100644
--- a/CORE/SME/src/QoS/sme_Qos.c
+++ b/CORE/SME/src/QoS/sme_Qos.c
@@ -49,8 +49,8 @@
#include "smsDebug.h"
#include "utilsParser.h"
#endif
-#if defined(FEATURE_WLAN_CCX) && !defined(FEATURE_WLAN_CCX_UPLOAD)
-#include <csrCcx.h>
+#if defined(FEATURE_WLAN_ESE) && !defined(FEATURE_WLAN_ESE_UPLOAD)
+#include <csrEse.h>
#endif
#ifndef WLAN_MDM_CODE_REDUCTION_OPT
@@ -1100,7 +1100,7 @@
case SME_QOS_CSR_PREAUTH_SUCCESS_IND:
status = sme_QosProcessPreauthSuccessInd(pMac, sessionId, pEvent_info);
break;
-#if defined(FEATURE_WLAN_CCX) || defined(FEATURE_WLAN_LFR)
+#if defined(FEATURE_WLAN_ESE) || defined(FEATURE_WLAN_LFR)
case SME_QOS_CSR_SET_KEY_SUCCESS_IND:
status = sme_QosProcessSetKeySuccessInd(pMac, sessionId, pEvent_info);
break;
@@ -2476,7 +2476,7 @@
{
// this is the only flow aggregated in this TSPEC
status = SME_QOS_STATUS_RELEASE_SUCCESS_RSP;
-#if defined(FEATURE_WLAN_CCX) && !defined(FEATURE_WLAN_CCX_UPLOAD)
+#if defined(FEATURE_WLAN_ESE) && !defined(FEATURE_WLAN_ESE_UPLOAD)
if (ac == SME_QOS_EDCA_AC_VO)
{
// Indicate to neighbor roam logic of the new required VO
@@ -2997,7 +2997,7 @@
return status;
}
-#if defined(FEATURE_WLAN_CCX) || defined(FEATURE_WLAN_LFR)
+#if defined(FEATURE_WLAN_ESE) || defined(FEATURE_WLAN_LFR)
/* This is a dummy function now. But the purpose of me adding this was to
* delay the TSPEC processing till SET_KEY completes. This function can be
* used to do any SME_QOS processing after the SET_KEY. As of now, it is
@@ -3013,9 +3013,9 @@
}
#endif
-#ifdef FEATURE_WLAN_CCX
+#ifdef FEATURE_WLAN_ESE
/*--------------------------------------------------------------------------
- \brief sme_QosCCXSaveTspecResponse() - This function saves the TSPEC
+ \brief sme_QosESESaveTspecResponse() - This function saves the TSPEC
parameters that came along in the TSPEC IE in the reassoc response
\param pMac - Pointer to the global MAC parameter structure.
@@ -3026,7 +3026,7 @@
\return eHAL_STATUS_SUCCESS - Release is successful.
--------------------------------------------------------------------------*/
-eHalStatus sme_QosCCXSaveTspecResponse(tpAniSirGlobal pMac, v_U8_t sessionId, tDot11fIEWMMTSPEC *pTspec, v_U8_t ac, v_U8_t tspecIndex)
+eHalStatus sme_QosESESaveTspecResponse(tpAniSirGlobal pMac, v_U8_t sessionId, tDot11fIEWMMTSPEC *pTspec, v_U8_t ac, v_U8_t tspecIndex)
{
tpSirAddtsRsp pAddtsRsp = &sme_QosCb.sessionInfo[sessionId].ac_info[ac].addTsRsp[tspecIndex];
@@ -3055,9 +3055,9 @@
}
/*--------------------------------------------------------------------------
- \brief sme_QosCCXProcessReassocTspecRsp() - This function processes the
+ \brief sme_QosESEProcessReassocTspecRsp() - This function processes the
WMM TSPEC IE in the reassoc response. Reassoc triggered as part of
- CCX roaming to another CCX capable AP. If the TSPEC was added before
+ ESE roaming to another ESE capable AP. If the TSPEC was added before
reassoc, as part of Call Admission Control, the reasso req from the
STA would carry the TSPEC parameters which were already negotiated
with the older AP.
@@ -3068,7 +3068,7 @@
\return eHAL_STATUS_SUCCESS - Release is successful.
--------------------------------------------------------------------------*/
-eHalStatus sme_QosCCXProcessReassocTspecRsp(tpAniSirGlobal pMac, v_U8_t sessionId, void* pEvent_info)
+eHalStatus sme_QosESEProcessReassocTspecRsp(tpAniSirGlobal pMac, v_U8_t sessionId, void* pEvent_info)
{
sme_QosSessionInfo *pSession;
sme_QosACInfo *pACInfo;
@@ -3092,7 +3092,7 @@
tspecIeLen = pCsrConnectedInfo->nTspecIeLength;
if (tspecIeLen < sizeof(tDot11fIEWMMTSPEC)) {
VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR,
- FL("CCX Tspec IE len %d less than min %d"),
+ FL("ESE Tspec IE len %d less than min %d"),
tspecIeLen, sizeof(tDot11fIEWMMTSPEC));
return eHAL_STATUS_FAILURE;
}
@@ -3114,7 +3114,7 @@
if (tspec_mask_status & (1 << tspec_flow_index)) {
VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_WARN,
FL("Found Tspec entry flow = %d AC = %d"),tspec_flow_index, ac);
- sme_QosCCXSaveTspecResponse(pMac, sessionId, pTspecIE, ac, tspec_flow_index);
+ sme_QosESESaveTspecResponse(pMac, sessionId, pTspecIE, ac, tspec_flow_index);
} else {
VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_WARN,
FL("Not found Tspec entry flow = %d AC = %d"),tspec_flow_index, ac);
@@ -3185,7 +3185,7 @@
}
/*--------------------------------------------------------------------------
- \brief sme_QosCCxRetrieveTspecInfo() - This function is called by CSR
+ \brief sme_QosEseRetrieveTspecInfo() - This function is called by CSR
when try to create reassoc request message to PE - csrSendSmeReassocReqMsg
This functions get the existing tspec parameters to be included
in the reassoc request.
@@ -3196,7 +3196,7 @@
\return v_U8_t - number of existing negotiated TSPECs
--------------------------------------------------------------------------*/
-v_U8_t sme_QosCCxRetrieveTspecInfo(tpAniSirGlobal pMac, v_U8_t sessionId, tTspecInfo *pTspecInfo)
+v_U8_t sme_QosESERetrieveTspecInfo(tpAniSirGlobal pMac, v_U8_t sessionId, tTspecInfo *pTspecInfo)
{
sme_QosSessionInfo *pSession;
sme_QosACInfo *pACInfo;
@@ -3763,7 +3763,7 @@
tSirAddtsReq *pMsg = NULL;
sme_QosSessionInfo *pSession;
eHalStatus status = eHAL_STATUS_FAILURE;
-#ifdef FEATURE_WLAN_CCX
+#ifdef FEATURE_WLAN_ESE
tCsrRoamSession *pCsrSession = CSR_GET_SESSION( pMac, sessionId );
#endif
#ifdef FEATURE_WLAN_DIAG_SUPPORT
@@ -3854,8 +3854,8 @@
__func__, __LINE__,
pTspec_Info->ts_info.up,
pTspec_Info->ts_info.tid);
-#ifdef FEATURE_WLAN_CCX
- if(pCsrSession->connectedProfile.isCCXAssoc)
+#ifdef FEATURE_WLAN_ESE
+ if(pCsrSession->connectedProfile.isESEAssoc)
{
pMsg->req.tsrsIE.tsid = pTspec_Info->ts_info.up;
pMsg->req.tsrsPresent = 1;
@@ -4455,13 +4455,13 @@
status = sme_QosProcessFTReassocRspEv(pMac, sessionId, pEvent_info);
}
}
-#ifdef FEATURE_WLAN_CCX
- // If CCX association check for TSPEC IEs in the reassoc rsp frame
- if (csrRoamIsCCXAssoc(pMac))
+#ifdef FEATURE_WLAN_ESE
+ // If ESE association check for TSPEC IEs in the reassoc rsp frame
+ if (csrRoamIsESEAssoc(pMac))
{
if (pCsrRoamSession && pCsrRoamSession->connectedInfo.nTspecIeLength)
{
- status = sme_QosCCXProcessReassocTspecRsp(pMac, sessionId, pEvent_info);
+ status = sme_QosESEProcessReassocTspecRsp(pMac, sessionId, pEvent_info);
}
}
#endif
@@ -5467,7 +5467,7 @@
}
WLAN_VOS_DIAG_LOG_REPORT(log_ptr);
#endif //FEATURE_WLAN_DIAG_SUPPORT
-#if defined(FEATURE_WLAN_CCX) && !defined(FEATURE_WLAN_CCX_UPLOAD)
+#if defined(FEATURE_WLAN_ESE) && !defined(FEATURE_WLAN_ESE_UPLOAD)
if (ac == SME_QOS_EDCA_AC_VO)
{
// Indicate to neighbor roam logic of the new required VO
@@ -5626,7 +5626,7 @@
spec it is less than or equal to inactivity interval
This is not provided by app since we currently don't support the HCCA
mode of operation
- Currently set it to 0 to avoid confusion: Cisco CCX needs ~0; spec
+ Currently set it to 0 to avoid confusion: Cisco ESE needs ~0; spec
requires inactivity interval to be > suspension interval: this could
be tricky!
-------------------------------------------------------------------------*/
diff --git a/CORE/SME/src/csr/csrApiRoam.c b/CORE/SME/src/csr/csrApiRoam.c
index 285202d..fb83bc6 100644
--- a/CORE/SME/src/csr/csrApiRoam.c
+++ b/CORE/SME/src/csr/csrApiRoam.c
@@ -70,9 +70,9 @@
#ifdef WLAN_FEATURE_NEIGHBOR_ROAMING
#include "csrNeighborRoam.h"
#endif /* WLAN_FEATURE_NEIGHBOR_ROAMING */
-#if defined(FEATURE_WLAN_CCX) && !defined(FEATURE_WLAN_CCX_UPLOAD)
-#include "csrCcx.h"
-#endif /* FEATURE_WLAN_CCX && !FEATURE_WLAN_CCX_UPLOAD */
+#if defined(FEATURE_WLAN_ESE) && !defined(FEATURE_WLAN_ESE_UPLOAD)
+#include "csrEse.h"
+#endif /* FEATURE_WLAN_ESE && !FEATURE_WLAN_ESE_UPLOAD */
#define CSR_NUM_IBSS_START_CHANNELS_50 4
#define CSR_NUM_IBSS_START_CHANNELS_24 3
#define CSR_DEF_IBSS_START_CHANNEL_50 36
@@ -811,17 +811,17 @@
pProfile->MDID.mobilityDomain = 0;
}
#endif
-#ifdef FEATURE_WLAN_CCX
- pProfile->isCCXAssoc = pSession->connectedProfile.isCCXAssoc;
- if (csrIsAuthTypeCCX(pSession->connectedProfile.AuthType))
+#ifdef FEATURE_WLAN_ESE
+ pProfile->isESEAssoc = pSession->connectedProfile.isESEAssoc;
+ if (csrIsAuthTypeESE(pSession->connectedProfile.AuthType))
{
- vos_mem_copy (pProfile->ccxCckmInfo.krk,
- pSession->connectedProfile.ccxCckmInfo.krk,
+ vos_mem_copy (pProfile->eseCckmInfo.krk,
+ pSession->connectedProfile.eseCckmInfo.krk,
CSR_KRK_KEY_LEN);
- pProfile->ccxCckmInfo.reassoc_req_num=
- pSession->connectedProfile.ccxCckmInfo.reassoc_req_num;
- pProfile->ccxCckmInfo.krk_plumbed =
- pSession->connectedProfile.ccxCckmInfo.krk_plumbed;
+ pProfile->eseCckmInfo.reassoc_req_num=
+ pSession->connectedProfile.eseCckmInfo.reassoc_req_num;
+ pProfile->eseCckmInfo.krk_plumbed =
+ pSession->connectedProfile.eseCckmInfo.krk_plumbed;
}
#endif
}while(0);
@@ -879,7 +879,7 @@
#ifdef WLAN_FEATURE_VOWIFI_11R
pConnectedInfo->nRICRspLength = 0;
#endif
-#ifdef FEATURE_WLAN_CCX
+#ifdef FEATURE_WLAN_ESE
pConnectedInfo->nTspecIeLength = 0;
#endif
return ( status );
@@ -1118,7 +1118,7 @@
}
-#if defined(FEATURE_WLAN_CCX) && defined(FEATURE_WLAN_CCX_UPLOAD)
+#if defined(FEATURE_WLAN_ESE) && defined(FEATURE_WLAN_ESE_UPLOAD)
/*
This function flushes the roam scan cache
*/
@@ -1136,10 +1136,10 @@
}
return status;
}
-#endif /* FEATURE_WLAN_CCX && FEATURE_WLAN_CCX_UPLOAD */
+#endif /* FEATURE_WLAN_ESE && FEATURE_WLAN_ESE_UPLOAD */
-#if defined (WLAN_FEATURE_VOWIFI_11R) || defined (FEATURE_WLAN_CCX) || defined(FEATURE_WLAN_LFR)
+#if defined (WLAN_FEATURE_VOWIFI_11R) || defined (FEATURE_WLAN_ESE) || defined(FEATURE_WLAN_LFR)
/*
This function flushes the roam scan cache
*/
@@ -1270,7 +1270,7 @@
}
#endif
-#if defined(FEATURE_WLAN_CCX) && defined(FEATURE_WLAN_CCX_UPLOAD)
+#if defined(FEATURE_WLAN_ESE) && defined(FEATURE_WLAN_ESE_UPLOAD)
/* This function modifies the roam scan channel list as per AP neighbor
report; AP neighbor report may be empty or may include only other AP
channels; in any case, we merge the channel list with the learned occupied
@@ -1391,7 +1391,7 @@
}
return status;
}
-#endif /* FEATURE_WLAN_CCX && FEATURE_WLAN_CCX_UPLOAD */
+#endif /* FEATURE_WLAN_ESE && FEATURE_WLAN_ESE_UPLOAD */
eHalStatus csrSetBand(tHalHandle hHal, eCsrBand eBand)
{
@@ -1423,7 +1423,7 @@
pMac->roam.configParam.eBand = eBand;
pMac->roam.configParam.bandCapability = eBand;
csrScanGetSupportedChannels( pMac );
-#if defined (WLAN_FEATURE_VOWIFI_11R) || defined (FEATURE_WLAN_CCX) || defined(FEATURE_WLAN_LFR)
+#if defined (WLAN_FEATURE_VOWIFI_11R) || defined (FEATURE_WLAN_ESE) || defined(FEATURE_WLAN_LFR)
if (!csrRoamIsRoamOffloadScanEnabled(pMac))
csrUpdateBgScanConfigIniChannelList( pMac, eBand );
#endif
@@ -1725,7 +1725,7 @@
&pParam->csr11rConfig, sizeof(tCsr11rConfigParams));
smsLog( pMac, LOG1, "IsFTResourceReqSupp = %d", pMac->roam.configParam.csr11rConfig.IsFTResourceReqSupported);
#endif
-#if defined (WLAN_FEATURE_VOWIFI_11R) || defined (FEATURE_WLAN_CCX) || defined(FEATURE_WLAN_LFR)
+#if defined (WLAN_FEATURE_VOWIFI_11R) || defined (FEATURE_WLAN_ESE) || defined(FEATURE_WLAN_LFR)
pMac->roam.configParam.isFastTransitionEnabled = pParam->isFastTransitionEnabled;
pMac->roam.configParam.RoamRssiDiff = pParam->RoamRssiDiff;
pMac->roam.configParam.nImmediateRoamRssiDiff = pParam->nImmediateRoamRssiDiff;
@@ -1746,8 +1746,8 @@
pMac->roam.configParam.MAWCEnabled = pParam->MAWCEnabled;
#endif
-#ifdef FEATURE_WLAN_CCX
- pMac->roam.configParam.isCcxIniFeatureEnabled = pParam->isCcxIniFeatureEnabled;
+#ifdef FEATURE_WLAN_ESE
+ pMac->roam.configParam.isEseIniFeatureEnabled = pParam->isEseIniFeatureEnabled;
#endif
#ifdef WLAN_FEATURE_NEIGHBOR_ROAMING
vos_mem_copy(&pMac->roam.configParam.neighborRoamConfig,
@@ -1889,7 +1889,7 @@
vos_mem_copy(&pMac->roam.configParam.csr11rConfig,
&pParam->csr11rConfig, sizeof(tCsr11rConfigParams));
#endif
-#if defined (WLAN_FEATURE_VOWIFI_11R) || defined (FEATURE_WLAN_CCX) || defined(FEATURE_WLAN_LFR)
+#if defined (WLAN_FEATURE_VOWIFI_11R) || defined (FEATURE_WLAN_ESE) || defined(FEATURE_WLAN_LFR)
pParam->isFastTransitionEnabled = pMac->roam.configParam.isFastTransitionEnabled;
pParam->RoamRssiDiff = pMac->roam.configParam.RoamRssiDiff;
pParam->nImmediateRoamRssiDiff = pMac->roam.configParam.nImmediateRoamRssiDiff;
@@ -1907,8 +1907,8 @@
pParam->isFastRoamIniFeatureEnabled = pMac->roam.configParam.isFastRoamIniFeatureEnabled;
#endif
-#ifdef FEATURE_WLAN_CCX
- pParam->isCcxIniFeatureEnabled = pMac->roam.configParam.isCcxIniFeatureEnabled;
+#ifdef FEATURE_WLAN_ESE
+ pParam->isEseIniFeatureEnabled = pMac->roam.configParam.isEseIniFeatureEnabled;
#endif
#ifdef WLAN_FEATURE_NEIGHBOR_ROAMING
vos_mem_copy(&pParam->neighborRoamConfig,
@@ -5094,12 +5094,12 @@
#endif
}
#endif
-#ifdef FEATURE_WLAN_CCX
-//Returns whether the current association is a CCX assoc or not
-tANI_BOOLEAN csrRoamIsCCXAssoc(tpAniSirGlobal pMac)
+#ifdef FEATURE_WLAN_ESE
+//Returns whether the current association is a ESE assoc or not
+tANI_BOOLEAN csrRoamIsESEAssoc(tpAniSirGlobal pMac)
{
#ifdef WLAN_FEATURE_NEIGHBOR_ROAMING
- return csrNeighborRoamIsCCXAssoc(pMac);
+ return csrNeighborRoamIsESEAssoc(pMac);
#else
return eANI_BOOLEAN_FALSE;
#endif
@@ -5136,23 +5136,23 @@
}
}
-#ifdef FEATURE_WLAN_CCX
+#ifdef FEATURE_WLAN_ESE
/* ---------------------------------------------------------------------------
- \fn csrNeighborRoamIsCCXAssoc
+ \fn csrNeighborRoamIsESEAssoc
- \brief This function returns whether the current association is a CCX assoc or not
+ \brief This function returns whether the current association is a ESE assoc or not
\param pMac - The handle returned by macOpen.
- \return eANI_BOOLEAN_TRUE if current assoc is CCX, eANI_BOOLEAN_FALSE otherwise
+ \return eANI_BOOLEAN_TRUE if current assoc is ESE, eANI_BOOLEAN_FALSE otherwise
---------------------------------------------------------------------------*/
-tANI_BOOLEAN csrNeighborRoamIsCCXAssoc(tpAniSirGlobal pMac)
+tANI_BOOLEAN csrNeighborRoamIsESEAssoc(tpAniSirGlobal pMac)
{
- return pMac->roam.neighborRoamInfo.isCCXAssoc;
+ return pMac->roam.neighborRoamInfo.isESEAssoc;
}
-#endif /* FEATURE_WLAN_CCX */
+#endif /* FEATURE_WLAN_ESE */
#ifdef WLAN_FEATURE_ROAM_SCAN_OFFLOAD
//Returns whether "FW based BG scan" is currently enabled...or not
@@ -5163,12 +5163,12 @@
#endif
#endif
-#if defined(FEATURE_WLAN_CCX)
-tANI_BOOLEAN csrRoamIsCcxIniFeatureEnabled(tpAniSirGlobal pMac)
+#if defined(FEATURE_WLAN_ESE)
+tANI_BOOLEAN csrRoamIsEseIniFeatureEnabled(tpAniSirGlobal pMac)
{
- return pMac->roam.configParam.isCcxIniFeatureEnabled;
+ return pMac->roam.configParam.isEseIniFeatureEnabled;
}
-#endif /*FEATURE_WLAN_CCX*/
+#endif /*FEATURE_WLAN_ESE*/
//Return true means the command can be release, else not
static tANI_BOOLEAN csrRoamProcessResults( tpAniSirGlobal pMac, tSmeCmd *pCommand,
@@ -5285,8 +5285,8 @@
csrRoamSaveConnectedInfomation(pMac, sessionId, pProfile, pSirBssDesc, pIes);
//Save WPA/RSN IE
csrRoamSaveSecurityRspIE(pMac, sessionId, pProfile->negotiatedAuthType, pSirBssDesc, pIes);
-#ifdef FEATURE_WLAN_CCX
- roamInfo.isCCXAssoc = pSession->connectedProfile.isCCXAssoc;
+#ifdef FEATURE_WLAN_ESE
+ roamInfo.isESEAssoc = pSession->connectedProfile.isESEAssoc;
#endif
// csrRoamStateChange also affects sub-state. Hence, csrRoamStateChange happens first and then
@@ -5359,7 +5359,7 @@
#ifdef WLAN_FEATURE_VOWIFI_11R
len += pJoinRsp->parsedRicRspLen;
#endif /* WLAN_FEATURE_VOWIFI_11R */
-#ifdef FEATURE_WLAN_CCX
+#ifdef FEATURE_WLAN_ESE
len += pJoinRsp->tspecIeLen;
#endif
if(len)
@@ -5375,7 +5375,7 @@
#ifdef WLAN_FEATURE_VOWIFI_11R
pSession->connectedInfo.nRICRspLength = pJoinRsp->parsedRicRspLen;
#endif /* WLAN_FEATURE_VOWIFI_11R */
-#ifdef FEATURE_WLAN_CCX
+#ifdef FEATURE_WLAN_ESE
pSession->connectedInfo.nTspecIeLength = pJoinRsp->tspecIeLen;
#endif
roamInfo.nAssocReqLength = pJoinRsp->assocReqLength;
@@ -7131,9 +7131,9 @@
{
status = csrGetParsedBssDescriptionIEs(pMac, pSirBssDesc, &pIesTemp);
}
-#ifdef FEATURE_WLAN_CCX
- if ((csrIsProfileCCX(pProfile) ||
- ((pIesTemp->CCXVersion.present)
+#ifdef FEATURE_WLAN_ESE
+ if ((csrIsProfileESE(pProfile) ||
+ ((pIesTemp->ESEVersion.present)
&& ((pProfile->negotiatedAuthType == eCSR_AUTH_TYPE_OPEN_SYSTEM)
|| (pProfile->negotiatedAuthType == eCSR_AUTH_TYPE_WPA)
|| (pProfile->negotiatedAuthType == eCSR_AUTH_TYPE_WPA_PSK)
@@ -7142,9 +7142,9 @@
|| (pProfile->negotiatedAuthType == eCSR_AUTH_TYPE_RSN_PSK_SHA256)
#endif
|| (pProfile->negotiatedAuthType == eCSR_AUTH_TYPE_RSN_PSK))))
- && (pMac->roam.configParam.isCcxIniFeatureEnabled))
+ && (pMac->roam.configParam.isEseIniFeatureEnabled))
{
- pConnectProfile->isCCXAssoc = 1;
+ pConnectProfile->isESEAssoc = 1;
}
#endif
//save ssid
@@ -7649,7 +7649,7 @@
/* We need to come with other way to figure out that this is because of HO in BMP
The below API will be only available for Android as it uses a different HO algorithm */
- /* Reassoc request will be used only for CCX and 11r handoff whereas other legacy roaming should
+ /* Reassoc request will be used only for ESE and 11r handoff whereas other legacy roaming should
* use join request */
#ifdef WLAN_FEATURE_VOWIFI_11R
if (csrRoamIsHandoffInProgress(pMac) &&
@@ -7660,9 +7660,9 @@
}
else
#endif
-#ifdef FEATURE_WLAN_CCX
+#ifdef FEATURE_WLAN_ESE
if (csrRoamIsHandoffInProgress(pMac) &&
- csrRoamIsCCXAssoc(pMac))
+ csrRoamIsESEAssoc(pMac))
{
// Now serialize the reassoc command.
status = csrRoamIssueReassociateCmd(pMac, sessionId);
@@ -8352,9 +8352,9 @@
{
eHalStatus status = eHAL_STATUS_INVALID_PARAMETER;
tSmeCmd *pCommand = NULL;
-#ifdef FEATURE_WLAN_CCX
+#ifdef FEATURE_WLAN_ESE
tCsrRoamSession *pSession = CSR_GET_SESSION( pMac, sessionId );
-#endif /* FEATURE_WLAN_CCX */
+#endif /* FEATURE_WLAN_ESE */
do
{
@@ -8438,7 +8438,7 @@
CSR_WAPI_KEY_LEN);
}
#endif /* FEATURE_WLAN_WAPI */
-#ifdef FEATURE_WLAN_CCX
+#ifdef FEATURE_WLAN_ESE
else if ( eCSR_ENCRYPT_TYPE_KRK == pSetKey->encType )
{
if ( pSetKey->keyLength < CSR_KRK_KEY_LEN )
@@ -8446,14 +8446,14 @@
smsLog( pMac, LOGW, "Invalid KRK keylength [= %d] in SetContext call", pSetKey->keyLength );
break;
}
- vos_mem_copy(pSession->ccxCckmInfo.krk, pSetKey->Key,
+ vos_mem_copy(pSession->eseCckmInfo.krk, pSetKey->Key,
CSR_KRK_KEY_LEN);
- pSession->ccxCckmInfo.reassoc_req_num=1;
- pSession->ccxCckmInfo.krk_plumbed = eANI_BOOLEAN_TRUE;
+ pSession->eseCckmInfo.reassoc_req_num=1;
+ pSession->eseCckmInfo.krk_plumbed = eANI_BOOLEAN_TRUE;
status = eHAL_STATUS_SUCCESS;
break;
}
-#endif /* FEATURE_WLAN_CCX */
+#endif /* FEATURE_WLAN_ESE */
#ifdef WLAN_FEATURE_11W
//Check for 11w BIP
@@ -8486,12 +8486,12 @@
}
} while (0);
// Free the command if there has been a failure, or it is a
- // "local" operation like the set CCX CCKM KRK key.
+ // "local" operation like the set ESE CCKM KRK key.
if ( ( NULL != pCommand ) &&
( (!HAL_STATUS_SUCCESS( status ) )
-#ifdef FEATURE_WLAN_CCX
+#ifdef FEATURE_WLAN_ESE
|| ( eCSR_ENCRYPT_TYPE_KRK == pSetKey->encType )
-#endif /* FEATURE_WLAN_CCX */
+#endif /* FEATURE_WLAN_ESE */
) )
{
csrReleaseCommandSetKey( pMac, pCommand );
@@ -8994,7 +8994,7 @@
}
return;
}
-#if defined WLAN_FEATURE_VOWIFI_11R || defined FEATURE_WLAN_CCX || defined(FEATURE_WLAN_LFR)
+#if defined WLAN_FEATURE_VOWIFI_11R || defined FEATURE_WLAN_ESE || defined(FEATURE_WLAN_LFR)
void csrRoamRssiRspProcessor(tpAniSirGlobal pMac, void* pMsg)
{
tAniGetRoamRssiRsp* pRoamRssiRsp = (tAniGetRoamRssiRsp*)pMsg;
@@ -9032,7 +9032,7 @@
#endif
-#if defined(FEATURE_WLAN_CCX) && defined(FEATURE_WLAN_CCX_UPLOAD)
+#if defined(FEATURE_WLAN_ESE) && defined(FEATURE_WLAN_ESE_UPLOAD)
void csrTsmStatsRspProcessor(tpAniSirGlobal pMac, void* pMsg)
{
tAniGetTsmStatsRsp* pTsmStatsRsp = (tAniGetTsmStatsRsp*)pMsg;
@@ -9071,7 +9071,7 @@
return;
}
-void csrSendCcxAdjacentApRepInd(tpAniSirGlobal pMac, tCsrRoamSession *pSession)
+void csrSendEseAdjacentApRepInd(tpAniSirGlobal pMac, tCsrRoamSession *pSession)
{
tANI_U32 roamTS2 = 0;
tCsrRoamInfo roamInfo;
@@ -9096,11 +9096,11 @@
smsLog(pMac, LOGE, FL("session %d not found"), sessionId);
return;
}
- pSessionEntry->ccxContext.tsm.tsmMetrics.RoamingDly = roamInfo.tsmRoamDelay;
+ pSessionEntry->eseContext.tsm.tsmMetrics.RoamingDly = roamInfo.tsmRoamDelay;
csrRoamCallCallback(pMac, pSession->sessionId, &roamInfo,
- 0, eCSR_ROAM_CCX_ADJ_AP_REPORT_IND, 0);
+ 0, eCSR_ROAM_ESE_ADJ_AP_REPORT_IND, 0);
}
-#endif /* FEATURE_WLAN_CCX && FEATURE_WLAN_CCX_UPLOAD */
+#endif /* FEATURE_WLAN_ESE && FEATURE_WLAN_ESE_UPLOAD */
static void csrRoamRssiIndHdlr(tpAniSirGlobal pMac, void* pMsg)
{
@@ -9281,15 +9281,15 @@
// If we are in neighbor preauth done state then on receiving
// disassoc or deauth we dont roam instead we just disassoc
// from current ap and then go to disconnected state
- // This happens for CCX and 11r FT connections ONLY.
+ // This happens for ESE and 11r FT connections ONLY.
#ifdef WLAN_FEATURE_VOWIFI_11R
if (csrRoamIs11rAssoc(pMac) && (csrNeighborRoamStatePreauthDone(pMac)))
{
csrNeighborRoamTranistionPreauthDoneToDisconnected(pMac);
}
#endif
-#ifdef FEATURE_WLAN_CCX
- if (csrRoamIsCCXAssoc(pMac) && (csrNeighborRoamStatePreauthDone(pMac)))
+#ifdef FEATURE_WLAN_ESE
+ if (csrRoamIsESEAssoc(pMac) && (csrNeighborRoamStatePreauthDone(pMac)))
{
csrNeighborRoamTranistionPreauthDoneToDisconnected(pMac);
}
@@ -9370,15 +9370,15 @@
// If we are in neighbor preauth done state then on receiving
// disassoc or deauth we dont roam instead we just disassoc
// from current ap and then go to disconnected state
- // This happens for CCX and 11r FT connections ONLY.
+ // This happens for ESE and 11r FT connections ONLY.
#ifdef WLAN_FEATURE_VOWIFI_11R
if (csrRoamIs11rAssoc(pMac) && (csrNeighborRoamStatePreauthDone(pMac)))
{
csrNeighborRoamTranistionPreauthDoneToDisconnected(pMac);
}
#endif
-#ifdef FEATURE_WLAN_CCX
- if (csrRoamIsCCXAssoc(pMac) && (csrNeighborRoamStatePreauthDone(pMac)))
+#ifdef FEATURE_WLAN_ESE
+ if (csrRoamIsESEAssoc(pMac) && (csrNeighborRoamStatePreauthDone(pMac)))
{
csrNeighborRoamTranistionPreauthDoneToDisconnected(pMac);
}
@@ -9975,16 +9975,16 @@
// Indicate SME_QOS that the SET_KEY is completed, so that SME_QOS
// can go ahead and initiate the TSPEC if any are pending
sme_QosCsrEventInd(pMac, (v_U8_t)sessionId, SME_QOS_CSR_SET_KEY_SUCCESS_IND, NULL);
-#ifdef FEATURE_WLAN_CCX
+#ifdef FEATURE_WLAN_ESE
//Send Adjacent AP repot to new AP.
if (result == eCSR_ROAM_RESULT_AUTHENTICATED &&
pSession->isPrevApInfoValid &&
- pSession->connectedProfile.isCCXAssoc)
+ pSession->connectedProfile.isESEAssoc)
{
-#ifdef FEATURE_WLAN_CCX_UPLOAD
- csrSendCcxAdjacentApRepInd(pMac, pSession);
+#ifdef FEATURE_WLAN_ESE_UPLOAD
+ csrSendEseAdjacentApRepInd(pMac, pSession);
#else
- csrCcxSendAdjacentApRepMsg(pMac, pSession);
+ csrEseSendAdjacentApRepMsg(pMac, pSession);
#endif
pSession->isPrevApInfoValid = FALSE;
}
@@ -10081,18 +10081,18 @@
smsLog( pMac, LOG2, FL("Stats rsp from PE"));
csrRoamStatsRspProcessor( pMac, pSirMsg );
break;
-#if defined WLAN_FEATURE_VOWIFI_11R || defined FEATURE_WLAN_CCX || defined(FEATURE_WLAN_LFR)
+#if defined WLAN_FEATURE_VOWIFI_11R || defined FEATURE_WLAN_ESE || defined(FEATURE_WLAN_LFR)
case eWNI_SME_GET_ROAM_RSSI_RSP:
smsLog( pMac, LOG2, FL("Stats rsp from PE"));
csrRoamRssiRspProcessor( pMac, pSirMsg );
break;
#endif
-#if defined(FEATURE_WLAN_CCX) && defined(FEATURE_WLAN_CCX_UPLOAD)
+#if defined(FEATURE_WLAN_ESE) && defined(FEATURE_WLAN_ESE_UPLOAD)
case eWNI_SME_GET_TSM_STATS_RSP:
smsLog( pMac, LOG2, FL("TSM Stats rsp from PE"));
csrTsmStatsRspProcessor( pMac, pSirMsg );
break;
-#endif /* FEATURE_WLAN_CCX && FEATURE_WLAN_CCX_UPLOAD */
+#endif /* FEATURE_WLAN_ESE && FEATURE_WLAN_ESE_UPLOAD */
case eWNI_SME_GET_RSSI_REQ:
smsLog( pMac, LOG2, FL("GetRssiReq from self"));
csrUpdateRssi( pMac, pSirMsg );
@@ -12705,7 +12705,7 @@
*(pBuf + 1) = 0;
pBuf += 2;
}
-#ifdef FEATURE_WLAN_CCX
+#ifdef FEATURE_WLAN_ESE
if( eWNI_SME_JOIN_REQ == messageType )
{
// Never include the cckmIE in an Join Request
@@ -12717,22 +12717,22 @@
else if(eWNI_SME_REASSOC_REQ == messageType )
{
// cckmIE
- if( csrIsProfileCCX( pProfile ) )
+ if( csrIsProfileESE( pProfile ) )
{
// Insert the CCKM IE into the join request
-#ifdef FEATURE_WLAN_CCX_UPLOAD
+#ifdef FEATURE_WLAN_ESE_UPLOAD
ieLen = pSession->suppCckmIeInfo.cckmIeLen;
vos_mem_copy((void *) (wpaRsnIE),
pSession->suppCckmIeInfo.cckmIe, ieLen);
#else
- ieLen = csrConstructCcxCckmIe( pMac,
+ ieLen = csrConstructEseCckmIe( pMac,
pSession,
pProfile,
pBssDescription,
pSession->pWpaRsnReqIE,
pSession->nWpaRsnReqIeLength,
(void *)( wpaRsnIE ) );
-#endif /* FEATURE_WLAN_CCX_UPLOAD */
+#endif /* FEATURE_WLAN_ESE_UPLOAD */
}
else
{
@@ -12757,7 +12757,7 @@
pBuf += 2;
}
}
-#endif /* FEATURE_WLAN_CCX */
+#endif /* FEATURE_WLAN_ESE */
// addIEScan
if (pProfile->nAddIEScanLength)
{
@@ -12860,9 +12860,9 @@
#ifdef WLAN_FEATURE_VOWIFI_11R
pProfile->MDID.mdiePresent = pBssDescription->mdiePresent;
if (csrIsProfile11r( pProfile )
-#ifdef FEATURE_WLAN_CCX
+#ifdef FEATURE_WLAN_ESE
&& !((pProfile->negotiatedAuthType == eCSR_AUTH_TYPE_OPEN_SYSTEM) &&
- (pIes->CCXVersion.present) && (pMac->roam.configParam.isCcxIniFeatureEnabled))
+ (pIes->ESEVersion.present) && (pMac->roam.configParam.isEseIniFeatureEnabled))
#endif
)
{
@@ -12879,10 +12879,10 @@
pBuf += sizeof(tAniBool);
}
#endif
-#ifdef FEATURE_WLAN_CCX
+#ifdef FEATURE_WLAN_ESE
- // isCCXFeatureIniEnabled
- if (TRUE == pMac->roam.configParam.isCcxIniFeatureEnabled)
+ // isESEFeatureIniEnabled
+ if (TRUE == pMac->roam.configParam.isEseIniFeatureEnabled)
{
dwTmp = pal_cpu_to_be32(TRUE);
vos_mem_copy(pBuf, &dwTmp, sizeof(tAniBool));
@@ -12895,14 +12895,14 @@
pBuf += sizeof(tAniBool);
}
- /* A profile can not be both CCX and 11R. But an 802.11R AP
- * may be advertising support for CCX as well. So if we are
- * associating Open or explicitly CCX then we will get CCX.
+ /* A profile can not be both ESE and 11R. But an 802.11R AP
+ * may be advertising support for ESE as well. So if we are
+ * associating Open or explicitly ESE then we will get ESE.
* If we are associating explictly 11R only then we will get
* 11R.
*/
- if ((csrIsProfileCCX(pProfile) ||
- ((pIes->CCXVersion.present)
+ if ((csrIsProfileESE(pProfile) ||
+ ((pIes->ESEVersion.present)
&& ((pProfile->negotiatedAuthType == eCSR_AUTH_TYPE_OPEN_SYSTEM)
|| (pProfile->negotiatedAuthType == eCSR_AUTH_TYPE_WPA)
|| (pProfile->negotiatedAuthType == eCSR_AUTH_TYPE_WPA_PSK)
@@ -12911,16 +12911,16 @@
|| (pProfile->negotiatedAuthType == eCSR_AUTH_TYPE_RSN_PSK_SHA256)
#endif
|| (pProfile->negotiatedAuthType == eCSR_AUTH_TYPE_RSN_PSK))))
- && (pMac->roam.configParam.isCcxIniFeatureEnabled))
+ && (pMac->roam.configParam.isEseIniFeatureEnabled))
{
- // isCCXconnection;
+ // isESEconnection;
dwTmp = pal_cpu_to_be32(TRUE);
vos_mem_copy(pBuf, &dwTmp, sizeof(tAniBool));
pBuf += sizeof(tAniBool);
}
else
{
- //isCCXconnection;
+ //isESEconnection;
dwTmp = pal_cpu_to_be32(FALSE);
vos_mem_copy(pBuf, &dwTmp, sizeof(tAniBool));
pBuf += sizeof(tAniBool);
@@ -12928,17 +12928,17 @@
if (eWNI_SME_JOIN_REQ == messageType)
{
- tCCXTspecInfo ccxTspec;
- // CCX-Tspec IEs in the ASSOC request is presently not supported
+ tESETspecInfo eseTspec;
+ // ESE-Tspec IEs in the ASSOC request is presently not supported
// so nullify the TSPEC parameters
- vos_mem_set(&ccxTspec, sizeof(tCCXTspecInfo), 0);
- vos_mem_copy(pBuf, &ccxTspec, sizeof(tCCXTspecInfo));
- pBuf += sizeof(tCCXTspecInfo);
+ vos_mem_set(&eseTspec, sizeof(tESETspecInfo), 0);
+ vos_mem_copy(pBuf, &eseTspec, sizeof(tESETspecInfo));
+ pBuf += sizeof(tESETspecInfo);
}
else if (eWNI_SME_REASSOC_REQ == messageType)
{
- if ((csrIsProfileCCX(pProfile) ||
- ((pIes->CCXVersion.present)
+ if ((csrIsProfileESE(pProfile) ||
+ ((pIes->ESEVersion.present)
&& ((pProfile->negotiatedAuthType == eCSR_AUTH_TYPE_OPEN_SYSTEM)
|| (pProfile->negotiatedAuthType == eCSR_AUTH_TYPE_WPA)
|| (pProfile->negotiatedAuthType == eCSR_AUTH_TYPE_WPA_PSK)
@@ -12947,33 +12947,33 @@
|| (pProfile->negotiatedAuthType == eCSR_AUTH_TYPE_RSN_PSK_SHA256)
#endif
|| (pProfile->negotiatedAuthType == eCSR_AUTH_TYPE_RSN_PSK))))
- && (pMac->roam.configParam.isCcxIniFeatureEnabled))
+ && (pMac->roam.configParam.isEseIniFeatureEnabled))
{
- tCCXTspecInfo ccxTspec;
- // CCX Tspec information
- vos_mem_set(&ccxTspec, sizeof(tCCXTspecInfo), 0);
- ccxTspec.numTspecs = sme_QosCCxRetrieveTspecInfo(pMac, sessionId, (tTspecInfo *) &ccxTspec.tspec[0]);
- *pBuf = ccxTspec.numTspecs;
+ tESETspecInfo eseTspec;
+ // ESE Tspec information
+ vos_mem_set(&eseTspec, sizeof(tESETspecInfo), 0);
+ eseTspec.numTspecs = sme_QosESERetrieveTspecInfo(pMac, sessionId, (tTspecInfo *) &eseTspec.tspec[0]);
+ *pBuf = eseTspec.numTspecs;
pBuf += sizeof(tANI_U8);
// Copy the TSPEC information only if present
- if (ccxTspec.numTspecs) {
- vos_mem_copy(pBuf, (void*)&ccxTspec.tspec[0],
- (ccxTspec.numTspecs*sizeof(tTspecInfo)));
+ if (eseTspec.numTspecs) {
+ vos_mem_copy(pBuf, (void*)&eseTspec.tspec[0],
+ (eseTspec.numTspecs*sizeof(tTspecInfo)));
}
- pBuf += sizeof(ccxTspec.tspec);
+ pBuf += sizeof(eseTspec.tspec);
}
else
{
- tCCXTspecInfo ccxTspec;
- // CCX-Tspec IEs in the ASSOC request is presently not supported
+ tESETspecInfo eseTspec;
+ // ESE-Tspec IEs in the ASSOC request is presently not supported
// so nullify the TSPEC parameters
- vos_mem_set(&ccxTspec, sizeof(tCCXTspecInfo), 0);
- vos_mem_copy(pBuf, &ccxTspec, sizeof(tCCXTspecInfo));
- pBuf += sizeof(tCCXTspecInfo);
+ vos_mem_set(&eseTspec, sizeof(tESETspecInfo), 0);
+ vos_mem_copy(pBuf, &eseTspec, sizeof(tESETspecInfo));
+ pBuf += sizeof(tESETspecInfo);
}
}
-#endif // FEATURE_WLAN_CCX
-#if defined WLAN_FEATURE_VOWIFI_11R || defined FEATURE_WLAN_CCX || defined(FEATURE_WLAN_LFR)
+#endif // FEATURE_WLAN_ESE
+#if defined WLAN_FEATURE_VOWIFI_11R || defined FEATURE_WLAN_ESE || defined(FEATURE_WLAN_LFR)
// Fill in isFastTransitionEnabled
if (pMac->roam.configParam.isFastTransitionEnabled
#ifdef FEATURE_WLAN_LFR
@@ -15179,7 +15179,7 @@
return status;
}
-#if defined WLAN_FEATURE_VOWIFI_11R || defined FEATURE_WLAN_CCX || defined(FEATURE_WLAN_LFR)
+#if defined WLAN_FEATURE_VOWIFI_11R || defined FEATURE_WLAN_ESE || defined(FEATURE_WLAN_LFR)
eHalStatus csrGetRoamRssi(tpAniSirGlobal pMac,
tCsrRssiCallback callback,
tANI_U8 staId, tCsrBssid bssId, void *pContext, void* pVosContext)
@@ -15213,7 +15213,7 @@
-#if defined(FEATURE_WLAN_CCX) && defined(FEATURE_WLAN_CCX_UPLOAD)
+#if defined(FEATURE_WLAN_ESE) && defined(FEATURE_WLAN_ESE_UPLOAD)
eHalStatus csrGetTsmStats(tpAniSirGlobal pMac,
tCsrTsmStatsCallback callback,
tANI_U8 staId,
@@ -15249,7 +15249,7 @@
}
return status;
}
-#endif /* FEATURE_WLAN_CCX && FEATURE_WLAN_CCX_UPLOAD */
+#endif /* FEATURE_WLAN_ESE && FEATURE_WLAN_ESE_UPLOAD */
/* ---------------------------------------------------------------------------
@@ -15926,16 +15926,16 @@
/* MAWC feature */
pRequestBuf->MAWCEnabled =
pMac->roam.configParam.MAWCEnabled;
-#ifdef FEATURE_WLAN_CCX
- pRequestBuf->IsCCXEnabled = pMac->roam.configParam.isCcxIniFeatureEnabled;
+#ifdef FEATURE_WLAN_ESE
+ pRequestBuf->IsESEEnabled = pMac->roam.configParam.isEseIniFeatureEnabled;
#endif
if (
-#ifdef FEATURE_WLAN_CCX
- ((pNeighborRoamInfo->isCCXAssoc) &&
+#ifdef FEATURE_WLAN_ESE
+ ((pNeighborRoamInfo->isESEAssoc) &&
(pNeighborRoamInfo->roamChannelInfo.IAPPNeighborListReceived ==
eANI_BOOLEAN_FALSE)) ||
- (pNeighborRoamInfo->isCCXAssoc == eANI_BOOLEAN_FALSE) ||
-#endif // CCX
+ (pNeighborRoamInfo->isESEAssoc == eANI_BOOLEAN_FALSE) ||
+#endif // ESE
currChannelListInfo->numOfChannels == 0)
{
@@ -15998,12 +15998,12 @@
}
}
}
-#ifdef FEATURE_WLAN_CCX
+#ifdef FEATURE_WLAN_ESE
else
{
- /* If CCX is enabled, and a neighbor Report is received,then
+ /* If ESE is enabled, and a neighbor Report is received,then
* Ignore the INI Channels or the Occupied Channel List. Consider
- * the channels in the neighbor list sent by the CCX AP.*/
+ * the channels in the neighbor list sent by the ESE AP.*/
if (currChannelListInfo->numOfChannels != 0)
{
ChannelList = currChannelListInfo->ChannelList;
@@ -16912,7 +16912,7 @@
{
tpAniSirGlobal pMac = PMAC_STRUCT( hHal );
eHalStatus status = eHAL_STATUS_SUCCESS;
-#if defined(FEATURE_WLAN_LFR) || defined(FEATURE_WLAN_CCX) || defined(FEATURE_WLAN_CCX_UPLOAD)
+#if defined(FEATURE_WLAN_LFR) || defined(FEATURE_WLAN_ESE) || defined(FEATURE_WLAN_ESE_UPLOAD)
tCsrRoamInfo roamInfo;
#endif
@@ -16955,8 +16955,8 @@
csrRoamCallCallback(pMac, pFTPreAuthRsp->smeSessionId, NULL, 0,
eCSR_ROAM_FT_RESPONSE, eCSR_ROAM_RESULT_NONE);
-#if defined(FEATURE_WLAN_CCX) && defined(FEATURE_WLAN_CCX_UPLOAD)
- if (csrRoamIsCCXAssoc(pMac))
+#if defined(FEATURE_WLAN_ESE) && defined(FEATURE_WLAN_ESE_UPLOAD)
+ if (csrRoamIsESEAssoc(pMac))
{
/* read TSF */
csrRoamReadTSF(pMac, (tANI_U8 *)roamInfo.timestamp);
@@ -16965,7 +16965,7 @@
vos_mem_copy((void *)&roamInfo.bssid, (void *)pFTPreAuthRsp->preAuthbssId, sizeof(tCsrBssid));
csrRoamCallCallback(pMac, pFTPreAuthRsp->smeSessionId, &roamInfo, 0, eCSR_ROAM_CCKM_PREAUTH_NOTIFY, 0);
}
-#endif /* FEATURE_WLAN_CCX && FEATURE_WLAN_CCX_UPLOAD */
+#endif /* FEATURE_WLAN_ESE && FEATURE_WLAN_ESE_UPLOAD */
#ifdef FEATURE_WLAN_LFR
// If Legacy Fast Roaming is enabled, signal the supplicant
// So he can send us a PMK-ID for this candidate AP.
@@ -17229,7 +17229,81 @@
}
#endif /* WLAN_FEATURE_ROAM_SCAN_OFFLOAD */
-#if defined(FEATURE_WLAN_CCX) && defined(FEATURE_WLAN_CCX_UPLOAD)
+#if defined WLAN_FEATURE_RELIABLE_MCAST
+eHalStatus csrEnableRMC(tpAniSirGlobal pMac, tANI_U32 sessionId)
+{
+ tSirSetRMCReq *pMsg = NULL;
+ eHalStatus status = eHAL_STATUS_SUCCESS;
+ tCsrRoamSession *pSession = CSR_GET_SESSION(pMac, sessionId);
+
+ if (!pSession)
+ {
+ smsLog(pMac, LOGE, FL(" session %d not found "), sessionId);
+ return eHAL_STATUS_FAILURE;
+ }
+
+ pMsg = vos_mem_malloc(sizeof(tSirSetRMCReq));
+ if (NULL != pMsg)
+ {
+ vos_mem_set((void *)pMsg, sizeof(tSirSetRMCReq), 0);
+ pMsg->msgType = eWNI_SME_ENABLE_RMC_REQ;
+ pMsg->msgLen = sizeof(tSirSetRMCReq);
+ vos_mem_copy((v_U8_t *)pMsg->mcastTransmitter,
+ &pSession->selfMacAddr, sizeof(tSirMacAddr));
+
+ status = palSendMBMessage(pMac->hHdd, pMsg);
+ if (!HAL_STATUS_SUCCESS(status))
+ {
+ smsLog(pMac, LOGE, FL(" csr enable RMC Post MSG Fail %d "), status);
+ //pMsg is freed by palSendMBMessage
+ }
+ }
+ else
+ {
+ return eHAL_STATUS_FAILURE;
+ }
+ return status;
+}
+
+eHalStatus csrDisableRMC(tpAniSirGlobal pMac, tANI_U32 sessionId)
+{
+ tSirSetRMCReq *pMsg = NULL;
+ eHalStatus status = eHAL_STATUS_SUCCESS;
+ tCsrRoamSession *pSession = CSR_GET_SESSION(pMac, sessionId);
+
+ if (!pSession)
+ {
+ smsLog(pMac, LOGE, FL(" session %d not found "), sessionId);
+ return eHAL_STATUS_FAILURE;
+ }
+
+ pMsg = vos_mem_malloc(sizeof(tSirSetRMCReq));
+ if (NULL != pMsg)
+ {
+ vos_mem_set((void *)pMsg, sizeof(tSirSetRMCReq), 0);
+ pMsg->msgType = eWNI_SME_DISABLE_RMC_REQ;
+ pMsg->msgLen = sizeof(tSirSetRMCReq);
+ vos_mem_copy((v_U8_t *)pMsg->mcastTransmitter,
+ &pSession->selfMacAddr, sizeof(tSirMacAddr));
+
+ status = palSendMBMessage(pMac->hHdd, pMsg);
+ if (!HAL_STATUS_SUCCESS(status))
+ {
+ smsLog(pMac, LOGE, FL(" csr disable RMC Post MSG Fail %d "), status);
+ //pMsg is freed by palSendMBMessage
+ }
+ }
+ else
+ {
+ return eHAL_STATUS_FAILURE;
+ }
+ return status;
+}
+
+#endif /* defined WLAN_FEATURE_RELIABLE_MCAST */
+
+
+#if defined(FEATURE_WLAN_ESE) && defined(FEATURE_WLAN_ESE_UPLOAD)
/* ---------------------------------------------------------------------------
\fn csrSetCCKMIe
\brief This function stores the CCKM IE passed by the supplicant in a place holder
@@ -17291,5 +17365,5 @@
return status;
}
-#endif /*FEATURE_WLAN_CCX && FEATURE_WLAN_CCX_UPLOAD */
+#endif /*FEATURE_WLAN_ESE && FEATURE_WLAN_ESE_UPLOAD */
diff --git a/CORE/SME/src/csr/csrApiScan.c b/CORE/SME/src/csr/csrApiScan.c
index 5e483a0..f73a4bc 100644
--- a/CORE/SME/src/csr/csrApiScan.c
+++ b/CORE/SME/src/csr/csrApiScan.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012-2013 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2012-2014 The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
@@ -1963,7 +1963,7 @@
static tANI_U32 csrGetBssCapValue(tpAniSirGlobal pMac, tSirBssDescription *pBssDesc, tDot11fBeaconIEs *pIes)
{
tANI_U32 ret = CSR_BSS_CAP_VALUE_NONE;
-#if defined (WLAN_FEATURE_VOWIFI_11R) || defined (FEATURE_WLAN_CCX) || defined(FEATURE_WLAN_LFR)
+#if defined (WLAN_FEATURE_VOWIFI_11R) || defined (FEATURE_WLAN_ESE) || defined(FEATURE_WLAN_LFR)
if(CSR_IS_ROAM_PREFER_5GHZ(pMac))
{
if((pBssDesc) && CSR_IS_CHANNEL_5GHZ(pBssDesc->channelId))
@@ -8330,7 +8330,7 @@
return status;
}
-#ifdef FEATURE_WLAN_CCX
+#ifdef FEATURE_WLAN_ESE
// Update the TSF with the difference in system time
void UpdateCCKMTSF(tANI_U32 *timeStamp0, tANI_U32 *timeStamp1, tANI_U32 *incr)
{
diff --git a/CORE/SME/src/csr/csrInsideApi.h b/CORE/SME/src/csr/csrInsideApi.h
index d661980..ba77e4e 100644
--- a/CORE/SME/src/csr/csrInsideApi.h
+++ b/CORE/SME/src/csr/csrInsideApi.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012-2013 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2012-2014 The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
@@ -99,7 +99,7 @@
#define CSR_BSS_CAP_VALUE_HT 2
#define CSR_BSS_CAP_VALUE_WMM 1
#define CSR_BSS_CAP_VALUE_UAPSD 1
-#if defined (WLAN_FEATURE_VOWIFI_11R) || defined (FEATURE_WLAN_CCX) || defined(FEATURE_WLAN_LFR)
+#if defined (WLAN_FEATURE_VOWIFI_11R) || defined (FEATURE_WLAN_ESE) || defined(FEATURE_WLAN_LFR)
#define CSR_BSS_CAP_VALUE_5GHZ 1
#endif
#define CSR_DEFAULT_ROAMING_TIME 10 //10 seconds
@@ -954,11 +954,11 @@
void csrRoamFTPreAuthRspProcessor( tHalHandle hHal, tpSirFTPreAuthRsp pFTPreAuthRsp );
#endif
-#if defined(FEATURE_WLAN_CCX) && !defined(FEATURE_WLAN_CCX_UPLOAD)
-void csrCcxSendAdjacentApRepMsg(tpAniSirGlobal pMac, tCsrRoamSession *pSession);
+#if defined(FEATURE_WLAN_ESE) && !defined(FEATURE_WLAN_ESE_UPLOAD)
+void csrEseSendAdjacentApRepMsg(tpAniSirGlobal pMac, tCsrRoamSession *pSession);
#endif
-#if defined(FEATURE_WLAN_CCX)
+#if defined(FEATURE_WLAN_ESE)
void UpdateCCKMTSF(tANI_U32 *timeStamp0, tANI_U32 *timeStamp1, tANI_U32 *incr);
#endif
diff --git a/CORE/SME/src/csr/csrNeighborRoam.c b/CORE/SME/src/csr/csrNeighborRoam.c
index f708ca0..612f35d 100644
--- a/CORE/SME/src/csr/csrNeighborRoam.c
+++ b/CORE/SME/src/csr/csrNeighborRoam.c
@@ -69,8 +69,8 @@
#include "sme_Api.h"
#include "csrNeighborRoam.h"
#include "macTrace.h"
-#if defined(FEATURE_WLAN_CCX) && !defined(FEATURE_WLAN_CCX_UPLOAD)
-#include "csrCcx.h"
+#if defined(FEATURE_WLAN_ESE) && !defined(FEATURE_WLAN_ESE_UPLOAD)
+#include "csrEse.h"
#endif
#define WLAN_FEATURE_NEIGHBOR_ROAMING_DEBUG 1
@@ -280,8 +280,8 @@
else
#endif
-#ifdef FEATURE_WLAN_CCX
- if ((pNeighborRoamInfo->isCCXAssoc)
+#ifdef FEATURE_WLAN_ESE
+ if ((pNeighborRoamInfo->isESEAssoc)
#ifdef WLAN_FEATURE_ROAM_SCAN_OFFLOAD
&& !csrRoamIsRoamOffloadScanEnabled(pMac)
#endif
@@ -293,10 +293,8 @@
}
else
{
- smsLog(pMac, LOGE, FL("CCX Reassoc indication received in"
- "unexpected state %s"),
- macTraceGetNeighbourRoamState(
- pNeighborRoamInfo->neighborRoamState));
+ smsLog(pMac, LOGE, FL("ESE Reassoc indication received in unexpected state %s"),
+ macTraceGetNeighbourRoamState(pNeighborRoamInfo->neighborRoamState));
VOS_ASSERT(0);
}
}
@@ -407,15 +405,15 @@
return vosStatus;
}
-#ifdef FEATURE_WLAN_CCX
-VOS_STATUS csrNeighborRoamUpdateCcxModeEnabled(tpAniSirGlobal pMac, const v_BOOL_t ccxMode)
+#ifdef FEATURE_WLAN_ESE
+VOS_STATUS csrNeighborRoamUpdateEseModeEnabled(tpAniSirGlobal pMac, const v_BOOL_t eseMode)
{
tpCsrNeighborRoamControlInfo pNeighborRoamInfo = &pMac->roam.neighborRoamInfo;
VOS_STATUS vosStatus = VOS_STATUS_SUCCESS;
if (eCSR_NEIGHBOR_ROAM_STATE_CONNECTED == pNeighborRoamInfo->neighborRoamState)
{
- if (VOS_TRUE == ccxMode)
+ if (VOS_TRUE == eseMode)
{
NEIGHBOR_ROAM_DEBUG(pMac, LOG2, FL("Registering neighbor lookup DOWN event with TL, RSSI = %d"),
pNeighborRoamInfo->currentNeighborLookupThreshold);
@@ -440,7 +438,7 @@
}
#endif
}
- else if (VOS_FALSE == ccxMode)
+ else if (VOS_FALSE == eseMode)
{
NEIGHBOR_ROAM_DEBUG(pMac, LOG2, FL("Currently in CONNECTED state, so deregister all events"));
/* De-register existing lookup UP/DOWN, Rssi indications */
@@ -644,7 +642,7 @@
{
tpCsrNeighborRoamControlInfo pNeighborRoamInfo = &pMac->roam.neighborRoamInfo;
-#if defined (WLAN_FEATURE_VOWIFI_11R) || defined (FEATURE_WLAN_CCX) || defined(FEATURE_WLAN_LFR)
+#if defined (WLAN_FEATURE_VOWIFI_11R) || defined (FEATURE_WLAN_ESE) || defined(FEATURE_WLAN_LFR)
pNeighborRoamInfo->is11rAssoc = eANI_BOOLEAN_FALSE;
/* Purge pre-auth fail list */
csrNeighborRoamPurgePreauthFailedList(pMac);
@@ -781,8 +779,8 @@
vos_mem_set(pNeighborRoamInfo->currAPbssid, sizeof(tCsrBssid), 0);
pNeighborRoamInfo->neighborScanTimerInfo.pMac = pMac;
pNeighborRoamInfo->neighborScanTimerInfo.sessionId = CSR_SESSION_ID_INVALID;
-#ifdef FEATURE_WLAN_CCX
- pNeighborRoamInfo->isCCXAssoc = eANI_BOOLEAN_FALSE;
+#ifdef FEATURE_WLAN_ESE
+ pNeighborRoamInfo->isESEAssoc = eANI_BOOLEAN_FALSE;
pNeighborRoamInfo->isVOAdmitted = eANI_BOOLEAN_FALSE;
pNeighborRoamInfo->MinQBssLoadRequired = 0;
#endif
@@ -1426,7 +1424,7 @@
tpCsrNeighborRoamBSSInfo pBssInfo;
tANI_U32 CurrAPRssi;
tANI_U8 RoamRssiDiff = pMac->roam.configParam.RoamRssiDiff;
-#if defined (WLAN_FEATURE_VOWIFI_11R) || defined (FEATURE_WLAN_CCX) || defined(FEATURE_WLAN_LFR)
+#if defined (WLAN_FEATURE_VOWIFI_11R) || defined (FEATURE_WLAN_ESE) || defined(FEATURE_WLAN_LFR)
tANI_U8 immediateRoamRssiDiff = pMac->roam.configParam.nImmediateRoamRssiDiff;
#endif
tANI_BOOLEAN roamNow = eANI_BOOLEAN_FALSE;
@@ -1546,12 +1544,12 @@
}
#endif /* WLAN_FEATURE_VOWIFI_11R */
-#ifdef FEATURE_WLAN_CCX
+#ifdef FEATURE_WLAN_ESE
#ifdef WLAN_FEATURE_ROAM_SCAN_OFFLOAD
if (!csrRoamIsRoamOffloadScanEnabled(pMac))
{
#endif
- if (pNeighborRoamInfo->isCCXAssoc)
+ if (pNeighborRoamInfo->isESEAssoc)
{
if (!csrNeighborRoamIsPreauthCandidate(pMac, pScanResult->BssDescriptor.bssId))
{
@@ -1589,7 +1587,7 @@
#ifdef WLAN_FEATURE_ROAM_SCAN_OFFLOAD
}
#endif
-#endif /* FEATURE_WLAN_CCX */
+#endif /* FEATURE_WLAN_ESE */
#ifdef FEATURE_WLAN_LFR
// If we are supporting legacy roaming, and
@@ -1641,7 +1639,7 @@
/* Just add to the end of the list as it is already sorted by RSSI */
csrLLInsertTail(&pNeighborRoamInfo->roamableAPList, &pBssInfo->List, LL_ACCESS_LOCK);
-#if defined (WLAN_FEATURE_VOWIFI_11R) || defined (FEATURE_WLAN_CCX) || defined(FEATURE_WLAN_LFR)
+#if defined (WLAN_FEATURE_VOWIFI_11R) || defined (FEATURE_WLAN_ESE) || defined(FEATURE_WLAN_LFR)
if ((eSME_ROAM_TRIGGER_SCAN == pNeighborRoamInfo->cfgRoamEn) ||
(eSME_ROAM_TRIGGER_FAST_ROAM == pNeighborRoamInfo->cfgRoamEn))
{
@@ -1903,7 +1901,7 @@
tANI_BOOLEAN roamNow = eANI_BOOLEAN_FALSE;
eHalStatus hstatus;
-#if defined (WLAN_FEATURE_VOWIFI_11R) || defined (FEATURE_WLAN_CCX) || defined(FEATURE_WLAN_LFR)
+#if defined (WLAN_FEATURE_VOWIFI_11R) || defined (FEATURE_WLAN_ESE) || defined(FEATURE_WLAN_LFR)
/* If the state is REPORT_SCAN, then this must be the scan after the REPORT_QUERY state. So, we
should use the BSSID filter made out of neighbor reports */
if ((eCSR_NEIGHBOR_ROAM_STATE_REPORT_SCAN == pNeighborRoamInfo->neighborRoamState)
@@ -1913,14 +1911,14 @@
)
{
hstatus = csrNeighborRoamBssIdScanFilter(pMac, &scanFilter);
- NEIGHBOR_ROAM_DEBUG(pMac, LOGW, FL("11R or CCX Association: Prepare scan filter status with neighbor AP = %d"), hstatus);
+ NEIGHBOR_ROAM_DEBUG(pMac, LOGW, FL("11R or ESE Association: Prepare scan filter status with neighbor AP = %d"), hstatus);
tempVal = 1;
}
else
#endif
{
hstatus = csrNeighborRoamPrepareScanProfileFilter(pMac, &scanFilter);
- NEIGHBOR_ROAM_DEBUG(pMac, LOGW, FL("11R/CCX/Other Association: Prepare scan to find neighbor AP filter status = %d"), hstatus);
+ NEIGHBOR_ROAM_DEBUG(pMac, LOGW, FL("11R/ESE/Other Association: Prepare scan to find neighbor AP filter status = %d"), hstatus);
}
if (eHAL_STATUS_SUCCESS != hstatus)
{
@@ -1967,10 +1965,10 @@
}
else
#endif
-#ifdef FEATURE_WLAN_CCX
+#ifdef FEATURE_WLAN_ESE
/* If this is a non-11r association, then we can register the reassoc callback here as we have some
APs in the roamable AP list */
- if (pNeighborRoamInfo->isCCXAssoc)
+ if (pNeighborRoamInfo->isESEAssoc)
{
/* Valid APs are found after scan. Now we can initiate pre-authentication */
CSR_NEIGHBOR_ROAM_STATE_TRANSITION(eCSR_NEIGHBOR_ROAM_STATE_REPORT_SCAN)
@@ -2701,7 +2699,7 @@
else
#endif
{
- NEIGHBOR_ROAM_DEBUG(pMac, LOGE, FL("Non 11R or CCX Association:empty scan refresh timer expired"));
+ NEIGHBOR_ROAM_DEBUG(pMac, LOGE, FL("Non 11R or ESE Association:empty scan refresh timer expired"));
vosStatus = csrNeighborRoamTransitToCFGChanScan(pMac);
if (VOS_STATUS_SUCCESS != vosStatus)
{
@@ -2767,7 +2765,7 @@
else
#endif
{
- NEIGHBOR_ROAM_DEBUG(pMac, LOGE, FL("Non 11R or CCX Association:results refresh timer expired"));
+ NEIGHBOR_ROAM_DEBUG(pMac, LOGE, FL("Non 11R or ESE Association:results refresh timer expired"));
vosStatus = csrNeighborRoamTransitToCFGChanScan(pMac);
if (VOS_STATUS_SUCCESS != vosStatus)
{
@@ -3407,11 +3405,11 @@
currChannelListInfo = &pNeighborRoamInfo->roamChannelInfo.currentChannelListInfo;
if (
-#ifdef FEATURE_WLAN_CCX
- ((pNeighborRoamInfo->isCCXAssoc) &&
+#ifdef FEATURE_WLAN_ESE
+ ((pNeighborRoamInfo->isESEAssoc) &&
(pNeighborRoamInfo->roamChannelInfo.IAPPNeighborListReceived == eANI_BOOLEAN_FALSE)) ||
- (pNeighborRoamInfo->isCCXAssoc == eANI_BOOLEAN_FALSE) ||
-#endif // CCX
+ (pNeighborRoamInfo->isESEAssoc == eANI_BOOLEAN_FALSE) ||
+#endif // ESE
currChannelListInfo->numOfChannels == 0)
{
smsLog(pMac, LOGW, FL("Building channel list to scan"));
@@ -3786,7 +3784,7 @@
else
#endif
{
- NEIGHBOR_ROAM_DEBUG(pMac, LOG2, FL("Non 11R or CCX Association:Neighbor Lookup Down event received in CONNECTED state"));
+ NEIGHBOR_ROAM_DEBUG(pMac, LOG2, FL("Non 11R or ESE Association:Neighbor Lookup Down event received in CONNECTED state"));
vosStatus = csrNeighborRoamTransitToCFGChanScan(pMac);
if (VOS_STATUS_SUCCESS != vosStatus)
@@ -3956,8 +3954,8 @@
}
}
-#ifdef FEATURE_WLAN_CCX
- if (pSession->connectedProfile.isCCXAssoc)
+#ifdef FEATURE_WLAN_ESE
+ if (pSession->connectedProfile.isESEAssoc)
{
vos_mem_copy(&pSession->prevApSSID, &pSession->connectedProfile.SSID,
sizeof(tSirMacSSid));
@@ -4097,7 +4095,7 @@
eHalStatus status = eHAL_STATUS_SUCCESS;
VOS_STATUS vstatus;
-#if defined (WLAN_FEATURE_VOWIFI_11R) || defined (FEATURE_WLAN_CCX) || defined(FEATURE_WLAN_LFR)
+#if defined (WLAN_FEATURE_VOWIFI_11R) || defined (FEATURE_WLAN_ESE) || defined(FEATURE_WLAN_LFR)
int init_ft_flag = FALSE;
#endif
@@ -4178,7 +4176,7 @@
#endif
-#if defined (WLAN_FEATURE_VOWIFI_11R) || defined (FEATURE_WLAN_CCX) || defined(FEATURE_WLAN_LFR)
+#if defined (WLAN_FEATURE_VOWIFI_11R) || defined (FEATURE_WLAN_ESE) || defined(FEATURE_WLAN_LFR)
/* Now we can clear the preauthDone that was saved as we are connected afresh */
csrNeighborRoamFreeRoamableBSSList(pMac, &pMac->roam.neighborRoamInfo.FTRoamInfo.preAuthDoneList);
#endif
@@ -4197,18 +4195,18 @@
NEIGHBOR_ROAM_DEBUG(pMac, LOG2, FL("11rAssoc is = %d"), pNeighborRoamInfo->is11rAssoc);
#endif
-#ifdef FEATURE_WLAN_CCX
+#ifdef FEATURE_WLAN_ESE
// Based on the auth scheme tell if we are 11r
- if (pMac->roam.roamSession[sessionId].connectedProfile.isCCXAssoc)
+ if (pMac->roam.roamSession[sessionId].connectedProfile.isESEAssoc)
{
if (pMac->roam.configParam.isFastTransitionEnabled)
init_ft_flag = TRUE;
- pNeighborRoamInfo->isCCXAssoc = eANI_BOOLEAN_TRUE;
+ pNeighborRoamInfo->isESEAssoc = eANI_BOOLEAN_TRUE;
}
else
- pNeighborRoamInfo->isCCXAssoc = eANI_BOOLEAN_FALSE;
- NEIGHBOR_ROAM_DEBUG(pMac, LOG2, FL("isCCXAssoc is = %d ft = %d"),
- pNeighborRoamInfo->isCCXAssoc, init_ft_flag);
+ pNeighborRoamInfo->isESEAssoc = eANI_BOOLEAN_FALSE;
+ NEIGHBOR_ROAM_DEBUG(pMac, LOG2, FL("isESEAssoc is = %d ft = %d"),
+ pNeighborRoamInfo->isESEAssoc, init_ft_flag);
#endif
@@ -4220,7 +4218,7 @@
}
#endif
-#if defined (WLAN_FEATURE_VOWIFI_11R) || defined (FEATURE_WLAN_CCX) || defined(FEATURE_WLAN_LFR)
+#if defined (WLAN_FEATURE_VOWIFI_11R) || defined (FEATURE_WLAN_ESE) || defined(FEATURE_WLAN_LFR)
if ( init_ft_flag == TRUE )
{
/* Initialize all the data structures needed for the 11r FT Preauth */
@@ -4711,8 +4709,8 @@
}
else
#endif
-#ifdef FEATURE_WLAN_CCX
- if (pNeighborRoamInfo->isCCXAssoc)
+#ifdef FEATURE_WLAN_ESE
+ if (pNeighborRoamInfo->isESEAssoc)
{
/* Always the BSS info in the head is the handoff candidate */
pBssNode = csrNeighborRoamGetRoamableAPListNextEntry(pMac, &pNeighborRoamInfo->FTRoamInfo.preAuthDoneList, NULL);
diff --git a/CORE/SME/src/csr/csrUtil.c b/CORE/SME/src/csr/csrUtil.c
index 5c64e46..b8ce0be 100644
--- a/CORE/SME/src/csr/csrUtil.c
+++ b/CORE/SME/src/csr/csrUtil.c
@@ -44,10 +44,10 @@
#include "smeQosInternal.h"
#include "wlan_qct_wda.h"
-#if defined(FEATURE_WLAN_CCX) && !defined(FEATURE_WLAN_CCX_UPLOAD)
+#if defined(FEATURE_WLAN_ESE) && !defined(FEATURE_WLAN_ESE_UPLOAD)
#include "vos_utils.h"
-#include "csrCcx.h"
-#endif /* FEATURE_WLAN_CCX && !FEATURE_WLAN_CCX_UPLOAD*/
+#include "csrEse.h"
+#endif /* FEATURE_WLAN_ESE && !FEATURE_WLAN_ESE_UPLOAD*/
tANI_U8 csrWpaOui[][ CSR_WPA_OUI_SIZE ] = {
{ 0x00, 0x50, 0xf2, 0x00 },
@@ -56,9 +56,9 @@
{ 0x00, 0x50, 0xf2, 0x03 },
{ 0x00, 0x50, 0xf2, 0x04 },
{ 0x00, 0x50, 0xf2, 0x05 },
-#ifdef FEATURE_WLAN_CCX
+#ifdef FEATURE_WLAN_ESE
{ 0x00, 0x40, 0x96, 0x00 }, // CCKM
-#endif /* FEATURE_WLAN_CCX */
+#endif /* FEATURE_WLAN_ESE */
};
tANI_U8 csrRSNOui[][ CSR_RSN_OUI_SIZE ] = {
@@ -2654,7 +2654,7 @@
case eCSR_AUTH_TYPE_WPA:
case eCSR_AUTH_TYPE_WPA_PSK:
case eCSR_AUTH_TYPE_WPA_NONE:
-#ifdef FEATURE_WLAN_CCX
+#ifdef FEATURE_WLAN_ESE
case eCSR_AUTH_TYPE_CCKM_WPA:
#endif
fWpaProfile = TRUE;
@@ -2696,7 +2696,7 @@
case eCSR_AUTH_TYPE_FT_RSN:
case eCSR_AUTH_TYPE_FT_RSN_PSK:
#endif
-#ifdef FEATURE_WLAN_CCX
+#ifdef FEATURE_WLAN_ESE
case eCSR_AUTH_TYPE_CCKM_RSN:
#endif
#ifdef WLAN_FEATURE_11W
@@ -3151,10 +3151,10 @@
#endif
-#ifdef FEATURE_WLAN_CCX
+#ifdef FEATURE_WLAN_ESE
-/* Function to return TRUE if the authtype is CCX */
-tANI_BOOLEAN csrIsAuthTypeCCX( eCsrAuthType AuthType )
+/* Function to return TRUE if the authtype is ESE */
+tANI_BOOLEAN csrIsAuthTypeESE( eCsrAuthType AuthType )
{
switch ( AuthType )
{
@@ -3168,10 +3168,10 @@
return FALSE;
}
-/* Function to return TRUE if the profile is CCX */
-tANI_BOOLEAN csrIsProfileCCX( tCsrRoamProfile *pProfile )
+/* Function to return TRUE if the profile is ESE */
+tANI_BOOLEAN csrIsProfileESE( tCsrRoamProfile *pProfile )
{
- return (csrIsAuthTypeCCX( pProfile->negotiatedAuthType ));
+ return (csrIsAuthTypeESE( pProfile->negotiatedAuthType ));
}
#endif
@@ -3395,21 +3395,21 @@
#endif
-#ifdef FEATURE_WLAN_CCX
+#ifdef FEATURE_WLAN_ESE
-/*
- * Function for CCX CCKM AKM Authentication. We match the CCKM AKM Authentication Key Management suite
+/*
+ * Function for ESE CCKM AKM Authentication. We match the CCKM AKM Authentication Key Management suite
* here. This matches for CCKM AKM Auth with the 802.1X exchange.
*
*/
-static tANI_BOOLEAN csrIsCcxCckmAuthRSN( tpAniSirGlobal pMac, tANI_U8 AllSuites[][CSR_RSN_OUI_SIZE],
+static tANI_BOOLEAN csrIsEseCckmAuthRSN( tpAniSirGlobal pMac, tANI_U8 AllSuites[][CSR_RSN_OUI_SIZE],
tANI_U8 cAllSuites,
tANI_U8 Oui[] )
{
return( csrIsOuiMatch( pMac, AllSuites, cAllSuites, csrRSNOui[06], Oui ) );
}
-static tANI_BOOLEAN csrIsCcxCckmAuthWpa( tpAniSirGlobal pMac, tANI_U8 AllSuites[][CSR_WPA_OUI_SIZE],
+static tANI_BOOLEAN csrIsEseCckmAuthWpa( tpAniSirGlobal pMac, tANI_U8 AllSuites[][CSR_WPA_OUI_SIZE],
tANI_U8 cAllSuites,
tANI_U8 Oui[] )
{
@@ -3632,9 +3632,9 @@
negAuthType = eCSR_AUTH_TYPE_FT_RSN_PSK;
}
#endif
-#ifdef FEATURE_WLAN_CCX
- /* CCX only supports 802.1X. No PSK. */
- if ( (negAuthType == eCSR_AUTH_TYPE_UNKNOWN) && csrIsCcxCckmAuthRSN( pMac, AuthSuites, cAuthSuites, Authentication ) )
+#ifdef FEATURE_WLAN_ESE
+ /* ESE only supports 802.1X. No PSK. */
+ if ( (negAuthType == eCSR_AUTH_TYPE_UNKNOWN) && csrIsEseCckmAuthRSN( pMac, AuthSuites, cAuthSuites, Authentication ) )
{
if (eCSR_AUTH_TYPE_CCKM_RSN == pAuthType->authType[i])
negAuthType = eCSR_AUTH_TYPE_CCKM_RSN;
@@ -4215,13 +4215,13 @@
if (eCSR_AUTH_TYPE_WPA_PSK == pAuthType->authType[i])
negAuthType = eCSR_AUTH_TYPE_WPA_PSK;
}
-#ifdef FEATURE_WLAN_CCX
- if ( (negAuthType == eCSR_AUTH_TYPE_UNKNOWN) && csrIsCcxCckmAuthWpa( pMac, pWpaIe->auth_suites, cAuthSuites, Authentication ) )
+#ifdef FEATURE_WLAN_ESE
+ if ( (negAuthType == eCSR_AUTH_TYPE_UNKNOWN) && csrIsEseCckmAuthWpa( pMac, pWpaIe->auth_suites, cAuthSuites, Authentication ) )
{
if (eCSR_AUTH_TYPE_CCKM_WPA == pAuthType->authType[i])
negAuthType = eCSR_AUTH_TYPE_CCKM_WPA;
}
-#endif /* FEATURE_WLAN_CCX */
+#endif /* FEATURE_WLAN_ESE */
// The 1st auth type in the APs WPA IE, to match stations connecting
// profiles auth type will cause us to exit this loop
diff --git a/CORE/SME/src/rrm/sme_rrm.c b/CORE/SME/src/rrm/sme_rrm.c
index 4d25ffd..5b4ece6 100644
--- a/CORE/SME/src/rrm/sme_rrm.c
+++ b/CORE/SME/src/rrm/sme_rrm.c
@@ -58,8 +58,8 @@
#include "rrmGlobal.h"
-#if defined(FEATURE_WLAN_CCX) && !defined(FEATURE_WLAN_CCX_UPLOAD)
-#include "csrCcx.h"
+#if defined(FEATURE_WLAN_ESE) && !defined(FEATURE_WLAN_ESE_UPLOAD)
+#include "csrEse.h"
#endif
/* Roam score for a neighbor AP will be calculated based on the below definitions.
@@ -75,7 +75,7 @@
#define RRM_ROAM_SCORE_NEIGHBOR_REPORT_CAPABILITY_IMMEDIATE_BA 3
#define RRM_ROAM_SCORE_NEIGHBOR_REPORT_MOBILITY_DOMAIN 30
-#ifdef FEATURE_WLAN_CCX
+#ifdef FEATURE_WLAN_ESE
#define RRM_ROAM_SCORE_NEIGHBOR_IAPP_LIST 30
#endif
/**---------------------------------------------------------------------------
@@ -145,12 +145,12 @@
/* Call the callback with the status received from caller */
if (callback)
callback(callbackContext, vosStatus);
-#if defined(FEATURE_WLAN_CCX) && !defined(FEATURE_WLAN_CCX_UPLOAD)
+#if defined(FEATURE_WLAN_ESE) && !defined(FEATURE_WLAN_ESE_UPLOAD)
// We came here with IAPP AP List
// Make sure we inform CSR of the neighbor list
- // for CCX Associations. First clear the cache.
+ // for ESE Associations. First clear the cache.
else
- if (csrNeighborRoamIsCCXAssoc(pMac))
+ if (csrNeighborRoamIsESEAssoc(pMac))
{
ProcessIAPPNeighborAPList(pMac);
}
@@ -282,10 +282,10 @@
return status;
}
-#if defined(FEATURE_WLAN_CCX_UPLOAD)
+#if defined(FEATURE_WLAN_ESE_UPLOAD)
/**---------------------------------------------------------------------------
- \brief sme_CcxSendBeaconReqScanResults()
+ \brief sme_EseSendBeaconReqScanResults()
This function sends up the scan results received as a part of
beacon request scanning.
@@ -302,7 +302,7 @@
\return - 0 for success, non zero for failure
--------------------------------------------------------------------------*/
-static eHalStatus sme_CcxSendBeaconReqScanResults(tpAniSirGlobal pMac,
+static eHalStatus sme_EseSendBeaconReqScanResults(tpAniSirGlobal pMac,
tANI_U32 sessionId,
tANI_U8 channel,
tCsrScanResultInfo **pResultArr,
@@ -319,9 +319,9 @@
tANI_U8 msgCounter = 0;
tpRrmSMEContext pSmeRrmContext = &pMac->rrm.rrmSmeContext;
tCsrRoamInfo roamInfo;
- tSirCcxBcnReportRsp bcnReport;
- tpSirCcxBcnReportRsp pBcnReport = &bcnReport;
- tpCsrCcxBeaconReqParams pCurMeasReqIe = NULL;
+ tSirEseBcnReportRsp bcnReport;
+ tpSirEseBcnReportRsp pBcnReport = &bcnReport;
+ tpCsrEseBeaconReqParams pCurMeasReqIe = NULL;
tANI_U8 i = 0;
if (NULL == pSmeRrmContext)
@@ -339,15 +339,15 @@
if (pResultArr)
pCurResult=pResultArr[bssCounter];
- vos_mem_zero(&bcnReport, sizeof(tSirCcxBcnReportRsp));
+ vos_mem_zero(&bcnReport, sizeof(tSirEseBcnReportRsp));
do
{
pCurMeasReqIe = NULL;
- for (i = 0; i < pSmeRrmContext->ccxBcnReqInfo.numBcnReqIe; i++)
+ for (i = 0; i < pSmeRrmContext->eseBcnReqInfo.numBcnReqIe; i++)
{
- if(pSmeRrmContext->ccxBcnReqInfo.bcnReq[i].channel == channel)
+ if(pSmeRrmContext->eseBcnReqInfo.bcnReq[i].channel == channel)
{
- pCurMeasReqIe = &pSmeRrmContext->ccxBcnReqInfo.bcnReq[i];
+ pCurMeasReqIe = &pSmeRrmContext->eseBcnReqInfo.bcnReq[i];
break;
}
}
@@ -376,7 +376,7 @@
vos_mem_copy(pBcnReport->bcnRepBssInfo[msgCounter].bcnReportFields.Bssid,
pBssDesc->bssId, sizeof(tSirMacAddr));
- fillIeStatus = sirFillBeaconMandatoryIEforCcxBcnReport(pMac,
+ fillIeStatus = sirFillBeaconMandatoryIEforEseBcnReport(pMac,
(tANI_U8 *)pBssDesc->ieFields,
ie_len,
&(pBcnReport->bcnRepBssInfo[msgCounter].pBuf),
@@ -425,9 +425,9 @@
" msgCounter(%d) bssCounter(%d) flag(%d)",
pBcnReport->numBss, msgCounter, bssCounter, pBcnReport->flag);
- roamInfo.pCcxBcnReportRsp = pBcnReport;
- csrRoamCallCallback(pMac, sessionId, &roamInfo,
- 0, eCSR_ROAM_CCX_BCN_REPORT_IND, 0);
+ roamInfo.pEseBcnReportRsp = pBcnReport;
+ status = csrRoamCallCallback(pMac, sessionId, &roamInfo,
+ 0, eCSR_ROAM_ESE_BCN_REPORT_IND, 0);
/* Free the memory allocated to IE */
for (i = 0; i < msgCounter; i++)
@@ -439,7 +439,7 @@
return status;
}
-#endif /* FEATURE_WLAN_CCX_UPLOAD */
+#endif /* FEATURE_WLAN_ESE_UPLOAD */
/**---------------------------------------------------------------------------
@@ -533,10 +533,10 @@
// so that PE can clean any context allocated.
if( measurementDone )
{
-#if defined(FEATURE_WLAN_CCX_UPLOAD)
- if (eRRM_MSG_SOURCE_CCX_UPLOAD == pSmeRrmContext->msgSource)
+#if defined(FEATURE_WLAN_ESE_UPLOAD)
+ if (eRRM_MSG_SOURCE_ESE_UPLOAD == pSmeRrmContext->msgSource)
{
- status = sme_CcxSendBeaconReqScanResults(pMac,
+ status = sme_EseSendBeaconReqScanResults(pMac,
sessionId,
chanList[0],
NULL,
@@ -544,7 +544,7 @@
0);
}
else
-#endif /*FEATURE_WLAN_CCX_UPLOAD*/
+#endif /*FEATURE_WLAN_ESE_UPLOAD*/
status = sme_RrmSendBeaconReportXmitInd( pMac, NULL, measurementDone, 0);
}
return status;
@@ -554,10 +554,10 @@
if( NULL == pScanResult && measurementDone )
{
-#if defined(FEATURE_WLAN_CCX_UPLOAD)
- if (eRRM_MSG_SOURCE_CCX_UPLOAD == pSmeRrmContext->msgSource)
+#if defined(FEATURE_WLAN_ESE_UPLOAD)
+ if (eRRM_MSG_SOURCE_ESE_UPLOAD == pSmeRrmContext->msgSource)
{
- status = sme_CcxSendBeaconReqScanResults(pMac,
+ status = sme_EseSendBeaconReqScanResults(pMac,
sessionId,
chanList[0],
NULL,
@@ -565,7 +565,7 @@
0);
}
else
-#endif /*FEATURE_WLAN_CCX_UPLOAD*/
+#endif /*FEATURE_WLAN_ESE_UPLOAD*/
status = sme_RrmSendBeaconReportXmitInd( pMac, NULL, measurementDone, 0 );
}
@@ -582,10 +582,10 @@
if (counter)
{
smsLog(pMac, LOG1, " Number of BSS Desc with RRM Scan %d ", counter);
-#if defined(FEATURE_WLAN_CCX_UPLOAD)
- if (eRRM_MSG_SOURCE_CCX_UPLOAD == pSmeRrmContext->msgSource)
+#if defined(FEATURE_WLAN_ESE_UPLOAD)
+ if (eRRM_MSG_SOURCE_ESE_UPLOAD == pSmeRrmContext->msgSource)
{
- status = sme_CcxSendBeaconReqScanResults(pMac,
+ status = sme_EseSendBeaconReqScanResults(pMac,
sessionId,
chanList[0],
pScanResultsArr,
@@ -593,7 +593,7 @@
counter);
}
else
-#endif /*FEATURE_WLAN_CCX_UPLOAD*/
+#endif /*FEATURE_WLAN_ESE_UPLOAD*/
status = sme_RrmSendBeaconReportXmitInd( pMac,
pScanResultsArr,
measurementDone,
@@ -891,8 +891,8 @@
pSmeRrmContext->randnIntvl = VOS_MAX( pBeaconReq->randomizationInterval, pSmeRrmContext->rrmConfig.maxRandnInterval );
pSmeRrmContext->currentIndex = 0;
pSmeRrmContext->msgSource = pBeaconReq->msgSource;
- vos_mem_copy((tANI_U8*)&pSmeRrmContext->measMode, (tANI_U8*)&pBeaconReq->fMeasurementtype, SIR_CCX_MAX_MEAS_IE_REQS);
- vos_mem_copy((tANI_U8*)&pSmeRrmContext->duration, (tANI_U8*)&pBeaconReq->measurementDuration, SIR_CCX_MAX_MEAS_IE_REQS);
+ vos_mem_copy((tANI_U8*)&pSmeRrmContext->measMode, (tANI_U8*)&pBeaconReq->fMeasurementtype, SIR_ESE_MAX_MEAS_IE_REQS);
+ vos_mem_copy((tANI_U8*)&pSmeRrmContext->duration, (tANI_U8*)&pBeaconReq->measurementDuration, SIR_ESE_MAX_MEAS_IE_REQS);
sme_RrmIssueScanReq( pMac );
@@ -1034,7 +1034,7 @@
}
}
}
-#ifdef FEATURE_WLAN_CCX
+#ifdef FEATURE_WLAN_ESE
// It has come in the report so its the best score
if (csrNeighborRoamIs11rAssoc(pMac) == FALSE)
{
@@ -1128,9 +1128,9 @@
tANI_U8 i = 0;
VOS_STATUS vosStatus = VOS_STATUS_SUCCESS;
-#ifdef FEATURE_WLAN_CCX
- // Clear the cache for CCX.
- if (csrNeighborRoamIsCCXAssoc(pMac))
+#ifdef FEATURE_WLAN_ESE
+ // Clear the cache for ESE.
+ if (csrNeighborRoamIsESEAssoc(pMac))
{
rrmLLPurgeNeighborCache(pMac,
&pMac->rrm.rrmSmeContext.neighborReportCache);
@@ -1524,8 +1524,8 @@
return pTempBssEntry;
}
-#if defined(FEATURE_WLAN_CCX) && !defined(FEATURE_WLAN_CCX_UPLOAD)
-void csrCcxSendAdjacentApRepMsg(tpAniSirGlobal pMac, tCsrRoamSession *pSession)
+#if defined(FEATURE_WLAN_ESE) && !defined(FEATURE_WLAN_ESE_UPLOAD)
+void csrEseSendAdjacentApRepMsg(tpAniSirGlobal pMac, tCsrRoamSession *pSession)
{
tpSirAdjacentApRepInd pAdjRep;
tANI_U16 length;
@@ -1543,7 +1543,7 @@
}
vos_mem_zero( pAdjRep, length );
- pAdjRep->messageType = eWNI_SME_CCX_ADJACENT_AP_REPORT;
+ pAdjRep->messageType = eWNI_SME_ESE_ADJACENT_AP_REPORT;
pAdjRep->length = length;
pAdjRep->channelNum = pSession->prevOpChannel;
vos_mem_copy( pAdjRep->bssid, &pSession->connectedProfile.bssid, sizeof(tSirMacAddr) );
@@ -1551,12 +1551,12 @@
vos_mem_copy( &pAdjRep->prevApSSID, &pSession->prevApSSID, sizeof(tSirMacSSid) );
roamTS2 = vos_timer_get_system_time();
pAdjRep->tsmRoamdelay = roamTS2 - pSession->roamTS1;
- pAdjRep->roamReason =SIR_CCX_ASSOC_REASON_UNSPECIFIED;
+ pAdjRep->roamReason =SIR_ESE_ASSOC_REASON_UNSPECIFIED;
pAdjRep->clientDissSecs =(pAdjRep->tsmRoamdelay/1000);
palSendMBMessage(pMac->hHdd, pAdjRep);
return;
}
-#endif /* FEATURE_WLAN_CCX */
+#endif /* FEATURE_WLAN_ESE */
#endif
diff --git a/CORE/SME/src/sme_common/sme_Api.c b/CORE/SME/src/sme_common/sme_Api.c
index 1148579..4d1e00e 100644
--- a/CORE/SME/src/sme_common/sme_Api.c
+++ b/CORE/SME/src/sme_common/sme_Api.c
@@ -1700,7 +1700,7 @@
}
#endif
-#if defined(FEATURE_WLAN_CCX) && defined(FEATURE_WLAN_CCX_UPLOAD)
+#if defined(FEATURE_WLAN_ESE) && defined(FEATURE_WLAN_ESE_UPLOAD)
/*------------------------------------------------------------------
*
* Handle the tsm ie indication from LIM and forward it to HDD.
@@ -1749,32 +1749,32 @@
}
/* ---------------------------------------------------------------------------
- \fn sme_SetCcxBeaconRequest
- \brief function to set CCX beacon request parameters
+ \fn sme_SetEseBeaconRequest
+ \brief function to set Ese beacon request parameters
\param hHal - HAL handle for device
\param sessionId - Session id
- \param pCcxBcnReq - pointer to CCX beacon request
+ \param pEseBcnReq - pointer to Ese beacon request
\- return Success or failure
-------------------------------------------------------------------------*/
-eHalStatus sme_SetCcxBeaconRequest(tHalHandle hHal, const tANI_U8 sessionId,
- const tCsrCcxBeaconReq* pCcxBcnReq)
+eHalStatus sme_SetEseBeaconRequest(tHalHandle hHal, const tANI_U8 sessionId,
+ const tCsrEseBeaconReq* pEseBcnReq)
{
eHalStatus status = eSIR_SUCCESS;
tpAniSirGlobal pMac = PMAC_STRUCT( hHal );
tpSirBeaconReportReqInd pSmeBcnReportReq = NULL;
- tCsrCcxBeaconReqParams *pBeaconReq = NULL;
+ tCsrEseBeaconReqParams *pBeaconReq = NULL;
tANI_U8 counter = 0;
tCsrRoamSession *pSession = CSR_GET_SESSION(pMac, sessionId);
tpRrmSMEContext pSmeRrmContext = &pMac->rrm.rrmSmeContext;
/* Store the info in RRM context */
- vos_mem_copy(&pSmeRrmContext->ccxBcnReqInfo, pCcxBcnReq, sizeof(tCsrCcxBeaconReq));
+ vos_mem_copy(&pSmeRrmContext->eseBcnReqInfo, pEseBcnReq, sizeof(tCsrEseBeaconReq));
//Prepare the request to send to SME.
pSmeBcnReportReq = vos_mem_malloc(sizeof( tSirBeaconReportReqInd ));
if(NULL == pSmeBcnReportReq)
{
- smsLog(pMac, LOGP, "Memory Allocation Failure!!! CCX BcnReq Ind to SME");
+ smsLog(pMac, LOGP, "Memory Allocation Failure!!! Ese BcnReq Ind to SME");
return eSIR_FAILURE;
}
@@ -1785,12 +1785,12 @@
pSmeBcnReportReq->length = sizeof( tSirBeaconReportReqInd );
vos_mem_copy( pSmeBcnReportReq->bssId, pSession->connectedProfile.bssid, sizeof(tSirMacAddr) );
pSmeBcnReportReq->channelInfo.channelNum = 255;
- pSmeBcnReportReq->channelList.numChannels = pCcxBcnReq->numBcnReqIe;
- pSmeBcnReportReq->msgSource = eRRM_MSG_SOURCE_CCX_UPLOAD;
+ pSmeBcnReportReq->channelList.numChannels = pEseBcnReq->numBcnReqIe;
+ pSmeBcnReportReq->msgSource = eRRM_MSG_SOURCE_ESE_UPLOAD;
- for (counter = 0; counter < pCcxBcnReq->numBcnReqIe; counter++)
+ for (counter = 0; counter < pEseBcnReq->numBcnReqIe; counter++)
{
- pBeaconReq = (tCsrCcxBeaconReqParams *)&pCcxBcnReq->bcnReq[counter];
+ pBeaconReq = (tCsrEseBeaconReqParams *)&pEseBcnReq->bcnReq[counter];
pSmeBcnReportReq->fMeasurementtype[counter] = pBeaconReq->scanMode;
pSmeBcnReportReq->measurementDuration[counter] = SYS_TU_TO_MS(pBeaconReq->measurementDuration);
pSmeBcnReportReq->channelList.channelNumber[counter] = pBeaconReq->channel;
@@ -1800,7 +1800,7 @@
return status;
}
-#endif /* FEATURE_WLAN_CCX && FEATURE_WLAN_CCX_UPLOAD */
+#endif /* FEATURE_WLAN_ESE && FEATURE_WLAN_ESE_UPLOAD */
/*--------------------------------------------------------------------------
@@ -2137,7 +2137,7 @@
}
break;
#endif
-#if defined(FEATURE_WLAN_CCX) && defined(FEATURE_WLAN_CCX_UPLOAD)
+#if defined(FEATURE_WLAN_ESE) && defined(FEATURE_WLAN_ESE_UPLOAD)
case eWNI_SME_TSM_IE_IND:
{
if (pMsg->bodyptr)
@@ -2151,7 +2151,7 @@
}
break;
}
-#endif /* FEATURE_WLAN_CCX && FEATURE_WLAN_CCX_UPLOAD */
+#endif /* FEATURE_WLAN_ESE && FEATURE_WLAN_ESE_UPLOAD */
#ifdef WLAN_FEATURE_ROAM_SCAN_OFFLOAD
case eWNI_SME_ROAM_SCAN_OFFLOAD_RSP:
status = csrRoamOffloadScanRspHdlr((void *)pMac, pMsg->bodyval);
@@ -4549,7 +4549,7 @@
}
return status;
}
-#if defined WLAN_FEATURE_VOWIFI_11R || defined FEATURE_WLAN_CCX || defined(FEATURE_WLAN_LFR)
+#if defined WLAN_FEATURE_VOWIFI_11R || defined FEATURE_WLAN_ESE || defined(FEATURE_WLAN_LFR)
/* ---------------------------------------------------------------------------
\fn sme_GetRoamRssi
\brief a wrapper function that client calls to register a callback to get Roam RSSI
@@ -4580,7 +4580,7 @@
#endif
-#if defined(FEATURE_WLAN_CCX) && defined(FEATURE_WLAN_CCX_UPLOAD)
+#if defined(FEATURE_WLAN_ESE) && defined(FEATURE_WLAN_ESE_UPLOAD)
/* ---------------------------------------------------------------------------
\fn sme_GetTsmStats
\brief a wrapper function that client calls to register a callback to get TSM Stats
@@ -8350,7 +8350,7 @@
csrApplyPower2Current(pMac); // Store the channel+power info in the global place: Cfg
}
-#if defined (WLAN_FEATURE_VOWIFI_11R) || defined (FEATURE_WLAN_CCX) || defined(FEATURE_WLAN_LFR)
+#if defined (WLAN_FEATURE_VOWIFI_11R) || defined (FEATURE_WLAN_ESE) || defined(FEATURE_WLAN_LFR)
/* ---------------------------------------------------------------------------
\fn sme_UpdateRoamPrefer5GHz
\brief enable/disable Roam prefer 5G runtime option
@@ -8709,7 +8709,7 @@
}
return status ;
}
-#endif /* (WLAN_FEATURE_VOWIFI_11R) || (FEATURE_WLAN_CCX) || (FEATURE_WLAN_LFR) */
+#endif /* (WLAN_FEATURE_VOWIFI_11R) || (FEATURE_WLAN_ESE) || (FEATURE_WLAN_LFR) */
#ifdef FEATURE_WLAN_LFR
/*--------------------------------------------------------------------------
@@ -8811,40 +8811,40 @@
#endif
#endif /* FEATURE_WLAN_LFR */
-#ifdef FEATURE_WLAN_CCX
+#ifdef FEATURE_WLAN_ESE
/*--------------------------------------------------------------------------
- \brief sme_UpdateIsCcxFeatureEnabled() - enable/disable CCX support at runtime
+ \brief sme_UpdateIsEseFeatureEnabled() - enable/disable Ese support at runtime
It is used at in the REG_DYNAMIC_VARIABLE macro definition of
- isCcxIniFeatureEnabled.
+ isEseIniFeatureEnabled.
This is a synchronous call
\param hHal - The handle returned by macOpen.
- \return eHAL_STATUS_SUCCESS - SME update isCcxIniFeatureEnabled config successfully.
- Other status means SME is failed to update isCcxIniFeatureEnabled.
+ \return eHAL_STATUS_SUCCESS - SME update isEseIniFeatureEnabled config successfully.
+ Other status means SME is failed to update isEseIniFeatureEnabled.
\sa
--------------------------------------------------------------------------*/
-eHalStatus sme_UpdateIsCcxFeatureEnabled(tHalHandle hHal,
- const v_BOOL_t isCcxIniFeatureEnabled)
+eHalStatus sme_UpdateIsEseFeatureEnabled(tHalHandle hHal,
+ const v_BOOL_t isEseIniFeatureEnabled)
{
tpAniSirGlobal pMac = PMAC_STRUCT( hHal );
- if (pMac->roam.configParam.isCcxIniFeatureEnabled == isCcxIniFeatureEnabled)
+ if (pMac->roam.configParam.isEseIniFeatureEnabled == isEseIniFeatureEnabled)
{
VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO,
- "%s: CCX Mode is already enabled or disabled, nothing to do (returning) old(%d) new(%d)", __func__,
- pMac->roam.configParam.isCcxIniFeatureEnabled,
- isCcxIniFeatureEnabled);
+ "%s: Ese Mode is already enabled or disabled, nothing to do (returning) old(%d) new(%d)", __func__,
+ pMac->roam.configParam.isEseIniFeatureEnabled,
+ isEseIniFeatureEnabled);
return eHAL_STATUS_SUCCESS;
}
VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO,
- "%s: CcxEnabled is changed from %d to %d", __func__,
- pMac->roam.configParam.isCcxIniFeatureEnabled,
- isCcxIniFeatureEnabled);
- pMac->roam.configParam.isCcxIniFeatureEnabled = isCcxIniFeatureEnabled;
- csrNeighborRoamUpdateCcxModeEnabled(pMac, isCcxIniFeatureEnabled);
+ "%s: EseEnabled is changed from %d to %d", __func__,
+ pMac->roam.configParam.isEseIniFeatureEnabled,
+ isEseIniFeatureEnabled);
+ pMac->roam.configParam.isEseIniFeatureEnabled = isEseIniFeatureEnabled;
+ csrNeighborRoamUpdateEseModeEnabled(pMac, isEseIniFeatureEnabled);
- if(TRUE == isCcxIniFeatureEnabled)
+ if(TRUE == isEseIniFeatureEnabled)
{
sme_UpdateFastTransitionEnabled(hHal, TRUE);
}
@@ -8852,12 +8852,12 @@
#ifdef WLAN_FEATURE_ROAM_SCAN_OFFLOAD
if (pMac->roam.configParam.isRoamOffloadScanEnabled)
{
- csrRoamOffloadScan(pMac, ROAM_SCAN_OFFLOAD_UPDATE_CFG, REASON_CCX_INI_CFG_CHANGED);
+ csrRoamOffloadScan(pMac, ROAM_SCAN_OFFLOAD_UPDATE_CFG, REASON_ESE_INI_CFG_CHANGED);
}
#endif
return eHAL_STATUS_SUCCESS;
}
-#endif /* FEATURE_WLAN_CCX */
+#endif /* FEATURE_WLAN_ESE */
/*--------------------------------------------------------------------------
\brief sme_UpdateConfigFwRssiMonitoring() - enable/disable firmware RSSI Monitoring at runtime
@@ -9265,7 +9265,7 @@
#endif
-#if defined (WLAN_FEATURE_VOWIFI_11R) || defined (FEATURE_WLAN_CCX) || defined(FEATURE_WLAN_LFR)
+#if defined (WLAN_FEATURE_VOWIFI_11R) || defined (FEATURE_WLAN_ESE) || defined(FEATURE_WLAN_LFR)
/*--------------------------------------------------------------------------
\brief sme_getRoamRssiDiff() - get Roam rssi diff
@@ -9341,16 +9341,16 @@
}
-#ifdef FEATURE_WLAN_CCX_UPLOAD
+#ifdef FEATURE_WLAN_ESE_UPLOAD
/*--------------------------------------------------------------------------
- \brief sme_SetCcxRoamScanChannelList() - set ccx roam scan channel list
+ \brief sme_SetEseRoamScanChannelList() - set ese roam scan channel list
This is a synchronuous call
\param hHal - The handle returned by macOpen.
\return eHAL_STATUS_SUCCESS - SME update config successful.
Other status means SME is failed to update
\sa
--------------------------------------------------------------------------*/
-eHalStatus sme_SetCcxRoamScanChannelList(tHalHandle hHal,
+eHalStatus sme_SetEseRoamScanChannelList(tHalHandle hHal,
tANI_U8 *pChannelList,
tANI_U8 numChannels)
{
@@ -9388,11 +9388,9 @@
}
VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_DEBUG,
- "CCX roam scan channel list successfully set to %s"
- " - old value is %s - roam state is %s",
- newChannelList, oldChannelList,
- macTraceGetNeighbourRoamState(
- pMac->roam.neighborRoamInfo.neighborRoamState));
+ "ESE roam scan channel list successfully set to %s - old value is %s - roam state is %s",
+ newChannelList, oldChannelList,
+ macTraceGetNeighbourRoamState(pMac->roam.neighborRoamInfo.neighborRoamState));
}
sme_ReleaseGlobalLock( &pMac->sme );
}
@@ -9448,18 +9446,18 @@
}
/*--------------------------------------------------------------------------
- \brief sme_getIsCcxFeatureEnabled() - get CCX feature enabled or not
+ \brief sme_getIsEseFeatureEnabled() - get Ese feature enabled or not
This is a synchronuous call
\param hHal - The handle returned by macOpen.
- \return TRUE (1) - if the CCX feature is enabled
+ \return TRUE (1) - if the Ese feature is enabled
FALSE (0) - if feature is disabled (compile or runtime)
\sa
--------------------------------------------------------------------------*/
-tANI_BOOLEAN sme_getIsCcxFeatureEnabled(tHalHandle hHal)
+tANI_BOOLEAN sme_getIsEseFeatureEnabled(tHalHandle hHal)
{
-#ifdef FEATURE_WLAN_CCX
+#ifdef FEATURE_WLAN_ESE
tpAniSirGlobal pMac = PMAC_STRUCT( hHal );
- return csrRoamIsCcxIniFeatureEnabled(pMac);
+ return csrRoamIsEseIniFeatureEnabled(pMac);
#else
return eANI_BOOLEAN_FALSE;
#endif