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/limApi.c b/CORE/MAC/src/pe/lim/limApi.c
index ce207db..6f9f465 100644
--- a/CORE/MAC/src/pe/lim/limApi.c
+++ b/CORE/MAC/src/pe/lim/limApi.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.
*
@@ -20,7 +20,7 @@
*/
/*
- * Copyright (c) 2012-2013 Qualcomm Atheros, Inc.
+ * Copyright (c) 2012-2014 Qualcomm Atheros, Inc.
* All Rights Reserved.
* Qualcomm Atheros Confidential and Proprietary.
*
@@ -390,7 +390,7 @@
vos_mem_set(pMac->lim.protStaCache,
sizeof(tCacheParams) * LIM_PROT_STA_CACHE_SIZE, 0);
-#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->lim.pSessionEntry = NULL;
pMac->lim.reAssocRetryAttempt = 0;
#endif
diff --git a/CORE/MAC/src/pe/lim/limAssocUtils.c b/CORE/MAC/src/pe/lim/limAssocUtils.c
index 81919c4..bde93a7 100644
--- a/CORE/MAC/src/pe/lim/limAssocUtils.c
+++ b/CORE/MAC/src/pe/lim/limAssocUtils.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.
*
@@ -722,12 +722,12 @@
pMac->lim.gLastBeaconDtimCount = 0;
pMac->lim.gLastBeaconDtimPeriod = 0;
-#ifdef FEATURE_WLAN_CCX
-#ifdef FEATURE_WLAN_CCX_UPLOAD
+#ifdef FEATURE_WLAN_ESE
+#ifdef FEATURE_WLAN_ESE_UPLOAD
limSendSmeTsmIEInd(pMac, psessionEntry, 0, 0, 0);
#else
limDeactivateAndChangeTimer(pMac,eLIM_TSM_TIMER);
-#endif /* FEATURE_WLAN_CCX_UPLOAD */
+#endif /* FEATURE_WLAN_ESE_UPLOAD */
#endif
/**
@@ -4638,7 +4638,7 @@
}
#endif
-#if defined(FEATURE_WLAN_CCX) && defined(FEATURE_WLAN_CCX_UPLOAD)
+#if defined(FEATURE_WLAN_ESE) && defined(FEATURE_WLAN_ESE_UPLOAD)
/** -------------------------------------------------------------
\fn limSendSmeTsmIEInd
\brief Forwards the TSM IE information to SME.
@@ -4680,6 +4680,6 @@
limSysProcessMmhMsgApi(pMac, &mmhMsg, ePROT);
return;
}
-#endif /* FEATURE_WLAN_CCX && FEATURE_WLAN_CCX_UPLOAD */
+#endif /* FEATURE_WLAN_ESE && FEATURE_WLAN_ESE_UPLOAD */
diff --git a/CORE/MAC/src/pe/lim/limAssocUtils.h b/CORE/MAC/src/pe/lim/limAssocUtils.h
index 319d799..d44afc5 100644
--- a/CORE/MAC/src/pe/lim/limAssocUtils.h
+++ b/CORE/MAC/src/pe/lim/limAssocUtils.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.
*
@@ -175,7 +175,7 @@
/* API to fill in RX Highest Supported data Rate */
void limFillRxHighestSupportedRate(tpAniSirGlobal pMac, tANI_U16 *rxHighestRate, tANI_U8* pSupportedMCSSet);
-#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 limSendRetryReassocReqFrame(tpAniSirGlobal pMac, tLimMlmReassocReq *pMlmReassocReq, tpPESession psessionEntry);
#endif
#ifdef WLAN_FEATURE_11W
@@ -183,10 +183,10 @@
tANI_U8 *frame, tANI_U32 frameLen, tANI_U16 sessionId, tpPESession psessionEntry);
#endif
-#if defined(FEATURE_WLAN_CCX) && defined(FEATURE_WLAN_CCX_UPLOAD)
+#if defined(FEATURE_WLAN_ESE) && defined(FEATURE_WLAN_ESE_UPLOAD)
void limSendSmeTsmIEInd( tpAniSirGlobal pMac, tpPESession psessionEntry,
tANI_U8 tid, tANI_U8 state, tANI_U16 measInterval);
-#endif /* FEATURE_WLAN_CCX && FEATURE_WLAN_CCX_UPLOAD */
+#endif /* FEATURE_WLAN_ESE && FEATURE_WLAN_ESE_UPLOAD */
#endif /* __LIM_ASSOC_UTILS_H */
diff --git a/CORE/MAC/src/pe/lim/limFT.c b/CORE/MAC/src/pe/lim/limFT.c
index f00ee96..c896117 100644
--- a/CORE/MAC/src/pe/lim/limFT.c
+++ b/CORE/MAC/src/pe/lim/limFT.c
@@ -355,12 +355,12 @@
// receive Auth2.
authFrame.authAlgoNumber = eSIR_FT_AUTH; // Set the auth type to FT
}
-#if defined FEATURE_WLAN_CCX || defined FEATURE_WLAN_LFR
+#if defined FEATURE_WLAN_ESE || defined FEATURE_WLAN_LFR
else
{
- // Will need to make isCCXconnection a enum may be for further
+ // Will need to make isESEconnection a enum may be for further
// improvements to this to match this algorithm number
- authFrame.authAlgoNumber = eSIR_OPEN_SYSTEM; // For now if its CCX and 11r FT.
+ authFrame.authAlgoNumber = eSIR_OPEN_SYSTEM; // For now if its ESE and 11r FT.
}
#endif
authFrame.authTransactionSeqNumber = SIR_MAC_AUTH_FRAME_1;
@@ -698,7 +698,7 @@
/* Retrieve the session that has already been created and update the entry */
pftSessionEntry = pMac->ft.ftPEContext.pftSessionEntry;
-#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, pbssDescription->bssId, LOG1);
#endif
pftSessionEntry->limWmeEnabled = psessionEntry->limWmeEnabled;
@@ -750,7 +750,7 @@
// Self Mac
sirCopyMacAddr(pftSessionEntry->selfMacAddr, psessionEntry->selfMacAddr);
sirCopyMacAddr(pftSessionEntry->limReAssocbssId, pbssDescription->bssId);
-#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, pftSessionEntry->limReAssocbssId, LOG1);
#endif
@@ -802,7 +802,7 @@
pftSessionEntry->limCurrentBssPropCap;
-#ifdef FEATURE_WLAN_CCX
+#ifdef FEATURE_WLAN_ESE
pftSessionEntry->maxTxPower = limGetMaxTxPower(regMax, localPowerConstraint, pMac->roam.configParam.nTxPowerCap);
#else
pftSessionEntry->maxTxPower = VOS_MIN( regMax , (localPowerConstraint) );
@@ -853,10 +853,10 @@
if (pftSessionEntry)
{
pftSessionEntry->is11Rconnection = psessionEntry->is11Rconnection;
-#ifdef FEATURE_WLAN_CCX
- pftSessionEntry->isCCXconnection = psessionEntry->isCCXconnection;
+#ifdef FEATURE_WLAN_ESE
+ pftSessionEntry->isESEconnection = psessionEntry->isESEconnection;
#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)
pftSessionEntry->isFastTransitionEnabled = psessionEntry->isFastTransitionEnabled;
#endif
diff --git a/CORE/MAC/src/pe/lim/limProcessActionFrame.c b/CORE/MAC/src/pe/lim/limProcessActionFrame.c
index 6419a02..8d00301 100644
--- a/CORE/MAC/src/pe/lim/limProcessActionFrame.c
+++ b/CORE/MAC/src/pe/lim/limProcessActionFrame.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.
*
@@ -20,7 +20,7 @@
*/
/*
- * Copyright (c) 2012-2013 Qualcomm Atheros, Inc.
+ * Copyright (c) 2012-2014 Qualcomm Atheros, Inc.
* All Rights Reserved.
* Qualcomm Atheros Confidential and Proprietary.
*
@@ -59,8 +59,8 @@
#endif
#include "limSessionUtils.h"
-#if defined(FEATURE_WLAN_CCX) && !defined(FEATURE_WLAN_CCX_UPLOAD)
-#include "ccxApi.h"
+#if defined(FEATURE_WLAN_ESE) && !defined(FEATURE_WLAN_ESE_UPLOAD)
+#include "eseApi.h"
#endif
#include "wlan_qct_wda.h"
@@ -573,19 +573,19 @@
return;
}
-#ifdef FEATURE_WLAN_CCX
+#ifdef FEATURE_WLAN_ESE
if (addts.tsmPresent)
{
limLog(pMac, LOGW, "TSM IE Present");
- psessionEntry->ccxContext.tsm.tid = addts.tspec.tsinfo.traffic.userPrio;
- vos_mem_copy(&psessionEntry->ccxContext.tsm.tsmInfo,
- &addts.tsmIE,sizeof(tSirMacCCXTSMIE));
-#ifdef FEATURE_WLAN_CCX_UPLOAD
+ psessionEntry->eseContext.tsm.tid = addts.tspec.tsinfo.traffic.userPrio;
+ vos_mem_copy(&psessionEntry->eseContext.tsm.tsmInfo,
+ &addts.tsmIE,sizeof(tSirMacESETSMIE));
+#ifdef FEATURE_WLAN_ESE_UPLOAD
limSendSmeTsmIEInd(pMac, psessionEntry, addts.tsmIE.tsid,
addts.tsmIE.state, addts.tsmIE.msmt_interval);
#else
limActivateTSMStatsTimer(pMac, psessionEntry);
-#endif /* FEATURE_WLAN_CCX_UPLOAD */
+#endif /* FEATURE_WLAN_ESE_UPLOAD */
}
#endif
/* Since AddTS response was successful, check for the PSB flag
@@ -843,12 +843,12 @@
PELOG1(limLog(pMac, LOG1, FL("DeleteTS succeeded"));)
-#ifdef FEATURE_WLAN_CCX
-#ifdef FEATURE_WLAN_CCX_UPLOAD
+#ifdef FEATURE_WLAN_ESE
+#ifdef FEATURE_WLAN_ESE_UPLOAD
limSendSmeTsmIEInd(pMac, psessionEntry, 0, 0, 0);
#else
limDeactivateAndChangeTimer(pMac,eLIM_TSM_TIMER);
-#endif /* FEATURE_WLAN_CCX_UPLOAD */
+#endif /* FEATURE_WLAN_ESE_UPLOAD */
#endif
}
@@ -2130,7 +2130,8 @@
}
break;
#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) \
+ || defined (WLAN_FEATURE_RELIABLE_MCAST)
case SIR_MAC_ACTION_VENDOR_SPECIFIC_CATEGORY:
{
tpSirMacVendorSpecificFrameHdr pVendorSpecific = (tpSirMacVendorSpecificFrameHdr) pActionHdr;
diff --git a/CORE/MAC/src/pe/lim/limProcessAssocRspFrame.c b/CORE/MAC/src/pe/lim/limProcessAssocRspFrame.c
index 2f20a19..be06a71 100644
--- a/CORE/MAC/src/pe/lim/limProcessAssocRspFrame.c
+++ b/CORE/MAC/src/pe/lim/limProcessAssocRspFrame.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.
*
@@ -52,8 +52,8 @@
#include "limStaHashApi.h"
#include "limSendMessages.h"
-#if defined(FEATURE_WLAN_CCX) && !defined(FEATURE_WLAN_CCX_UPLOAD)
-#include "ccxApi.h"
+#if defined(FEATURE_WLAN_ESE) && !defined(FEATURE_WLAN_ESE_UPLOAD)
+#include "eseApi.h"
#endif
extern tSirRetStatus schBeaconEdcaProcess(tpAniSirGlobal pMac, tSirMacEdcaParamSetIE *edca, tpPESession psessionEntry);
@@ -354,7 +354,7 @@
(psessionEntry->limMlmState != eLIM_MLM_WT_ASSOC_RSP_STATE)) ||
((subType == LIM_REASSOC) &&
((psessionEntry->limMlmState != eLIM_MLM_WT_REASSOC_RSP_STATE)
-#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)
&& (psessionEntry->limMlmState != eLIM_MLM_WT_FT_REASSOC_RSP_STATE)
#endif
)))
@@ -509,7 +509,7 @@
}
#endif
-#ifdef FEATURE_WLAN_CCX
+#ifdef FEATURE_WLAN_ESE
if (psessionEntry->tspecIes != NULL)
{
vos_mem_free(psessionEntry->tspecIes);
@@ -575,7 +575,7 @@
limDeactivateAndChangeTimer(pMac, eLIM_ASSOC_FAIL_TIMER);
else // Stop Reassociation failure timer
{
-#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->lim.reAssocRetryAttempt = 0;
if ((NULL != pMac->lim.pSessionEntry) && (NULL != pMac->lim.pSessionEntry->pLimMlmReassocRetryReq))
{
@@ -652,7 +652,7 @@
{
// Log success
PELOG1(limLog(pMac, LOG1, FL("Successfully Reassociated with BSS"));)
-#ifdef FEATURE_WLAN_CCX
+#ifdef FEATURE_WLAN_ESE
{
tANI_U8 cnt = 0;
if (pAssocRsp->tsmPresent)
@@ -663,10 +663,10 @@
// Find the TSPEC IE with VO user priority
for (cnt=0; cnt<pAssocRsp->num_tspecs; cnt++) {
if ( upToAc(pAssocRsp->TSPECInfo[cnt].user_priority) == EDCA_AC_VO) {
- psessionEntry->ccxContext.tsm.tid = pAssocRsp->TSPECInfo[cnt].user_priority;
- vos_mem_copy(&psessionEntry->ccxContext.tsm.tsmInfo,
- &pAssocRsp->tsmIE, sizeof(tSirMacCCXTSMIE));
-#ifdef FEATURE_WLAN_CCX_UPLOAD
+ psessionEntry->eseContext.tsm.tid = pAssocRsp->TSPECInfo[cnt].user_priority;
+ vos_mem_copy(&psessionEntry->eseContext.tsm.tsmInfo,
+ &pAssocRsp->tsmIE, sizeof(tSirMacESETSMIE));
+#ifdef FEATURE_WLAN_ESE_UPLOAD
limSendSmeTsmIEInd(pMac,
psessionEntry,
pAssocRsp->tsmIE.tsid,
@@ -674,9 +674,9 @@
pAssocRsp->tsmIE.msmt_interval);
#else
limActivateTSMStatsTimer(pMac, psessionEntry);
-#endif /* FEATURE_WLAN_CCX_UPLOAD */
- if(psessionEntry->ccxContext.tsm.tsmInfo.state) {
- psessionEntry->ccxContext.tsm.tsmMetrics.RoamingCount++;
+#endif /* FEATURE_WLAN_ESE_UPLOAD */
+ if(psessionEntry->eseContext.tsm.tsmInfo.state) {
+ psessionEntry->eseContext.tsm.tsmMetrics.RoamingCount++;
}
break;
}
@@ -711,7 +711,7 @@
goto assocReject;
}
-#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 (psessionEntry->limMlmState == eLIM_MLM_WT_FT_REASSOC_RSP_STATE)
{
#ifdef WLAN_FEATURE_VOWIFI_11R_DEBUG
@@ -771,10 +771,10 @@
// Log success
PELOG1(limLog(pMac, LOG1, FL("Successfully Associated with BSS "MAC_ADDRESS_STR),
MAC_ADDR_ARRAY(pHdr->sa));)
-#ifdef FEATURE_WLAN_CCX
- if(psessionEntry->ccxContext.tsm.tsmInfo.state)
+#ifdef FEATURE_WLAN_ESE
+ if(psessionEntry->eseContext.tsm.tsmInfo.state)
{
- psessionEntry->ccxContext.tsm.tsmMetrics.RoamingCount = 0;
+ psessionEntry->eseContext.tsm.tsmMetrics.RoamingCount = 0;
}
#endif
/**
diff --git a/CORE/MAC/src/pe/lim/limProcessMessageQueue.c b/CORE/MAC/src/pe/lim/limProcessMessageQueue.c
index 02c9768..526a93e 100644
--- a/CORE/MAC/src/pe/lim/limProcessMessageQueue.c
+++ b/CORE/MAC/src/pe/lim/limProcessMessageQueue.c
@@ -62,8 +62,8 @@
#if defined WLAN_FEATURE_VOWIFI
#include "rrmApi.h"
#endif
-#if defined(FEATURE_WLAN_CCX) && !defined(FEATURE_WLAN_CCX_UPLOAD)
-#include "ccxApi.h"
+#if defined(FEATURE_WLAN_ESE) && !defined(FEATURE_WLAN_ESE_UPLOAD)
+#include "eseApi.h"
#endif
#if defined WLAN_FEATURE_VOWIFI_11R
@@ -590,10 +590,10 @@
goto end;
}
#endif //WLAN_FEATURE_ROAM_SCAN_OFFLOAD
-#ifdef FEATURE_WLAN_CCX
+#ifdef FEATURE_WLAN_ESE
if (fc.type == SIR_MAC_DATA_FRAME && isFrmFt)
{
-#if 0 // CCX TBD Need to PORT
+#if 0 // Ese TBD Need to PORT
tpSirMacDot3Hdr pDataFrmHdr;
pDataFrmHdr = (tpSirMacDot3Hdr)((tANI_U8 *)pBD+ WLANHAL_RX_BD_GET_MPDU_H_OFFSET(pBD));
@@ -605,9 +605,9 @@
return;
}
- if (!psessionEntry->isCCXconnection)
+ if (!psessionEntry->isESEconnection)
{
- limLog( pMac, LOGE, FL("LIM received Type %d, Subtype %d in Non CCX connection"),
+ limLog( pMac, LOGE, FL("LIM received Type %d, Subtype %d in Non ESE connection"),
fc.type, fc.subType);
limPktFree(pMac, HAL_TXRX_FRM_802_11_MGMT, pBD, limMsg->bodyptr);
return;
@@ -615,7 +615,7 @@
limLog( pMac, LOGE, FL("Processing IAPP Frm from SA:"));
limPrintMacAddr(pMac, pDataFrmHdr->sa, LOGE);
#else
- printk("%s: Need to port handling of IAPP frames to PRIMA for CCX", __func__);
+ printk("%s: Need to port handling of IAPP frames to PRIMA for ESE", __func__);
#endif
@@ -836,12 +836,12 @@
}
}
#endif
-#if defined(FEATURE_WLAN_CCX) && !defined(FEATURE_WLAN_CCX_UPLOAD)
+#if defined(FEATURE_WLAN_ESE) && !defined(FEATURE_WLAN_ESE_UPLOAD)
/* We accept data frame (IAPP frame) only if Session is
- * present and ccx connection is established on that
+ * present and ese connection is established on that
* session
*/
- if (psessionEntry && psessionEntry->isCCXconnection) {
+ if (psessionEntry && psessionEntry->isESEconnection) {
limProcessIappFrame(pMac, pRxPacketInfo, psessionEntry);
}
#endif
@@ -1368,8 +1368,8 @@
case eWNI_SME_NEIGHBOR_REPORT_REQ_IND:
case eWNI_SME_BEACON_REPORT_RESP_XMIT_IND:
#endif
-#if defined FEATURE_WLAN_CCX
- case eWNI_SME_CCX_ADJACENT_AP_REPORT:
+#if defined FEATURE_WLAN_ESE
+ case eWNI_SME_ESE_ADJACENT_AP_REPORT:
#endif
#ifdef WLAN_FEATURE_VOWIFI_11R
case eWNI_SME_FT_UPDATE_KEY:
@@ -1386,12 +1386,12 @@
case eWNI_SME_GLOBAL_STAT_REQ:
case eWNI_SME_STAT_SUMM_REQ:
case eWNI_SME_GET_STATISTICS_REQ:
-#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_REQ:
#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_REQ:
-#endif /* FEATURE_WLAN_CCX && FEATURE_WLAN_CCX_UPLOAD */
+#endif /* FEATURE_WLAN_ESE && FEATURE_WLAN_ESE_UPLOAD */
// These messages are from HDD
limProcessNormalHddMsg(pMac, limMsg, false); //no need to response to hdd
break;
@@ -1598,18 +1598,18 @@
case SIR_LIM_ADDTS_RSP_TIMEOUT:
limProcessSmeReqMessages(pMac,limMsg);
break;
-#ifdef FEATURE_WLAN_CCX
- case SIR_LIM_CCX_TSM_TIMEOUT:
-#ifndef FEATURE_WLAN_CCX_UPLOAD
+#ifdef FEATURE_WLAN_ESE
+ case SIR_LIM_ESE_TSM_TIMEOUT:
+#ifndef FEATURE_WLAN_ESE_UPLOAD
limProcessTsmTimeoutHandler(pMac,limMsg);
-#endif /* FEATURE_WLAN_CCX_UPLOAD */
+#endif /* FEATURE_WLAN_ESE_UPLOAD */
break;
case WDA_TSM_STATS_RSP:
-#ifdef FEATURE_WLAN_CCX_UPLOAD
- limSendSmePECcxTsmRsp(pMac, (tAniGetTsmStatsRsp *)limMsg->bodyptr);
+#ifdef FEATURE_WLAN_ESE_UPLOAD
+ limSendSmePEEseTsmRsp(pMac, (tAniGetTsmStatsRsp *)limMsg->bodyptr);
#else
- limProcessHalCcxTsmRsp(pMac, limMsg);
-#endif /* FEATURE_WLAN_CCX_UPLOAD */
+ limProcessHalEseTsmRsp(pMac, limMsg);
+#endif /* FEATURE_WLAN_ESE_UPLOAD */
break;
#endif
case WDA_ADD_TS_RSP:
@@ -1917,7 +1917,7 @@
case WDA_GET_STATISTICS_RSP:
limSendSmePEStatisticsRsp ( pMac, limMsg->type, (void *)limMsg->bodyptr);
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 WDA_GET_ROAM_RSSI_RSP:
limSendSmePEGetRoamRssiRsp ( pMac, limMsg->type, (void *)limMsg->bodyptr);
break;
diff --git a/CORE/MAC/src/pe/lim/limProcessMlmReqMessages.c b/CORE/MAC/src/pe/lim/limProcessMlmReqMessages.c
index 6281c98..1072864 100644
--- a/CORE/MAC/src/pe/lim/limProcessMlmReqMessages.c
+++ b/CORE/MAC/src/pe/lim/limProcessMlmReqMessages.c
@@ -2176,7 +2176,7 @@
secChanOffset = psessionEntry->htSecondaryChannelOffset;
//store the channel switch sessionEntry in the lim global var
psessionEntry->channelChangeReasonCode = LIM_SWITCH_CHANNEL_JOIN;
-#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)
psessionEntry->pLimMlmReassocRetryReq = NULL;
#endif
limLog(pMac, LOG1, FL("[limProcessMlmJoinReq]: suspend link sucess(%d) "
@@ -4476,7 +4476,7 @@
limPostSmeMessage(pMac, LIM_MLM_ASSOC_CNF, (tANI_U32 *) &mlmAssocCnf);
else
{
- /* Will come here only in case of 11r, CCx FT when reassoc rsp
+ /* Will come here only in case of 11r, ESE, FT when reassoc rsp
is not received and we receive a reassoc - timesout */
mlmAssocCnf.resultCode = eSIR_SME_FT_REASSOC_TIMEOUT_FAILURE;
limPostSmeMessage(pMac, LIM_MLM_REASSOC_CNF, (tANI_U32 *) &mlmAssocCnf);
diff --git a/CORE/MAC/src/pe/lim/limProcessMlmRspMessages.c b/CORE/MAC/src/pe/lim/limProcessMlmRspMessages.c
index 93d9319..b0ad149 100644
--- a/CORE/MAC/src/pe/lim/limProcessMlmRspMessages.c
+++ b/CORE/MAC/src/pe/lim/limProcessMlmRspMessages.c
@@ -2802,7 +2802,7 @@
mlmReassocCnf.protStatusCode = eSIR_MAC_UNSPEC_FAILURE_STATUS;
goto end;
}
-#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->lim.pSessionEntry = psessionEntry;
if(NULL == pMac->lim.pSessionEntry->pLimMlmReassocRetryReq)
{
@@ -3026,7 +3026,7 @@
if( eHAL_STATUS_SUCCESS == pAddBssParams->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)
if( eLIM_MLM_WT_ADD_BSS_RSP_FT_REASSOC_STATE == psessionEntry->limMlmState )
{
#ifdef WLAN_FEATURE_VOWIFI_11R_DEBUG
diff --git a/CORE/MAC/src/pe/lim/limProcessSmeReqMessages.c b/CORE/MAC/src/pe/lim/limProcessSmeReqMessages.c
index e2de81d..41e2518 100644
--- a/CORE/MAC/src/pe/lim/limProcessSmeReqMessages.c
+++ b/CORE/MAC/src/pe/lim/limProcessSmeReqMessages.c
@@ -63,15 +63,15 @@
#if defined WLAN_FEATURE_VOWIFI
#include "rrmApi.h"
#endif
-#if defined(FEATURE_WLAN_CCX) && !defined(FEATURE_WLAN_CCX_UPLOAD)
-#include "ccxApi.h"
+#if defined(FEATURE_WLAN_ESE) && !defined(FEATURE_WLAN_ESE_UPLOAD)
+#include "eseApi.h"
#endif
#if defined WLAN_FEATURE_VOWIFI_11R
#include <limFT.h>
#endif
-#ifdef FEATURE_WLAN_CCX
+#ifdef FEATURE_WLAN_ESE
/* These are the min/max tx power (non virtual rates) range
supported by prima hardware */
#define MIN_TX_PWR_CAP 8
@@ -1806,16 +1806,16 @@
vos_mem_copy( psessionEntry->ssId.ssId,
pSmeJoinReq->ssId.ssId, psessionEntry->ssId.length);
- // Determin 11r or CCX connection based on input from SME
+ // Determin 11r or ESE connection based on input from SME
// which inturn is dependent on the profile the user wants to connect
// to, So input is coming from supplicant
#ifdef WLAN_FEATURE_VOWIFI_11R
psessionEntry->is11Rconnection = pSmeJoinReq->is11Rconnection;
#endif
-#ifdef FEATURE_WLAN_CCX
- psessionEntry->isCCXconnection = pSmeJoinReq->isCCXconnection;
+#ifdef FEATURE_WLAN_ESE
+ psessionEntry->isESEconnection = pSmeJoinReq->isESEconnection;
#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)
psessionEntry->isFastTransitionEnabled = pSmeJoinReq->isFastTransitionEnabled;
#endif
@@ -1901,7 +1901,7 @@
, &localPowerConstraint,
psessionEntry
);
-#ifdef FEATURE_WLAN_CCX
+#ifdef FEATURE_WLAN_ESE
psessionEntry->maxTxPower = limGetMaxTxPower(regMax, localPowerConstraint, pMac->roam.configParam.nTxPowerCap);
#else
psessionEntry->maxTxPower = VOS_MIN( regMax, (localPowerConstraint) );
@@ -1997,7 +1997,7 @@
} /*** end __limProcessSmeJoinReq() ***/
-#ifdef FEATURE_WLAN_CCX
+#ifdef FEATURE_WLAN_ESE
tANI_U8 limGetMaxTxPower(tPowerdBm regMax, tPowerdBm apTxPower, tANI_U8 iniTxPower)
{
tANI_U8 maxTxPower = 0;
@@ -2100,7 +2100,7 @@
if (psessionEntry->limSmeState != eLIM_SME_LINK_EST_STATE)
{
-#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 (psessionEntry->limSmeState == eLIM_SME_WT_REASSOC_STATE)
{
// May be from 11r FT pre-auth. So lets check it before we bail out
@@ -4016,12 +4016,12 @@
limLog(pMac, LOGE, FL("Self entry missing in Hash Table "));
status = eSIR_FAILURE;
}
-#ifdef FEATURE_WLAN_CCX
-#ifdef FEATURE_WLAN_CCX_UPLOAD
+#ifdef FEATURE_WLAN_ESE
+#ifdef FEATURE_WLAN_ESE_UPLOAD
limSendSmeTsmIEInd(pMac, psessionEntry, 0, 0, 0);
#else
limDeactivateAndChangeTimer(pMac,eLIM_TSM_TIMER);
-#endif /* FEATURE_WLAN_CCX_UPLOAD */
+#endif /* FEATURE_WLAN_ESE_UPLOAD */
#endif
// send an sme response back
@@ -4194,7 +4194,7 @@
return;
}
-#if defined(FEATURE_WLAN_CCX) && defined(FEATURE_WLAN_CCX_UPLOAD)
+#if defined(FEATURE_WLAN_ESE) && defined(FEATURE_WLAN_ESE_UPLOAD)
/**
*FUNCTION: __limProcessSmeGetTsmStatsRequest()
*
@@ -4222,11 +4222,11 @@
return;
}
}
-#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)
/**
* __limProcessSmeGetRoamRssiRequest()
*
@@ -4521,7 +4521,7 @@
break;
case eWNI_SME_BEACON_REPORT_RESP_XMIT_IND:
{
-#if defined(FEATURE_WLAN_CCX) && !defined(FEATURE_WLAN_CCX_UPLOAD)
+#if defined(FEATURE_WLAN_ESE) && !defined(FEATURE_WLAN_ESE_UPLOAD)
tpSirBeaconReportXmitInd pBcnReport=NULL;
tpPESession psessionEntry=NULL;
tANI_U8 sessionId;
@@ -4537,8 +4537,8 @@
limLog(pMac, LOGE, "Session Does not exist for given bssId");
return;
}
- if (psessionEntry->isCCXconnection)
- ccxProcessBeaconReportXmit( pMac, pMsg->bodyptr);
+ if (psessionEntry->isESEconnection)
+ eseProcessBeaconReportXmit( pMac, pMsg->bodyptr);
else
#endif
rrmProcessBeaconReportXmit( pMac, pMsg->bodyptr );
@@ -4548,7 +4548,7 @@
#endif
}
-#if defined(FEATURE_WLAN_CCX) || defined(WLAN_FEATURE_VOWIFI)
+#if defined(FEATURE_WLAN_ESE) || defined(WLAN_FEATURE_VOWIFI)
// --------------------------------------------------------------------
/**
* limSendSetMaxTxPowerReq
@@ -4585,7 +4585,7 @@
return eSIR_MEM_ALLOC_FAILED;
}
-#if defined(WLAN_VOWIFI_DEBUG) || defined(FEATURE_WLAN_CCX)
+#if defined(WLAN_VOWIFI_DEBUG) || defined(FEATURE_WLAN_ESE)
PELOG1(limLog( pMac, LOG1, "%s:%d: Allocated memory for pMaxTxParams...will be freed in other module", __func__, __LINE__ );)
#endif
if( pMaxTxParams == NULL )
@@ -5547,19 +5547,19 @@
//HAL consumes pMsgBuf. It will be freed there. Set bufConsumed to false.
bufConsumed = FALSE;
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_REQ:
__limProcessSmeGetRoamRssiRequest( pMac, pMsgBuf);
//HAL consumes pMsgBuf. It will be freed there. Set bufConsumed to false.
bufConsumed = FALSE;
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_REQ:
__limProcessSmeGetTsmStatsRequest( pMac, pMsgBuf);
bufConsumed = FALSE;
break;
-#endif /* FEATURE_WLAN_CCX && FEATURE_WLAN_CCX_UPLOAD */
+#endif /* FEATURE_WLAN_ESE && FEATURE_WLAN_ESE_UPLOAD */
case eWNI_SME_DEL_BA_PEER_IND:
limProcessSmeDelBaPeerInd(pMac, pMsgBuf);
break;
@@ -5612,8 +5612,8 @@
break;
#endif
-#if defined(FEATURE_WLAN_CCX) && !defined(FEATURE_WLAN_CCX_UPLOAD)
- case eWNI_SME_CCX_ADJACENT_AP_REPORT:
+#if defined(FEATURE_WLAN_ESE) && !defined(FEATURE_WLAN_ESE_UPLOAD)
+ case eWNI_SME_ESE_ADJACENT_AP_REPORT:
limProcessAdjacentAPRepMsg ( pMac, pMsgBuf );
break;
#endif
diff --git a/CORE/MAC/src/pe/lim/limPropExtsUtils.c b/CORE/MAC/src/pe/lim/limPropExtsUtils.c
index 1eee2a6..4ce2a8e 100644
--- a/CORE/MAC/src/pe/lim/limPropExtsUtils.c
+++ b/CORE/MAC/src/pe/lim/limPropExtsUtils.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.
*
@@ -134,14 +134,14 @@
// Extract the UAPSD flag from WMM Parameter element
if (pBeaconStruct->wmeEdcaPresent)
*uapsd = pBeaconStruct->edcaParams.qosInfo.uapsd;
-#if defined FEATURE_WLAN_CCX
+#if defined FEATURE_WLAN_ESE
/* If there is Power Constraint Element specifically,
* adapt to it. Hence there is else condition check
* for this if statement.
*/
- if ( pBeaconStruct->ccxTxPwr.present)
+ if ( pBeaconStruct->eseTxPwr.present)
{
- *localConstraint = pBeaconStruct->ccxTxPwr.power_limit;
+ *localConstraint = pBeaconStruct->eseTxPwr.power_limit;
}
#endif
if (pBeaconStruct->powerConstraintPresent)
diff --git a/CORE/MAC/src/pe/lim/limScanResultUtils.c b/CORE/MAC/src/pe/lim/limScanResultUtils.c
index 5baca6e..8f817f6 100644
--- a/CORE/MAC/src/pe/lim/limScanResultUtils.c
+++ b/CORE/MAC/src/pe/lim/limScanResultUtils.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.
*
@@ -269,7 +269,7 @@
}
#endif
-#ifdef FEATURE_WLAN_CCX
+#ifdef FEATURE_WLAN_ESE
pBssDescr->QBSSLoad_present = FALSE;
pBssDescr->QBSSLoad_avail = 0;
if( pBPR->QBSSLoad.present)
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,
diff --git a/CORE/MAC/src/pe/lim/limSendSmeRspMessages.c b/CORE/MAC/src/pe/lim/limSendSmeRspMessages.c
index a5ba991..4fa7b61 100644
--- a/CORE/MAC/src/pe/lim/limSendSmeRspMessages.c
+++ b/CORE/MAC/src/pe/lim/limSendSmeRspMessages.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.
*
@@ -273,7 +273,7 @@
#ifdef WLAN_FEATURE_VOWIFI_11R
psessionEntry->RICDataLen +
#endif
-#ifdef FEATURE_WLAN_CCX
+#ifdef FEATURE_WLAN_ESE
psessionEntry->tspecLen +
#endif
sizeof(tSirSmeJoinRsp) - sizeof(tANI_U8) ;
@@ -312,7 +312,7 @@
#ifdef WLAN_FEATURE_VOWIFI_11R
pSirSmeJoinRsp->parsedRicRspLen = 0;
#endif
-#ifdef FEATURE_WLAN_CCX
+#ifdef FEATURE_WLAN_ESE
pSirSmeJoinRsp->tspecIeLen = 0;
#endif
@@ -364,7 +364,7 @@
PELOG1(limLog(pMac, LOG1, FL("RicLength=%d"), pSirSmeJoinRsp->parsedRicRspLen);)
}
#endif
-#ifdef FEATURE_WLAN_CCX
+#ifdef FEATURE_WLAN_ESE
if(psessionEntry->tspecIes != NULL)
{
pSirSmeJoinRsp->tspecIeLen = psessionEntry->tspecLen;
@@ -374,7 +374,7 @@
psessionEntry->tspecIes, pSirSmeJoinRsp->tspecIeLen);
vos_mem_free(psessionEntry->tspecIes);
psessionEntry->tspecIes = NULL;
- PELOG1(limLog(pMac, LOG1, FL("CCX-TspecLen=%d"), psessionEntry->tspecLen);)
+ PELOG1(limLog(pMac, LOG1, FL("ESE-TspecLen=%d"), psessionEntry->tspecLen);)
}
#endif
pSirSmeJoinRsp->aid = psessionEntry->limAID;
@@ -2415,7 +2415,7 @@
} /*** end limSendSmePEStatisticsRsp() ***/
-#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)
/**
* limSendSmePEGetRoamRssiRsp()
*
@@ -2477,9 +2477,9 @@
#endif
-#if defined(FEATURE_WLAN_CCX) && defined(FEATURE_WLAN_CCX_UPLOAD)
+#if defined(FEATURE_WLAN_ESE) && defined(FEATURE_WLAN_ESE_UPLOAD)
/**
- * limSendSmePECcxTsmRsp()
+ * limSendSmePEEseTsmRsp()
*
*FUNCTION:
* This function is called to send tsm stats response to HDD.
@@ -2494,7 +2494,7 @@
*/
void
-limSendSmePECcxTsmRsp(tpAniSirGlobal pMac, tAniGetTsmStatsRsp *pStats)
+limSendSmePEEseTsmRsp(tpAniSirGlobal pMac, tAniGetTsmStatsRsp *pStats)
{
tSirMsgQ mmhMsg;
tANI_U8 sessionId;
@@ -2518,8 +2518,8 @@
}
pPeStats->msgType = eWNI_SME_GET_TSM_STATS_RSP;
- pPeStats->tsmMetrics.RoamingCount = pPeSessionEntry->ccxContext.tsm.tsmMetrics.RoamingCount;
- pPeStats->tsmMetrics.RoamingDly = pPeSessionEntry->ccxContext.tsm.tsmMetrics.RoamingDly;
+ pPeStats->tsmMetrics.RoamingCount = pPeSessionEntry->eseContext.tsm.tsmMetrics.RoamingCount;
+ pPeStats->tsmMetrics.RoamingDly = pPeSessionEntry->eseContext.tsm.tsmMetrics.RoamingDly;
mmhMsg.type = eWNI_SME_GET_TSM_STATS_RSP;
mmhMsg.bodyptr = pStats;
@@ -2528,9 +2528,9 @@
limSysProcessMmhMsgApi(pMac, &mmhMsg, ePROT);
return;
-} /*** end limSendSmePECcxTsmRsp() ***/
+} /*** end limSendSmePEEseTsmRsp() ***/
-#endif /* FEATURE_WLAN_CCX) && FEATURE_WLAN_CCX_UPLOAD */
+#endif /* FEATURE_WLAN_ESE) && FEATURE_WLAN_ESE_UPLOAD */
void
diff --git a/CORE/MAC/src/pe/lim/limSendSmeRspMessages.h b/CORE/MAC/src/pe/lim/limSendSmeRspMessages.h
index cb685f1..65fd58c 100644
--- a/CORE/MAC/src/pe/lim/limSendSmeRspMessages.h
+++ b/CORE/MAC/src/pe/lim/limSendSmeRspMessages.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.
*
@@ -86,11 +86,11 @@
void limSendSmeStatsRsp(tpAniSirGlobal pMac, tANI_U16 msgtype, void * stats);
void limSendSmePEStatisticsRsp(tpAniSirGlobal pMac, tANI_U16 msgtype, void * stats);
-#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 limSendSmePEGetRoamRssiRsp(tpAniSirGlobal pMac, tANI_U16 msgtype, void * stats);
#endif
-#ifdef FEATURE_WLAN_CCX_UPLOAD
-void limSendSmePECcxTsmRsp(tpAniSirGlobal pMac, tAniGetTsmStatsRsp *pStats);
+#ifdef FEATURE_WLAN_ESE_UPLOAD
+void limSendSmePEEseTsmRsp(tpAniSirGlobal pMac, tAniGetTsmStatsRsp *pStats);
#endif
void limSendSmeRemoveKeyRsp(tpAniSirGlobal pMac, tSirMacAddr peerMacAddr, tSirResultCodes resultCode,tpPESession,tANI_U8,tANI_U16);
diff --git a/CORE/MAC/src/pe/lim/limSerDesUtils.c b/CORE/MAC/src/pe/lim/limSerDesUtils.c
index cb80e61..b5118da 100644
--- a/CORE/MAC/src/pe/lim/limSerDesUtils.c
+++ b/CORE/MAC/src/pe/lim/limSerDesUtils.c
@@ -229,7 +229,7 @@
#endif
#endif
-#ifdef FEATURE_WLAN_CCX
+#ifdef FEATURE_WLAN_ESE
pBssDescription->QBSSLoad_present = limGetU16(pBuf);
pBuf += sizeof(tANI_U16);
len -= sizeof(tANI_U16);
@@ -1040,7 +1040,7 @@
}
}
-#ifdef FEATURE_WLAN_CCX
+#ifdef FEATURE_WLAN_ESE
// Extract CCKM IE
pJoinReq->cckmIE.length = limGetU16(pBuf);
pBuf += sizeof(tANI_U16);
@@ -1162,9 +1162,9 @@
}
#endif
-#ifdef FEATURE_WLAN_CCX
- //CCX version IE
- pJoinReq->isCCXFeatureIniEnabled = (tAniBool)limGetU32(pBuf);
+#ifdef FEATURE_WLAN_ESE
+ //ESE version IE
+ pJoinReq->isESEFeatureIniEnabled = (tAniBool)limGetU32(pBuf);
pBuf += sizeof(tAniBool);
len -= sizeof(tAniBool);
if (limCheckRemainingLength(pMac, len) == eSIR_FAILURE)
@@ -1173,8 +1173,8 @@
return eSIR_FAILURE;
}
- //isCCXconnection;
- pJoinReq->isCCXconnection = (tAniBool)limGetU32(pBuf);
+ //isESEconnection;
+ pJoinReq->isESEconnection = (tAniBool)limGetU32(pBuf);
pBuf += sizeof(tAniBool);
len -= sizeof(tAniBool);
if (limCheckRemainingLength(pMac, len) == eSIR_FAILURE)
@@ -1184,12 +1184,12 @@
}
// TSPEC information
- pJoinReq->ccxTspecInfo.numTspecs = *pBuf++;
+ pJoinReq->eseTspecInfo.numTspecs = *pBuf++;
len -= sizeof(tANI_U8);
- vos_mem_copy((void*)&pJoinReq->ccxTspecInfo.tspec[0], pBuf,
- (sizeof(tTspecInfo)* pJoinReq->ccxTspecInfo.numTspecs));
- pBuf += sizeof(tTspecInfo)*SIR_CCX_MAX_TSPEC_IES;
- len -= sizeof(tTspecInfo)*SIR_CCX_MAX_TSPEC_IES;
+ vos_mem_copy((void*)&pJoinReq->eseTspecInfo.tspec[0], pBuf,
+ (sizeof(tTspecInfo)* pJoinReq->eseTspecInfo.numTspecs));
+ pBuf += sizeof(tTspecInfo)*SIR_ESE_MAX_TSPEC_IES;
+ len -= sizeof(tTspecInfo)*SIR_ESE_MAX_TSPEC_IES;
if (limCheckRemainingLength(pMac, len) == eSIR_FAILURE)
{
limLog(pMac, LOGE, FL("remaining len %d is too short"), len);
@@ -1197,7 +1197,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)
//isFastTransitionEnabled;
pJoinReq->isFastTransitionEnabled = (tAniBool)limGetU32(pBuf);
pBuf += sizeof(tAniBool);
diff --git a/CORE/MAC/src/pe/lim/limSession.c b/CORE/MAC/src/pe/lim/limSession.c
index aac7879..12f949a 100644
--- a/CORE/MAC/src/pe/lim/limSession.c
+++ b/CORE/MAC/src/pe/lim/limSession.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.
*
@@ -47,8 +47,8 @@
#include "limDebug.h"
#include "limSession.h"
#include "limUtils.h"
-#if defined(FEATURE_WLAN_CCX) && !defined(FEATURE_WLAN_CCX_UPLOAD)
-#include "ccxApi.h"
+#if defined(FEATURE_WLAN_ESE) && !defined(FEATURE_WLAN_ESE_UPLOAD)
+#include "eseApi.h"
#endif
/*--------------------------------------------------------------------------
@@ -164,11 +164,11 @@
pMac->lim.gpSession[i].is11Rconnection = FALSE;
#endif
-#ifdef FEATURE_WLAN_CCX
- pMac->lim.gpSession[i].isCCXconnection = FALSE;
+#ifdef FEATURE_WLAN_ESE
+ pMac->lim.gpSession[i].isESEconnection = FALSE;
#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->lim.gpSession[i].isFastTransitionEnabled = FALSE;
#endif
#ifdef FEATURE_WLAN_LFR
@@ -452,7 +452,7 @@
psessionEntry->limAssocResponseData = NULL;
}
-#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 (NULL != psessionEntry->pLimMlmReassocRetryReq)
{
vos_mem_free( psessionEntry->pLimMlmReassocRetryReq);
@@ -466,8 +466,8 @@
psessionEntry->pLimMlmReassocReq = NULL;
}
-#if defined(FEATURE_WLAN_CCX) && !defined(FEATURE_WLAN_CCX_UPLOAD)
- limCleanupCcxCtxt(pMac, psessionEntry);
+#if defined(FEATURE_WLAN_ESE) && !defined(FEATURE_WLAN_ESE_UPLOAD)
+ limCleanupEseCtxt(pMac, psessionEntry);
#endif
psessionEntry->valid = FALSE;
diff --git a/CORE/MAC/src/pe/lim/limTimerUtils.c b/CORE/MAC/src/pe/lim/limTimerUtils.c
index ab8a1d3..05aedd0 100644
--- a/CORE/MAC/src/pe/lim/limTimerUtils.c
+++ b/CORE/MAC/src/pe/lim/limTimerUtils.c
@@ -665,13 +665,13 @@
}
#endif
-#if defined(FEATURE_WLAN_CCX) && !defined(FEATURE_WLAN_CCX_UPLOAD)
+#if defined(FEATURE_WLAN_ESE) && !defined(FEATURE_WLAN_ESE_UPLOAD)
cfgValue = 5000;
cfgValue = SYS_MS_TO_TICKS(cfgValue);
- if (tx_timer_create(&pMac->lim.limTimers.gLimCcxTsmTimer,
- "CCX TSM Stats TIMEOUT",
- limTimerHandler, SIR_LIM_CCX_TSM_TIMEOUT,
+ if (tx_timer_create(&pMac->lim.limTimers.gLimEseTsmTimer,
+ "ESE TSM Stats TIMEOUT",
+ limTimerHandler, SIR_LIM_ESE_TSM_TIMEOUT,
cfgValue, 0,
TX_NO_ACTIVATE) != TX_SUCCESS)
{
@@ -680,7 +680,7 @@
limLog(pMac, LOGP, FL("could not create Join failure timer"));
goto err_timer;
}
-#endif /* FEATURE_WLAN_CCX && !FEATURE_WLAN_CCX_UPLOAD */
+#endif /* FEATURE_WLAN_ESE && !FEATURE_WLAN_ESE_UPLOAD */
cfgValue = 1000;
cfgValue = SYS_MS_TO_TICKS(cfgValue);
@@ -751,9 +751,9 @@
tx_timer_delete(&pMac->lim.limTimers.gLimDeauthAckTimer);
tx_timer_delete(&pMac->lim.limTimers.gLimDisassocAckTimer);
tx_timer_delete(&pMac->lim.limTimers.gLimRemainOnChannelTimer);
-#if defined(FEATURE_WLAN_CCX) && !defined(FEATURE_WLAN_CCX_UPLOAD)
- tx_timer_delete(&pMac->lim.limTimers.gLimCcxTsmTimer);
-#endif /* FEATURE_WLAN_CCX && !FEATURE_WLAN_CCX_UPLOAD */
+#if defined(FEATURE_WLAN_ESE) && !defined(FEATURE_WLAN_ESE_UPLOAD)
+ tx_timer_delete(&pMac->lim.limTimers.gLimEseTsmTimer);
+#endif /* FEATURE_WLAN_ESE && !FEATURE_WLAN_ESE_UPLOAD */
tx_timer_delete(&pMac->lim.limTimers.gLimFTPreAuthRspTimer);
tx_timer_delete(&pMac->lim.limTimers.gLimUpdateOlbcCacheTimer);
while(((tANI_S32)--i) >= 0)
@@ -941,7 +941,7 @@
tSirMsgQ msg;
tpAniSirGlobal pMac = (tpAniSirGlobal)pMacGlobal;
-#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((LIM_REASSOC == param) &&
(NULL != pMac->lim.pSessionEntry) &&
(pMac->lim.pSessionEntry->limMlmState == eLIM_MLM_WT_FT_REASSOC_RSP_STATE))
@@ -1665,15 +1665,15 @@
}
break;
#endif
-#if defined(FEATURE_WLAN_CCX) && !defined(FEATURE_WLAN_CCX_UPLOAD)
+#if defined(FEATURE_WLAN_ESE) && !defined(FEATURE_WLAN_ESE_UPLOAD)
case eLIM_TSM_TIMER:
- if (tx_timer_deactivate(&pMac->lim.limTimers.gLimCcxTsmTimer)
+ if (tx_timer_deactivate(&pMac->lim.limTimers.gLimEseTsmTimer)
!= TX_SUCCESS)
{
limLog(pMac, LOGE, FL("Unable to deactivate TSM timer"));
}
break;
-#endif /* FEATURE_WLAN_CCX && !FEATURE_WLAN_CCX_UPLOAD */
+#endif /* FEATURE_WLAN_ESE && !FEATURE_WLAN_ESE_UPLOAD */
case eLIM_REMAIN_CHN_TIMER:
if (tx_timer_deactivate(&pMac->lim.limTimers.gLimRemainOnChannelTimer) != TX_SUCCESS)
{
diff --git a/CORE/MAC/src/pe/lim/limTimerUtils.h b/CORE/MAC/src/pe/lim/limTimerUtils.h
index eb69a91..9dc1c41 100644
--- a/CORE/MAC/src/pe/lim/limTimerUtils.h
+++ b/CORE/MAC/src/pe/lim/limTimerUtils.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.
*
@@ -70,7 +70,7 @@
#endif
eLIM_REMAIN_CHN_TIMER,
eLIM_PERIODIC_PROBE_REQ_TIMER,
-#ifdef FEATURE_WLAN_CCX
+#ifdef FEATURE_WLAN_ESE
eLIM_TSM_TIMER,
#endif
#ifdef FEATURE_WLAN_TDLS_INTERNAL
diff --git a/CORE/MAC/src/pe/lim/limTrace.c b/CORE/MAC/src/pe/lim/limTrace.c
index 48a7cd3..a48911c 100644
--- a/CORE/MAC/src/pe/lim/limTrace.c
+++ b/CORE/MAC/src/pe/lim/limTrace.c
@@ -1,10 +1,10 @@
/*
- * Copyright (c) 2012-2013 Qualcomm Atheros, Inc.
+ * Copyright (c) 2012-2014 Qualcomm Atheros, Inc.
* All Rights Reserved.
* Qualcomm Atheros Confidential and Proprietary.
*/
/**=========================================================================
-* Copyright (c) 2013 The Linux Foundation. All rights reserved.
+* Copyright (c) 2013-2014 The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
@@ -92,7 +92,7 @@
#endif
CASE_RETURN_STRING(eLIM_REMAIN_CHN_TIMER);
CASE_RETURN_STRING(eLIM_PERIODIC_PROBE_REQ_TIMER);
-#ifdef FEATURE_WLAN_CCX
+#ifdef FEATURE_WLAN_ESE
CASE_RETURN_STRING(eLIM_TSM_TIMER);
#endif
CASE_RETURN_STRING(eLIM_DISASSOC_ACK_TIMER);
diff --git a/CORE/MAC/src/pe/lim/limTypes.h b/CORE/MAC/src/pe/lim/limTypes.h
index 570d656..ebdf97a 100644
--- a/CORE/MAC/src/pe/lim/limTypes.h
+++ b/CORE/MAC/src/pe/lim/limTypes.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.
*
@@ -705,7 +705,7 @@
tSirRetStatus limSendRadioMeasureReportActionFrame(tpAniSirGlobal, tANI_U8, tANI_U8, tpSirMacRadioMeasureReport, tSirMacAddr, tpPESession);
#endif
-#if defined(FEATURE_WLAN_CCX) && !defined(FEATURE_WLAN_CCX_UPLOAD)
+#if defined(FEATURE_WLAN_ESE) && !defined(FEATURE_WLAN_ESE_UPLOAD)
void limProcessIappFrame(tpAniSirGlobal, tANI_U8 *,tpPESession);
#endif
diff --git a/CORE/MAC/src/pe/lim/limUtils.c b/CORE/MAC/src/pe/lim/limUtils.c
index b744f38..52f06d6 100644
--- a/CORE/MAC/src/pe/lim/limUtils.c
+++ b/CORE/MAC/src/pe/lim/limUtils.c
@@ -574,7 +574,7 @@
return "eWNI_SME_DELTS_RSP";
case eWNI_SME_DELTS_IND:
return "eWNI_SME_DELTS_IND";
-#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_REQ:
return "eWNI_SME_GET_ROAM_RSSI_REQ";
case eWNI_SME_GET_ROAM_RSSI_RSP:
@@ -693,12 +693,12 @@
return "eWNI_PMC_EXIT_BMPS_IND";
case eWNI_SME_SET_BCN_FILTER_REQ:
return "eWNI_SME_SET_BCN_FILTER_REQ";
-#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_REQ:
return "eWNI_SME_GET_TSM_STATS_REQ";
case eWNI_SME_GET_TSM_STATS_RSP:
return "eWNI_SME_GET_TSM_STATS_RSP";
-#endif /* FEATURE_WLAN_CCX && FEATURE_WLAN_CCX_UPLOAD */
+#endif /* FEATURE_WLAN_ESE && FEATURE_WLAN_ESE_UPLOAD */
default:
return "INVALID SME message";
}
@@ -1095,11 +1095,11 @@
tx_timer_deactivate(&pMac->lim.limTimers.gLimRemainOnChannelTimer);
tx_timer_delete(&pMac->lim.limTimers.gLimRemainOnChannelTimer);
-#if defined(FEATURE_WLAN_CCX) && !defined(FEATURE_WLAN_CCX_UPLOAD)
+#if defined(FEATURE_WLAN_ESE) && !defined(FEATURE_WLAN_ESE_UPLOAD)
// Deactivate and delete TSM
- tx_timer_deactivate(&pMac->lim.limTimers.gLimCcxTsmTimer);
- tx_timer_delete(&pMac->lim.limTimers.gLimCcxTsmTimer);
-#endif /* FEATURE_WLAN_CCX && !FEATURE_WLAN_CCX_UPLOAD */
+ tx_timer_deactivate(&pMac->lim.limTimers.gLimEseTsmTimer);
+ tx_timer_delete(&pMac->lim.limTimers.gLimEseTsmTimer);
+#endif /* FEATURE_WLAN_ESE && !FEATURE_WLAN_ESE_UPLOAD */
tx_timer_deactivate(&pMac->lim.limTimers.gLimDisassocAckTimer);
tx_timer_delete(&pMac->lim.limTimers.gLimDisassocAckTimer);
diff --git a/CORE/MAC/src/pe/lim/limUtils.h b/CORE/MAC/src/pe/lim/limUtils.h
index 04672ef..c24940a 100644
--- a/CORE/MAC/src/pe/lim/limUtils.h
+++ b/CORE/MAC/src/pe/lim/limUtils.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.
*
@@ -55,7 +55,7 @@
#define LIM_AID_MASK 0xC000
#define LIM_SPECTRUM_MANAGEMENT_BIT_MASK 0x0100
#define LIM_RRM_BIT_MASK 0x1000
-#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 LIM_MAX_REASSOC_RETRY_LIMIT 2
#endif
@@ -111,7 +111,7 @@
void limPrintMsgInfo(tpAniSirGlobal pMac, tANI_U16 logLevel, tSirMsgQ *msg);
char* limBssTypeStr(tSirBssType bssType);
-#if defined FEATURE_WLAN_CCX || defined WLAN_FEATURE_VOWIFI
+#if defined FEATURE_WLAN_ESE || defined WLAN_FEATURE_VOWIFI
extern tSirRetStatus limSendSetMaxTxPowerReq ( tpAniSirGlobal pMac,
tPowerdBm txPower,
tpPESession pSessionEntry );