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/MAC/src/pe/lim/limSendManagementFrames.c b/CORE/MAC/src/pe/lim/limSendManagementFrames.c
index 1396daf..161c0ce 100644
--- a/CORE/MAC/src/pe/lim/limSendManagementFrames.c
+++ b/CORE/MAC/src/pe/lim/limSendManagementFrames.c
@@ -953,7 +953,7 @@
tANI_U32 nPayload, nBytes, nStatus;
tpSirMacMgmtHdr pMacHdr;
void *pPacket;
-#ifdef FEATURE_WLAN_CCX
+#ifdef FEATURE_WLAN_ESE
tANI_U32 phyMode;
#endif
eHalStatus halstatus;
@@ -1044,7 +1044,7 @@
WMMAddTSReq.StatusCode.statusCode = 0;
PopulateDot11fWMMTSPEC( &pAddTS->tspec, &WMMAddTSReq.WMMTSPEC );
-#ifdef FEATURE_WLAN_CCX
+#ifdef FEATURE_WLAN_ESE
limGetPhyMode(pMac, &phyMode, psessionEntry);
if( phyMode == WNI_CFG_PHY_MODE_11G || phyMode == WNI_CFG_PHY_MODE_11A)
@@ -1055,7 +1055,7 @@
{
pAddTS->tsrsIE.rates[0] = TSRS_11B_RATE_5_5MBPS;
}
- PopulateDot11TSRSIE(pMac,&pAddTS->tsrsIE, &WMMAddTSReq.CCXTrafStrmRateSet,sizeof(tANI_U8));
+ PopulateDot11TSRSIE(pMac,&pAddTS->tsrsIE, &WMMAddTSReq.ESETrafStrmRateSet,sizeof(tANI_U8));
#endif
// fillWmeTspecIE
@@ -2221,15 +2221,15 @@
}
#endif
-#ifdef FEATURE_WLAN_CCX
- /* For CCX Associations fill the CCX IEs */
- if (psessionEntry->isCCXconnection &&
- psessionEntry->pLimJoinReq->isCCXFeatureIniEnabled)
+#ifdef FEATURE_WLAN_ESE
+ /* For ESE Associations fill the ESE IEs */
+ if (psessionEntry->isESEconnection &&
+ psessionEntry->pLimJoinReq->isESEFeatureIniEnabled)
{
#ifndef FEATURE_DISABLE_RM
- PopulateDot11fCCXRadMgmtCap(&pFrm->CCXRadMgmtCap);
+ PopulateDot11fESERadMgmtCap(&pFrm->ESERadMgmtCap);
#endif
- PopulateDot11fCCXVersion(&pFrm->CCXVersion);
+ PopulateDot11fESEVersion(&pFrm->ESEVersion);
}
#endif
@@ -2389,7 +2389,7 @@
} // End limSendAssocReqMgmtFrame
-#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)
/*------------------------------------------------------------------------------------
*
* Send Reassoc Req with FTIEs.
@@ -2415,7 +2415,7 @@
tANI_U8 *pBody;
tANI_U16 nAddIELen;
tANI_U8 *pAddIE;
-#if defined FEATURE_WLAN_CCX || defined(FEATURE_WLAN_LFR)
+#if defined FEATURE_WLAN_ESE || defined(FEATURE_WLAN_LFR)
tANI_U8 *wpsIe = NULL;
#endif
tANI_U32 txFlag = 0;
@@ -2517,7 +2517,7 @@
// for rsnie and fties. Instead we just add
// the rsnie and fties at the end of the pack routine for 11r.
// This should ideally! be fixed.
-#if defined FEATURE_WLAN_CCX || defined(FEATURE_WLAN_LFR)
+#if defined FEATURE_WLAN_ESE || defined(FEATURE_WLAN_LFR)
//
// The join request *should* contain zero or one of the WPA and RSN
// IEs. The payload send along with the request is a
@@ -2553,27 +2553,27 @@
&frm.WPAOpaque );
}
-#ifdef FEATURE_WLAN_CCX
+#ifdef FEATURE_WLAN_ESE
if (psessionEntry->pLimReAssocReq->cckmIE.length)
{
- PopulateDot11fCCXCckmOpaque( pMac, &( psessionEntry->pLimReAssocReq->cckmIE ),
- &frm.CCXCckmOpaque );
+ PopulateDot11fESECckmOpaque( pMac, &( psessionEntry->pLimReAssocReq->cckmIE ),
+ &frm.ESECckmOpaque );
}
-#endif //FEATURE_WLAN_CCX
+#endif //FEATURE_WLAN_ESE
}
-#ifdef FEATURE_WLAN_CCX
- // For CCX Associations fill the CCX IEs
- if (psessionEntry->isCCXconnection &&
- psessionEntry->pLimReAssocReq->isCCXFeatureIniEnabled)
+#ifdef FEATURE_WLAN_ESE
+ // For ESE Associations fill the ESE IEs
+ if (psessionEntry->isESEconnection &&
+ psessionEntry->pLimReAssocReq->isESEFeatureIniEnabled)
{
#ifndef FEATURE_DISABLE_RM
- PopulateDot11fCCXRadMgmtCap(&frm.CCXRadMgmtCap);
+ PopulateDot11fESERadMgmtCap(&frm.ESERadMgmtCap);
#endif
- PopulateDot11fCCXVersion(&frm.CCXVersion);
+ PopulateDot11fESEVersion(&frm.ESEVersion);
}
-#endif //FEATURE_WLAN_CCX
-#endif //FEATURE_WLAN_CCX || FEATURE_WLAN_LFR
+#endif //FEATURE_WLAN_ESE
+#endif //FEATURE_WLAN_ESE || FEATURE_WLAN_LFR
// include WME EDCA IE as well
if ( fWmeEnabled )
@@ -2588,16 +2588,16 @@
{
PopulateDot11fWMMCaps( &frm.WMMCaps );
}
-#ifdef FEATURE_WLAN_CCX
- if (psessionEntry->isCCXconnection)
+#ifdef FEATURE_WLAN_ESE
+ if (psessionEntry->isESEconnection)
{
PopulateDot11fReAssocTspec(pMac, &frm, psessionEntry);
// Populate the TSRS IE if TSPEC is included in the reassoc request
- if (psessionEntry->pLimReAssocReq->ccxTspecInfo.numTspecs)
+ if (psessionEntry->pLimReAssocReq->eseTspecInfo.numTspecs)
{
tANI_U32 phyMode;
- tSirMacCCXTSRSIE tsrsIE;
+ tSirMacESETSRSIE tsrsIE;
limGetPhyMode(pMac, &phyMode, psessionEntry);
tsrsIE.tsid = 0;
@@ -2609,7 +2609,7 @@
{
tsrsIE.rates[0] = TSRS_11B_RATE_5_5MBPS;
}
- PopulateDot11TSRSIE(pMac,&tsrsIE, &frm.CCXTrafStrmRateSet, sizeof(tANI_U8));
+ PopulateDot11TSRSIE(pMac,&tsrsIE, &frm.ESETrafStrmRateSet, sizeof(tANI_U8));
}
}
#endif
@@ -2623,8 +2623,8 @@
#if defined WLAN_FEATURE_VOWIFI_11R
if ( psessionEntry->pLimReAssocReq->bssDescription.mdiePresent && (0 == pMac->ft.ftSmeContext.reassoc_ft_ies_length)
-#if defined FEATURE_WLAN_CCX
- && !psessionEntry->isCCXconnection
+#if defined FEATURE_WLAN_ESE
+ && !psessionEntry->isESEconnection
#endif
)
{
@@ -2687,7 +2687,7 @@
// Paranoia:
vos_mem_set( pFrame, nBytes + ft_ies_length, 0);
-#if defined WLAN_FEATURE_VOWIFI_11R_DEBUG || defined FEATURE_WLAN_CCX || defined(FEATURE_WLAN_LFR)
+#if defined WLAN_FEATURE_VOWIFI_11R_DEBUG || defined FEATURE_WLAN_ESE || defined(FEATURE_WLAN_LFR)
limPrintMacAddr(pMac, psessionEntry->limReAssocbssId, LOG1);
#endif
// Next, we fill out the buffer descriptor:
@@ -3480,7 +3480,7 @@
if( ( SIR_BAND_5_GHZ == limGetRFBand(psessionEntry->currentOperChannel))
|| ( psessionEntry->pePersona == VOS_P2P_CLIENT_MODE ) ||
( psessionEntry->pePersona == VOS_P2P_GO_MODE)
-#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)
|| ((NULL != pMac->ft.ftPEContext.pFTPreAuthReq)
&& ( SIR_BAND_5_GHZ == limGetRFBand(pMac->ft.ftPEContext.pFTPreAuthReq->preAuthchannelNum)))
#endif
@@ -3618,8 +3618,8 @@
#ifdef WLAN_FEATURE_VOWIFI_11R
if ( (psessionEntry->limSystemRole == eLIM_STA_ROLE ) &&
(
-#ifdef FEATURE_WLAN_CCX
- (psessionEntry->isCCXconnection ) ||
+#ifdef FEATURE_WLAN_ESE
+ (psessionEntry->isESEconnection ) ||
#endif
#ifdef FEATURE_WLAN_LFR
(psessionEntry->isFastRoamIniFeatureEnabled ) ||
@@ -3637,16 +3637,16 @@
{
PELOGE(limLog(pMac, LOGE,
FL("No FT Preauth Session Cleanup in role %d"
-#ifdef FEATURE_WLAN_CCX
- " isCCX %d"
+#ifdef FEATURE_WLAN_ESE
+ " isESE %d"
#endif
#ifdef FEATURE_WLAN_LFR
" isLFR %d"
#endif
" is11r %d reason %d"),
psessionEntry->limSystemRole,
-#ifdef FEATURE_WLAN_CCX
- psessionEntry->isCCXconnection,
+#ifdef FEATURE_WLAN_ESE
+ psessionEntry->isESEconnection,
#endif
#ifdef FEATURE_WLAN_LFR
psessionEntry->isFastRoamIniFeatureEnabled,