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/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 */