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/inc/csrApi.h b/CORE/SME/inc/csrApi.h
index a8080c2..8b2c091 100644
--- a/CORE/SME/inc/csrApi.h
+++ b/CORE/SME/inc/csrApi.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.
*
@@ -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.
*
@@ -63,10 +63,10 @@
eCSR_AUTH_TYPE_WAPI_WAI_CERTIFICATE,
eCSR_AUTH_TYPE_WAPI_WAI_PSK,
#endif /* FEATURE_WLAN_WAPI */
-#ifdef FEATURE_WLAN_CCX
+#ifdef FEATURE_WLAN_ESE
eCSR_AUTH_TYPE_CCKM_WPA,
eCSR_AUTH_TYPE_CCKM_RSN,
-#endif /* FEATURE_WLAN_CCX */
+#endif /* FEATURE_WLAN_ESE */
#ifdef WLAN_FEATURE_11W
eCSR_AUTH_TYPE_RSN_PSK_SHA256,
#endif
@@ -90,9 +90,9 @@
#ifdef FEATURE_WLAN_WAPI
eCSR_ENCRYPT_TYPE_WPI, //WAPI
#endif /* FEATURE_WLAN_WAPI */
-#ifdef FEATURE_WLAN_CCX
+#ifdef FEATURE_WLAN_ESE
eCSR_ENCRYPT_TYPE_KRK,
-#endif /* FEATURE_WLAN_CCX */
+#endif /* FEATURE_WLAN_ESE */
#ifdef WLAN_FEATURE_11W
//11w BIP
eCSR_ENCRYPT_TYPE_AES_CMAC,
@@ -216,7 +216,7 @@
#else
#define CSR_MAX_KEY_LEN ( CSR_TKIP_KEY_LEN ) //longest one is for TKIP
#endif /* FEATURE_WLAN_WAPI */
-#ifdef FEATURE_WLAN_CCX
+#ifdef FEATURE_WLAN_ESE
#define CSR_KRK_KEY_LEN 16
#endif
@@ -334,24 +334,24 @@
} tCsrMobilityDomainInfo;
#endif
-#ifdef FEATURE_WLAN_CCX
-typedef struct tagCsrCcxCckmInfo
+#ifdef FEATURE_WLAN_ESE
+typedef struct tagCsrEseCckmInfo
{
tANI_U32 reassoc_req_num;
tANI_BOOLEAN krk_plumbed;
tANI_U8 krk[CSR_KRK_KEY_LEN];
-} tCsrCcxCckmInfo;
+} tCsrEseCckmInfo;
#endif
-#if defined(FEATURE_WLAN_CCX) && defined(FEATURE_WLAN_CCX_UPLOAD)
+#if defined(FEATURE_WLAN_ESE) && defined(FEATURE_WLAN_ESE_UPLOAD)
#define CSR_DOT11F_IE_RSN_MAX_LEN (114) /*TODO: duplicate one in dot11f.h */
-typedef struct tagCsrCcxCckmIe
+typedef struct tagCsrEseCckmIe
{
tANI_U8 cckmIe[CSR_DOT11F_IE_RSN_MAX_LEN];
tANI_U8 cckmIeLen;
-} tCsrCcxCckmIe;
-#endif /* FEATURE_WLAN_CCX && FEATURE_WLAN_CCX_UPLOAD */
+} tCsrEseCckmIe;
+#endif /* FEATURE_WLAN_ESE && FEATURE_WLAN_ESE_UPLOAD */
typedef struct tagCsrScanResultFilter
{
@@ -477,12 +477,16 @@
eCSR_ROAM_UNPROT_MGMT_FRAME_IND,
#endif
-#if defined(FEATURE_WLAN_CCX) && defined(FEATURE_WLAN_CCX_UPLOAD)
+#ifdef FEATURE_CESIUM_PROPRIETARY
+ eCSR_ROAM_IBSS_PEER_INFO_COMPLETE,
+#endif
+
+#if defined(FEATURE_WLAN_ESE) && defined(FEATURE_WLAN_ESE_UPLOAD)
eCSR_ROAM_TSM_IE_IND,
eCSR_ROAM_CCKM_PREAUTH_NOTIFY,
- eCSR_ROAM_CCX_ADJ_AP_REPORT_IND,
- eCSR_ROAM_CCX_BCN_REPORT_IND,
-#endif /* FEATURE_WLAN_CCX && FEATURE_WLAN_CCX_UPLOAD */
+ eCSR_ROAM_ESE_ADJ_AP_REPORT_IND,
+ eCSR_ROAM_ESE_BCN_REPORT_IND,
+#endif /* FEATURE_WLAN_ESE && FEATURE_WLAN_ESE_UPLOAD */
}eRoamCmdStatus;
@@ -943,9 +947,9 @@
tCsrMobilityDomainInfo MDID;
#endif
-#ifdef FEATURE_WLAN_CCX
- tCsrCcxCckmInfo ccxCckmInfo;
- tANI_BOOLEAN isCCXAssoc;
+#ifdef FEATURE_WLAN_ESE
+ tCsrEseCckmInfo eseCckmInfo;
+ tANI_BOOLEAN isESEAssoc;
#endif
tANI_U32 dot11Mode;
}tCsrRoamConnectedProfile;
@@ -1059,15 +1063,15 @@
#ifdef WLAN_FEATURE_VOWIFI_11R
tCsr11rConfigParams csr11rConfig;
#endif
-#ifdef FEATURE_WLAN_CCX
- tANI_U8 isCcxIniFeatureEnabled;
+#ifdef FEATURE_WLAN_ESE
+ tANI_U8 isEseIniFeatureEnabled;
#endif
#ifdef FEATURE_WLAN_LFR
tANI_U8 isFastRoamIniFeatureEnabled;
tANI_U8 MAWCEnabled;
#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)
tANI_U8 isFastTransitionEnabled;
tANI_U8 RoamRssiDiff;
tANI_U8 nImmediateRoamRssiDiff;
@@ -1113,7 +1117,7 @@
*/
tANI_BOOLEAN fFirstScanOnly2GChnl;
-#if defined (WLAN_FEATURE_VOWIFI_11R) || defined (FEATURE_WLAN_CCX) || defined(FEATURE_WLAN_LFR)
+#if defined (WLAN_FEATURE_VOWIFI_11R) || defined (FEATURE_WLAN_ESE) || defined(FEATURE_WLAN_LFR)
tANI_BOOLEAN nRoamPrefer5GHz;
tANI_BOOLEAN nRoamIntraBand;
tANI_U8 nProbes;
@@ -1190,14 +1194,14 @@
tANI_BOOLEAN wmmEnabledSta; //set to true if WMM enabled STA
tANI_U32 dtimPeriod;
-#ifdef FEATURE_WLAN_CCX
- tANI_BOOLEAN isCCXAssoc;
-#ifdef FEATURE_WLAN_CCX_UPLOAD
+#ifdef FEATURE_WLAN_ESE
+ tANI_BOOLEAN isESEAssoc;
+#ifdef FEATURE_WLAN_ESE_UPLOAD
tSirTsmIE tsmIe;
tANI_U32 timestamp[2];
tANI_U16 tsmRoamDelay;
- tSirCcxBcnReportRsp *pCcxBcnReportRsp;
-#endif /* FEATURE_WLAN_CCX_UPLOAD */
+ tSirEseBcnReportRsp *pEseBcnReportRsp;
+#endif /* FEATURE_WLAN_ESE_UPLOAD */
#endif
void* pRemainCtx;
tANI_U32 rxChan;
@@ -1423,21 +1427,21 @@
}tCsrHandoffRequest;
#endif
-#if defined(FEATURE_WLAN_CCX) && defined(FEATURE_WLAN_CCX_UPLOAD)
-typedef struct tagCsrCcxBeaconReqParams
+#if defined(FEATURE_WLAN_ESE) && defined(FEATURE_WLAN_ESE_UPLOAD)
+typedef struct tagCsrEseBeaconReqParams
{
tANI_U16 measurementToken;
tANI_U8 channel;
tANI_U8 scanMode;
tANI_U16 measurementDuration;
-} tCsrCcxBeaconReqParams, *tpCsrCcxBeaconReqParams;
+} tCsrEseBeaconReqParams, *tpCsrEseBeaconReqParams;
-typedef struct tagCsrCcxBeaconReq
+typedef struct tagCsrEseBeaconReq
{
tANI_U8 numBcnReqIe;
- tCsrCcxBeaconReqParams bcnReq[SIR_CCX_MAX_MEAS_IE_REQS];
-} tCsrCcxBeaconReq, *tpCsrCcxBeaconReq;
-#endif /* FEATURE_WLAN_CCX && FEATURE_WLAN_CCX_UPLOAD */
+ tCsrEseBeaconReqParams bcnReq[SIR_ESE_MAX_MEAS_IE_REQS];
+} tCsrEseBeaconReq, *tpCsrEseBeaconReq;
+#endif /* FEATURE_WLAN_ESE && FEATURE_WLAN_ESE_UPLOAD */
////////////////////////////////////////////Common SCAN starts
@@ -1581,7 +1585,7 @@
typedef void ( *tCsrRssiCallback) (v_S7_t rssi, tANI_U32 staId, void *pContext);
-#if defined(FEATURE_WLAN_CCX) && defined(FEATURE_WLAN_CCX_UPLOAD)
+#if defined(FEATURE_WLAN_ESE) && defined(FEATURE_WLAN_ESE_UPLOAD)
/*---------------------------------------------------------------------------
This is the type for a tsm stats callback to be registered with SME
for getting tsm stats
@@ -1593,7 +1597,7 @@
---------------------------------------------------------------------------*/
typedef void ( *tCsrTsmStatsCallback) (tAniTrafStrmMetrics tsmMetrics, tANI_U32 staId, void *pContext);
-#endif /* FEATURE_WLAN_CCX && FEATURE_WLAN_CCX_UPLOAD */
+#endif /* FEATURE_WLAN_ESE && FEATURE_WLAN_ESE_UPLOAD */
/*---------------------------------------------------------------------------
This is the type for a snr callback to be registered with SME