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/inc/aniGlobal.h b/CORE/MAC/inc/aniGlobal.h
index 020c71c..45c6e2e 100644
--- a/CORE/MAC/inc/aniGlobal.h
+++ b/CORE/MAC/inc/aniGlobal.h
@@ -85,9 +85,9 @@
#include "smeRrmInternal.h"
#include "rrmGlobal.h"
#endif
-#if defined(FEATURE_WLAN_CCX) && !defined(FEATURE_WLAN_CCX_UPLOAD)
-#include "ccxApi.h"
-#include "ccxGlobal.h"
+#if defined(FEATURE_WLAN_ESE) && !defined(FEATURE_WLAN_ESE_UPLOAD)
+#include "eseApi.h"
+#include "eseGlobal.h"
#endif
#include "p2p_Api.h"
@@ -230,8 +230,8 @@
TX_TIMER gLimFTPreAuthRspTimer;
#endif
-#ifdef FEATURE_WLAN_CCX
- TX_TIMER gLimCcxTsmTimer;
+#ifdef FEATURE_WLAN_ESE
+ TX_TIMER gLimEseTsmTimer;
#endif
TX_TIMER gLimRemainOnChannelTimer;
#ifdef FEATURE_WLAN_TDLS_INTERNAL
@@ -905,7 +905,7 @@
tANI_U32 mgmtFrameSessionId;
tSirBackgroundScanMode gLimBackgroundScanMode;
-#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)
tpPESession pSessionEntry;
tANI_U8 reAssocRetryAttempt;
#endif
diff --git a/CORE/MAC/inc/aniSystemDefs.h b/CORE/MAC/inc/aniSystemDefs.h
index 9156bc5..7c0aded 100644
--- a/CORE/MAC/inc/aniSystemDefs.h
+++ b/CORE/MAC/inc/aniSystemDefs.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.
*
@@ -84,7 +84,7 @@
#if defined WLAN_FEATURE_VOWIFI_11R
eSIR_FT_AUTH,
#endif
-#if defined FEATURE_WLAN_CCX
+#if defined FEATURE_WLAN_ESE
eSIR_LEAP_AUTH = 0x80,
#endif
eSIR_AUTO_SWITCH,
@@ -162,7 +162,7 @@
tANI_U8 addIEdata[SIR_MAC_MAX_IE_LENGTH+2];
} tSirAddie, *tpSirAddie;
-#ifdef FEATURE_WLAN_CCX
+#ifdef FEATURE_WLAN_ESE
// The CCKM IE needs to be in the
// Join and Reassoc Req.
diff --git a/CORE/MAC/inc/sirApi.h b/CORE/MAC/inc/sirApi.h
index bb58484..f182a2b 100644
--- a/CORE/MAC/inc/sirApi.h
+++ b/CORE/MAC/inc/sirApi.h
@@ -45,8 +45,8 @@
#include "aniSystemDefs.h"
#include "sirParams.h"
-#if defined(FEATURE_WLAN_CCX) && !defined(FEATURE_WLAN_CCX_UPLOAD)
-#include "ccxGlobal.h"
+#if defined(FEATURE_WLAN_ESE) && !defined(FEATURE_WLAN_ESE_UPLOAD)
+#include "eseGlobal.h"
#endif
/// Maximum number of STAs allowed in the BSS
@@ -200,6 +200,7 @@
{
eSIR_PASSIVE_SCAN,
eSIR_ACTIVE_SCAN,
+ eSIR_BEACON_TABLE,
} tSirScanType;
/// Result codes Firmware return to Host SW
@@ -697,7 +698,7 @@
tANI_U8 mdiePresent;
tANI_U8 mdie[SIR_MDIE_SIZE]; // MDIE for 11r, picked from the beacons
#endif
-#ifdef FEATURE_WLAN_CCX
+#ifdef FEATURE_WLAN_ESE
tANI_U16 QBSSLoad_present;
tANI_U16 QBSSLoad_avail;
#endif
@@ -734,7 +735,7 @@
typedef struct sSirChannelList
{
tANI_U8 numChannels;
- tANI_U8 channelNumber[SIR_CCX_MAX_MEAS_IE_REQS];
+ tANI_U8 channelNumber[SIR_ESE_MAX_MEAS_IE_REQS];
} tSirChannelList, *tpSirChannelList;
typedef struct sSirDFSChannelList
@@ -743,17 +744,17 @@
} tSirDFSChannelList, *tpSirDFSChannelList;
-#ifdef FEATURE_WLAN_CCX
+#ifdef FEATURE_WLAN_ESE
typedef struct sTspecInfo {
tANI_U8 valid;
tSirMacTspecIE tspec;
} tTspecInfo;
-#define SIR_CCX_MAX_TSPEC_IES 4
-typedef struct sCCXTspecTspecInfo {
+#define SIR_ESE_MAX_TSPEC_IES 4
+typedef struct sESETspecTspecInfo {
tANI_U8 numTspecs;
- tTspecInfo tspec[SIR_CCX_MAX_TSPEC_IES];
-} tCCXTspecInfo;
+ tTspecInfo tspec[SIR_ESE_MAX_TSPEC_IES];
+} tESETspecInfo;
#endif
@@ -1033,7 +1034,7 @@
tSirMacRateSet extendedRateSet; // Has 11g rates
tSirRSNie rsnIE; // RSN IE to be sent in
// (Re) Association Request
-#ifdef FEATURE_WLAN_CCX
+#ifdef FEATURE_WLAN_ESE
tSirCCKMie cckmIE; // CCMK IE to be included as handler for join and reassoc is
// the same. The join will never carry cckm, but will be set to
// 0.
@@ -1056,13 +1057,13 @@
#ifdef WLAN_FEATURE_VOWIFI_11R
tAniBool is11Rconnection;
#endif
-#ifdef FEATURE_WLAN_CCX
- tAniBool isCCXFeatureIniEnabled;
- tAniBool isCCXconnection;
- tCCXTspecInfo ccxTspecInfo;
+#ifdef FEATURE_WLAN_ESE
+ tAniBool isESEFeatureIniEnabled;
+ tAniBool isESEconnection;
+ tESETspecInfo eseTspecInfo;
#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)
tAniBool isFastTransitionEnabled;
#endif
#ifdef FEATURE_WLAN_LFR
@@ -1104,7 +1105,7 @@
#ifdef WLAN_FEATURE_VOWIFI_11R
tANI_U32 parsedRicRspLen;
#endif
-#ifdef FEATURE_WLAN_CCX
+#ifdef FEATURE_WLAN_ESE
tANI_U32 tspecIeLen;
#endif
tANI_U32 staId;//Station ID for peer
@@ -2138,7 +2139,7 @@
void *pDevContext; //device context
} tAniGetSnrReq, *tpAniGetSnrReq;
-#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)
typedef struct sAniGetRoamRssiRsp
{
// Common for all types are responses
@@ -2154,7 +2155,7 @@
#endif
-#if defined(FEATURE_WLAN_CCX) || defined(FEATURE_WLAN_CCX_UPLOAD)
+#if defined(FEATURE_WLAN_ESE) || defined(FEATURE_WLAN_ESE_UPLOAD)
typedef struct sSirTsmIE
{
@@ -2206,22 +2207,22 @@
void *tsmStatsReq; //tsm stats request backup
} tAniGetTsmStatsRsp, *tpAniGetTsmStatsRsp;
-typedef struct sSirCcxBcnReportBssInfo
+typedef struct sSirEseBcnReportBssInfo
{
tBcnReportFields bcnReportFields;
tANI_U8 ieLen;
tANI_U8 *pBuf;
-} tSirCcxBcnReportBssInfo, *tpSirCcxBcnReportBssInfo;
+} tSirEseBcnReportBssInfo, *tpSirEseBcnReportBssInfo;
-typedef struct sSirCcxBcnReportRsp
+typedef struct sSirEseBcnReportRsp
{
tANI_U16 measurementToken;
tANI_U8 flag; /* Flag to report measurement done and more data */
tANI_U8 numBss;
- tSirCcxBcnReportBssInfo bcnRepBssInfo[SIR_BCN_REPORT_MAX_BSS_DESC];
-} tSirCcxBcnReportRsp, *tpSirCcxBcnReportRsp;
+ tSirEseBcnReportBssInfo bcnRepBssInfo[SIR_BCN_REPORT_MAX_BSS_DESC];
+} tSirEseBcnReportRsp, *tpSirEseBcnReportRsp;
-#endif /* FEATURE_WLAN_CCX || FEATURE_WLAN_CCX_UPLOAD */
+#endif /* FEATURE_WLAN_ESE || FEATURE_WLAN_ESE_UPLOAD */
/* Change country code request MSG structure */
typedef struct sAniChangeCountryCodeReq
@@ -2509,22 +2510,22 @@
} __ani_attr_packed tSirTclasInfo;
-#if defined(FEATURE_WLAN_CCX) || defined(FEATURE_WLAN_CCX_UPLOAD)
+#if defined(FEATURE_WLAN_ESE) || defined(FEATURE_WLAN_ESE_UPLOAD)
#define TSRS_11AG_RATE_6MBPS 0xC
#define TSRS_11B_RATE_5_5MBPS 0xB
-typedef struct sSirMacCCXTSRSIE
+typedef struct sSirMacESETSRSIE
{
tANI_U8 tsid;
tANI_U8 rates[8];
-} tSirMacCCXTSRSIE;
+} tSirMacESETSRSIE;
-typedef struct sSirMacCCXTSMIE
+typedef struct sSirMacESETSMIE
{
tANI_U8 tsid;
tANI_U8 state;
tANI_U16 msmt_interval;
-} tSirMacCCXTSMIE;
+} tSirMacESETSMIE;
typedef struct sTSMStats
{
@@ -2533,23 +2534,23 @@
tTrafStrmMetrics tsmMetrics;
} tTSMStats, *tpTSMStats;
-typedef struct sCcxTSMContext
+typedef struct sEseTSMContext
{
tANI_U8 tid;
- tSirMacCCXTSMIE tsmInfo;
+ tSirMacESETSMIE tsmInfo;
tTrafStrmMetrics tsmMetrics;
-} tCcxTSMContext, *tpCcxTSMContext;
+} tEseTSMContext, *tpEseTSMContext;
-typedef struct sCcxPEContext
+typedef struct sEsePEContext
{
-#if defined(FEATURE_WLAN_CCX) && !defined(FEATURE_WLAN_CCX_UPLOAD)
- tCcxMeasReq curMeasReq;
+#if defined(FEATURE_WLAN_ESE) && !defined(FEATURE_WLAN_ESE_UPLOAD)
+ tEseMeasReq curMeasReq;
#endif
- tCcxTSMContext tsm;
-} tCcxPEContext, *tpCcxPEContext;
+ tEseTSMContext tsm;
+} tEsePEContext, *tpEsePEContext;
-#endif /* FEATURE_WLAN_CCX && FEATURE_WLAN_CCX_UPLOAD */
+#endif /* FEATURE_WLAN_ESE && FEATURE_WLAN_ESE_UPLOAD */
typedef struct sSirAddtsReqInfo
@@ -2560,8 +2561,8 @@
tANI_U8 numTclas; // number of Tclas elements
tSirTclasInfo tclasInfo[SIR_MAC_TCLASIE_MAXNUM];
tANI_U8 tclasProc;
-#if defined(FEATURE_WLAN_CCX)
- tSirMacCCXTSRSIE tsrsIE;
+#if defined(FEATURE_WLAN_ESE)
+ tSirMacESETSRSIE tsrsIE;
tANI_U8 tsrsPresent:1;
#endif
tANI_U8 wmeTspecPresent:1;
@@ -2581,8 +2582,8 @@
tSirTclasInfo tclasInfo[SIR_MAC_TCLASIE_MAXNUM];
tANI_U8 tclasProc;
tSirMacScheduleIE schedule;
-#if defined(FEATURE_WLAN_CCX) || defined(FEATURE_WLAN_CCX_UPLOAD)
- tSirMacCCXTSMIE tsmIE;
+#if defined(FEATURE_WLAN_ESE) || defined(FEATURE_WLAN_ESE_UPLOAD)
+ tSirMacESETSMIE tsmIE;
tANI_U8 tsmPresent:1;
#endif
tANI_U8 wmeTspecPresent:1;
@@ -2649,7 +2650,7 @@
tSirDeltsReqInfo rsp;
} tSirDeltsRsp, *tpSirDeltsRsp;
-#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 SIR_QOS_NUM_TSPEC_MAX 2
#define SIR_QOS_NUM_AC_MAX 4
@@ -2686,7 +2687,7 @@
tSirAggrQosRspInfo aggrInfo;
} tSirAggrQosRsp, *tpSirAggrQosRsp;
-#endif/*WLAN_FEATURE_VOWIFI_11R || FEATURE_WLAN_CCX*/
+#endif/*WLAN_FEATURE_VOWIFI_11R || FEATURE_WLAN_ESE*/
typedef struct sSirSetTxPowerReq
{
@@ -3793,7 +3794,7 @@
tANI_U16 EmptyRefreshScanPeriod;
tANI_U8 ValidChannelCount;
tANI_U8 ValidChannelList[SIR_ROAM_MAX_CHANNELS];
- eAniBoolean IsCCXEnabled;
+ eAniBoolean IsESEEnabled;
tANI_U16 us24GProbeTemplateLen;
tANI_U8 p24GProbeTemplate[SIR_ROAM_SCAN_MAX_PB_REQ_SIZE];
tANI_U16 us5GProbeTemplateLen;
diff --git a/CORE/MAC/inc/sirMacProtDef.h b/CORE/MAC/inc/sirMacProtDef.h
index ce72338..6f1cfb6 100644
--- a/CORE/MAC/inc/sirMacProtDef.h
+++ b/CORE/MAC/inc/sirMacProtDef.h
@@ -426,9 +426,9 @@
#define SIR_MAC_RSN_IE_MIN_LENGTH 2
#define SIR_MAC_WPA_IE_MIN_LENGTH 6
-#ifdef FEATURE_WLAN_CCX
-#define CCX_VERSION_4 4
-#define CCX_VERSION_SUPPORTED CCX_VERSION_4
+#ifdef FEATURE_WLAN_ESE
+#define ESE_VERSION_4 4
+#define ESE_VERSION_SUPPORTED ESE_VERSION_4
// When station sends Radio Management Cap.
// State should be normal=1
@@ -714,11 +714,11 @@
eSIR_MAC_DSSS_CCK_RATE_MUST_SUPPORT_STATUS = 52, //FIXME:
eSIR_MAC_DSSS_CCK_RATE_NOT_SUPPORT_STATUS = 53,
eSIR_MAC_PSMP_CONTROLLED_ACCESS_ONLY_STATUS = 54,
-#ifdef FEATURE_WLAN_CCX
- eSIR_MAC_CCX_UNSPECIFIED_QOS_FAILURE_STATUS = 200, //CCX-Unspecified, QoS related failure in (Re)Assoc response frames
- eSIR_MAC_CCX_TSPEC_REQ_REFUSED_STATUS = 201, //CCX-TSPEC request refused due to AP's policy configuration in AddTs Rsp, (Re)Assoc Rsp.
- eSIR_MAC_CCX_ASSOC_DENIED_INSUFF_BW_STATUS = 202, //CCX-Assoc denied due to insufficient bandwidth to handle new TS in (Re)Assoc Rsp.
- eSIR_MAC_CCX_INVALID_PARAMETERS_STATUS = 203, //CCX-Invalid parameters. (Re)Assoc request had one or more TSPEC parameters with
+#ifdef FEATURE_WLAN_ESE
+ eSIR_MAC_ESE_UNSPECIFIED_QOS_FAILURE_STATUS = 200, //ESE-Unspecified, QoS related failure in (Re)Assoc response frames
+ eSIR_MAC_ESE_TSPEC_REQ_REFUSED_STATUS = 201, //ESE-TSPEC request refused due to AP's policy configuration in AddTs Rsp, (Re)Assoc Rsp.
+ eSIR_MAC_ESE_ASSOC_DENIED_INSUFF_BW_STATUS = 202, //ESE-Assoc denied due to insufficient bandwidth to handle new TS in (Re)Assoc Rsp.
+ eSIR_MAC_ESE_INVALID_PARAMETERS_STATUS = 203, //ESE-Invalid parameters. (Re)Assoc request had one or more TSPEC parameters with
//invalid values.
#endif
@@ -2423,7 +2423,7 @@
tANI_U8 actionID;
} __ani_attr_packed tSirMacActionFrameHdr, *tpSirMacActionFrameHdr;
-#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)
typedef __ani_attr_pre_packed struct sSirMacVendorSpecificFrameHdr
{
tANI_U8 category;
diff --git a/CORE/MAC/inc/wniApi.h b/CORE/MAC/inc/wniApi.h
index 5faa3fa..086e44f 100644
--- a/CORE/MAC/inc/wniApi.h
+++ b/CORE/MAC/inc/wniApi.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.
*
@@ -294,8 +294,8 @@
eWNI_SME_FT_AGGR_QOS_RSP,
#endif
-#if defined FEATURE_WLAN_CCX
- eWNI_SME_CCX_ADJACENT_AP_REPORT,
+#if defined FEATURE_WLAN_ESE
+ eWNI_SME_ESE_ADJACENT_AP_REPORT,
#endif
eWNI_SME_REGISTER_MGMT_FRAME_REQ,