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/HDD/inc/wlan_hdd_cfg.h b/CORE/HDD/inc/wlan_hdd_cfg.h
index 6288286..1600402 100644
--- a/CORE/HDD/inc/wlan_hdd_cfg.h
+++ b/CORE/HDD/inc/wlan_hdd_cfg.h
@@ -351,7 +351,7 @@
#define CFG_RSSI_CATEGORY_GAP_MAX ( 100 )
#define CFG_RSSI_CATEGORY_GAP_DEFAULT ( 5 )
-#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 CFG_ROAM_PREFER_5GHZ "gRoamPrefer5GHz"
#define CFG_ROAM_PREFER_5GHZ_MIN ( 0 )
#define CFG_ROAM_PREFER_5GHZ_MAX ( 1 )
@@ -644,7 +644,7 @@
#define CFG_RSSI_FILTER_PERIOD_NAME "gRssiFilterPeriod"
#define CFG_RSSI_FILTER_PERIOD_MIN WNI_CFG_RSSI_FILTER_PERIOD_STAMIN
#define CFG_RSSI_FILTER_PERIOD_MAX WNI_CFG_RSSI_FILTER_PERIOD_STAMAX
-// Increased this value for Non-CCX AP. This is cause FW RSSI Monitoring
+// Increased this value for Non-ESE AP. This is cause FW RSSI Monitoring
// the consumer of this value is ON by default. So to impact power numbers
// we are setting this to a high value.
#define CFG_RSSI_FILTER_PERIOD_DEFAULT WNI_CFG_RSSI_FILTER_PERIOD_STADEF
@@ -755,17 +755,17 @@
#define CFG_QOS_WMM_INFRA_UAPSD_BK_SUS_INTV_MAX (4294967295UL)
#define CFG_QOS_WMM_INFRA_UAPSD_BK_SUS_INTV_DEFAULT (2000)
-#ifdef FEATURE_WLAN_CCX
+#ifdef FEATURE_WLAN_ESE
#define CFG_QOS_WMM_INFRA_INACTIVITY_INTERVAL_NAME "InfraInactivityInterval"
#define CFG_QOS_WMM_INFRA_INACTIVITY_INTERVAL_MIN (0)
#define CFG_QOS_WMM_INFRA_INACTIVITY_INTERVAL_MAX (4294967295UL)
#define CFG_QOS_WMM_INFRA_INACTIVITY_INTERVAL_DEFAULT (0) //disabled
-#define CFG_CCX_FEATURE_ENABLED_NAME "CcxEnabled"
-#define CFG_CCX_FEATURE_ENABLED_MIN (0)
-#define CFG_CCX_FEATURE_ENABLED_MAX (1)
-#define CFG_CCX_FEATURE_ENABLED_DEFAULT (0) //disabled
-#endif // FEATURE_WLAN_CCX
+#define CFG_ESE_FEATURE_ENABLED_NAME "EseEnabled"
+#define CFG_ESE_FEATURE_ENABLED_MIN (0)
+#define CFG_ESE_FEATURE_ENABLED_MAX (1)
+#define CFG_ESE_FEATURE_ENABLED_DEFAULT (0) //disabled
+#endif // FEATURE_WLAN_ESE
#ifdef FEATURE_WLAN_LFR
#define CFG_LFR_FEATURE_ENABLED_NAME "FastRoamEnabled"
@@ -779,13 +779,13 @@
#define CFG_LFR_MAWC_FEATURE_ENABLED_DEFAULT (0) /* disabled */
#endif // FEATURE_WLAN_LFR
-#if defined (WLAN_FEATURE_VOWIFI_11R) || defined (FEATURE_WLAN_CCX) || defined(FEATURE_WLAN_LFR)
-// This flag will control fasttransition in case of 11r and ccx.
+#if defined (WLAN_FEATURE_VOWIFI_11R) || defined (FEATURE_WLAN_ESE) || defined(FEATURE_WLAN_LFR)
+// This flag will control fasttransition in case of 11r and ESE.
// Basically with this the whole neighbor roam, pre-auth, reassoc
// can be turned ON/OFF.
// With this turned OFF 11r will completely not work.
// For 11r this flag has to be ON.
-// For CCX fastroam will not work.
+// For ESE fastroam will not work.
#define CFG_FAST_TRANSITION_ENABLED_NAME "FastTransitionEnabled"
#define CFG_FAST_TRANSITION_ENABLED_NAME_MIN (0)
#define CFG_FAST_TRANSITION_ENABLED_NAME_MAX (1)
@@ -831,7 +831,7 @@
#define CFG_ROAM_SCAN_HOME_AWAY_TIME_MIN (3)
#define CFG_ROAM_SCAN_HOME_AWAY_TIME_MAX (300)
#define CFG_ROAM_SCAN_HOME_AWAY_TIME_DEFAULT (CFG_ROAM_SCAN_HOME_AWAY_TIME_MIN)
-#endif /* (WLAN_FEATURE_VOWIFI_11R) || defined (FEATURE_WLAN_CCX) || defined(FEATURE_WLAN_LFR) */
+#endif /* (WLAN_FEATURE_VOWIFI_11R) || defined (FEATURE_WLAN_ESE) || defined(FEATURE_WLAN_LFR) */
#ifdef FEATURE_WLAN_OKC
#define CFG_OKC_FEATURE_ENABLED_NAME "OkcEnabled"
@@ -2291,11 +2291,11 @@
v_BOOL_t isFastRoamIniFeatureEnabled;
v_BOOL_t MAWCEnabled;
#endif
-#ifdef FEATURE_WLAN_CCX
+#ifdef FEATURE_WLAN_ESE
v_U32_t InfraInactivityInterval;
- v_BOOL_t isCcxIniFeatureEnabled;
+ v_BOOL_t isEseIniFeatureEnabled;
#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)
v_BOOL_t isFastTransitionEnabled;
v_U8_t RoamRssiDiff;
v_U8_t nImmediateRoamRssiDiff;
@@ -2412,7 +2412,7 @@
v_U8_t ShortGI40MhzEnable;
eHddLinkSpeedReportType reportMaxLinkSpeed;
v_S31_t linkSpeedRssiHigh;
-#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)
v_BOOL_t nRoamPrefer5GHz;
v_BOOL_t nRoamIntraBand;
v_U8_t nProbes;
diff --git a/CORE/HDD/inc/wlan_hdd_main.h b/CORE/HDD/inc/wlan_hdd_main.h
index 9b64efa..02d9e97 100644
--- a/CORE/HDD/inc/wlan_hdd_main.h
+++ b/CORE/HDD/inc/wlan_hdd_main.h
@@ -620,7 +620,7 @@
roaming_info_t roam_info;
-#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)
int ft_carrier_on;
#endif
@@ -1012,7 +1012,7 @@
eHDD_BATCH_SCAN_STATE batchScanState;
#endif
-#if defined(FEATURE_WLAN_CCX) && defined(FEATURE_WLAN_CCX_UPLOAD)
+#if defined(FEATURE_WLAN_ESE) && defined(FEATURE_WLAN_ESE_UPLOAD)
tAniTrafStrmMetrics tsmStats;
#endif
/* Flag to ensure PSB is configured through framework */
diff --git a/CORE/HDD/inc/wlan_hdd_wext.h b/CORE/HDD/inc/wlan_hdd_wext.h
index 2487e11..933b51e 100644
--- a/CORE/HDD/inc/wlan_hdd_wext.h
+++ b/CORE/HDD/inc/wlan_hdd_wext.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,9 +294,9 @@
v_U32_t oemDataReqID;
#endif
-#ifdef FEATURE_WLAN_CCX
- /* CCX state variables */
- v_BOOL_t isCCXConnection;
+#ifdef FEATURE_WLAN_ESE
+ /* ESE state variables */
+ v_BOOL_t isESEConnection;
eCsrAuthType collectedAuthType; /* Collected from ALL SIOCSIWAUTH Ioctls. Will be negotiatedAuthType - in tCsrProfile */
#endif
}hdd_wext_state_t;
@@ -407,7 +407,7 @@
#ifdef FEATURE_WLAN_TDLS
VOS_STATUS iw_set_tdls_params(struct net_device *dev, struct iw_request_info *info, union iwreq_data *wrqu, char *extra, int nOffset);
#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)
VOS_STATUS wlan_hdd_get_roam_rssi(hdd_adapter_t *pAdapter, v_S7_t *rssi_value);
#endif
diff --git a/CORE/HDD/inc/wlan_hdd_wmm.h b/CORE/HDD/inc/wlan_hdd_wmm.h
index 082fa1a..f14203c 100644
--- a/CORE/HDD/inc/wlan_hdd_wmm.h
+++ b/CORE/HDD/inc/wlan_hdd_wmm.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.
*
@@ -179,7 +179,7 @@
v_U32_t wmmAcUapsdSuspensionInterval;
sme_QosWmmDirType wmmAcUapsdDirection;
-#ifdef FEATURE_WLAN_CCX
+#ifdef FEATURE_WLAN_ESE
// Inactivity time parameters for TSPEC
v_U32_t wmmInactivityTime;
v_U32_t wmmPrevTrafficCnt;
diff --git a/CORE/HDD/src/wlan_hdd_assoc.c b/CORE/HDD/src/wlan_hdd_assoc.c
index 1861cc2..0e9b97f 100644
--- a/CORE/HDD/src/wlan_hdd_assoc.c
+++ b/CORE/HDD/src/wlan_hdd_assoc.c
@@ -78,9 +78,9 @@
v_U8_t ccpWpaOui03[ HDD_WPA_OUI_SIZE ] = { 0x00, 0x50, 0xf2, 0x03 };
v_U8_t ccpWpaOui04[ HDD_WPA_OUI_SIZE ] = { 0x00, 0x50, 0xf2, 0x04 };
v_U8_t ccpWpaOui05[ HDD_WPA_OUI_SIZE ] = { 0x00, 0x50, 0xf2, 0x05 };
-#ifdef FEATURE_WLAN_CCX
+#ifdef FEATURE_WLAN_ESE
v_U8_t ccpWpaOui06[ HDD_WPA_OUI_SIZE ] = { 0x00, 0x40, 0x96, 0x00 }; // CCKM
-#endif /* FEATURE_WLAN_CCX */
+#endif /* FEATURE_WLAN_ESE */
#define HDD_RSN_OUI_SIZE 4
v_U8_t ccpRSNOui00[ HDD_RSN_OUI_SIZE ] = { 0x00, 0x0F, 0xAC, 0x00 }; // group cipher
v_U8_t ccpRSNOui01[ HDD_RSN_OUI_SIZE ] = { 0x00, 0x0F, 0xAC, 0x01 }; // WEP-40 or RSN
@@ -88,9 +88,9 @@
v_U8_t ccpRSNOui03[ HDD_RSN_OUI_SIZE ] = { 0x00, 0x0F, 0xAC, 0x03 }; // Reserved
v_U8_t ccpRSNOui04[ HDD_RSN_OUI_SIZE ] = { 0x00, 0x0F, 0xAC, 0x04 }; // AES-CCMP
v_U8_t ccpRSNOui05[ HDD_RSN_OUI_SIZE ] = { 0x00, 0x0F, 0xAC, 0x05 }; // WEP-104
-#ifdef FEATURE_WLAN_CCX
+#ifdef FEATURE_WLAN_ESE
v_U8_t ccpRSNOui06[ HDD_RSN_OUI_SIZE ] = { 0x00, 0x40, 0x96, 0x00 }; // CCKM
-#endif /* FEATURE_WLAN_CCX */
+#endif /* FEATURE_WLAN_ESE */
#ifdef WLAN_FEATURE_11W
v_U8_t ccpRSNOui07[ HDD_RSN_OUI_SIZE ] = { 0x00, 0x0F, 0xAC, 0x06 }; // RSN-PSK-SHA256
#endif
@@ -110,15 +110,15 @@
tANI_U8 frameType );
#endif
-#if defined(FEATURE_WLAN_CCX) && defined(FEATURE_WLAN_CCX_UPLOAD)
+#if defined(FEATURE_WLAN_ESE) && defined(FEATURE_WLAN_ESE_UPLOAD)
static void hdd_indicateTsmIe(hdd_adapter_t *pAdapter, tANI_U8 tid,
tANI_U8 state,
tANI_U16 measInterval );
static void hdd_indicateCckmPreAuth(hdd_adapter_t *pAdapter, tCsrRoamInfo *pRoamInfo);
-static void hdd_indicateCcxAdjApRepInd(hdd_adapter_t *pAdapter, tCsrRoamInfo *pRoamInfo);
-static void hdd_indicateCcxBcnReportInd(const hdd_adapter_t *pAdapter, const tCsrRoamInfo *pRoamInfo);
+static void hdd_indicateEseAdjApRepInd(hdd_adapter_t *pAdapter, tCsrRoamInfo *pRoamInfo);
+static void hdd_indicateEseBcnReportInd(const hdd_adapter_t *pAdapter, const tCsrRoamInfo *pRoamInfo);
-#endif /* FEATURE_WLAN_CCX && FEATURE_WLAN_CCX_UPLOAD */
+#endif /* FEATURE_WLAN_ESE && FEATURE_WLAN_ESE_UPLOAD */
static eHalStatus hdd_RoamSetKeyCompleteHandler( hdd_adapter_t *pAdapter,
tCsrRoamInfo *pRoamInfo,
@@ -315,7 +315,7 @@
/*
* Send the 11R key information to the supplicant.
* Only then can the supplicant generate the PMK-R1.
- * (BTW, the CCX supplicant also needs the Assoc Resp IEs
+ * (BTW, the ESE supplicant also needs the Assoc Resp IEs
* for the same purpose.)
*
* Mainly the Assoc Rsp IEs are passed here. For the IMDA
@@ -493,10 +493,10 @@
#endif /* WLAN_FEATURE_VOWIFI_11R */
-#ifdef FEATURE_WLAN_CCX
+#ifdef FEATURE_WLAN_ESE
/*
- * Send the CCX required "new AP Channel info" to the supplicant.
+ * Send the ESE required "new AP Channel info" to the supplicant.
* (This keeps the supplicant "up to date" on the current channel.)
*
* The current (new AP) channel information is passed in.
@@ -525,7 +525,7 @@
wireless_send_event(pAdapter->dev, SIOCGIWFREQ, &wrqu, NULL);
}
-#endif /* FEATURE_WLAN_CCX */
+#endif /* FEATURE_WLAN_ESE */
void hdd_SendUpdateBeaconIEsEvent(hdd_adapter_t *pAdapter, tCsrRoamInfo *pCsrRoamInfo)
{
@@ -646,7 +646,7 @@
// Send FT Keys to the supplicant when FT is enabled
if ((pRoamProfile->AuthType.authType[0] == eCSR_AUTH_TYPE_FT_RSN_PSK) ||
(pRoamProfile->AuthType.authType[0] == eCSR_AUTH_TYPE_FT_RSN)
-#ifdef FEATURE_WLAN_CCX
+#ifdef FEATURE_WLAN_ESE
|| (pRoamProfile->AuthType.authType[0] == eCSR_AUTH_TYPE_CCKM_RSN) ||
(pRoamProfile->AuthType.authType[0] == eCSR_AUTH_TYPE_CCKM_WPA)
#endif
@@ -677,7 +677,7 @@
if(pHddCtx->isLoadUnloadInProgress != TRUE)
{
wireless_send_event(dev, we_event, &wrqu, msg);
-#ifdef FEATURE_WLAN_CCX
+#ifdef FEATURE_WLAN_ESE
if(eConnectionState_Associated == pHddStaCtx->conn_info.connState)/* Associated */
{
if ( (pRoamProfile->AuthType.authType[0] == eCSR_AUTH_TYPE_CCKM_RSN) ||
@@ -967,9 +967,9 @@
}
-#ifdef FEATURE_WLAN_CCX
- staDesc.ucIsCcxSta = pRoamInfo->isCCXAssoc;
-#endif //FEATURE_WLAN_CCX
+#ifdef FEATURE_WLAN_ESE
+ staDesc.ucIsEseSta = pRoamInfo->isESEAssoc;
+#endif //FEATURE_WLAN_ESE
#ifdef VOLANS_ENABLE_SW_REPLAY_CHECK
/* check whether replay check is valid for the station or not */
@@ -1159,7 +1159,7 @@
VOS_STATUS vosStatus;
v_U8_t reqRsnIe[DOT11F_IE_RSN_MAX_LEN];
tANI_U32 reqRsnLength = DOT11F_IE_RSN_MAX_LEN;
-#if defined (FEATURE_WLAN_CCX) || defined(FEATURE_WLAN_LFR) || defined (WLAN_FEATURE_VOWIFI_11R)
+#if defined (FEATURE_WLAN_ESE) || defined(FEATURE_WLAN_LFR) || defined (WLAN_FEATURE_VOWIFI_11R)
int ft_carrier_on = FALSE;
#endif
int status;
@@ -1195,7 +1195,7 @@
kernel. we have registered net device notifier for device change notification. With this we will come to
know that the device is getting activated properly.
*/
-#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 (pHddStaCtx->ft_carrier_on == FALSE)
{
#endif
@@ -1218,7 +1218,7 @@
// Disable Linkup Event Servicing - no more service required from the net device notifier call
pAdapter->isLinkUpSvcNeeded = FALSE;
-#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)
}
else {
pHddStaCtx->ft_carrier_on = FALSE;
@@ -1353,11 +1353,11 @@
pAdapter->sessionId,
&rspRsnLength,
rspRsnIe);
-#if defined (FEATURE_WLAN_CCX) || defined(FEATURE_WLAN_LFR)
+#if defined (FEATURE_WLAN_ESE) || defined(FEATURE_WLAN_LFR)
if(ft_carrier_on)
hdd_SendReAssocEvent(dev, pAdapter, pRoamInfo, reqRsnIe, reqRsnLength);
else
-#endif /* FEATURE_WLAN_CCX */
+#endif /* FEATURE_WLAN_ESE */
{
hddLog(VOS_TRACE_LEVEL_INFO,
@@ -2452,8 +2452,8 @@
}
break;
-#if defined (WLAN_FEATURE_VOWIFI_11R) || defined (FEATURE_WLAN_CCX) || defined(FEATURE_WLAN_LFR)
- /* We did pre-auth,then we attempted a 11r or ccx reassoc.
+#if defined (WLAN_FEATURE_VOWIFI_11R) || defined (FEATURE_WLAN_ESE) || defined(FEATURE_WLAN_LFR)
+ /* We did pre-auth,then we attempted a 11r or ese reassoc.
* reassoc failed due to failure, timeout, reject from ap
* in any case tell the OS, our carrier is off and mark
* interface down */
@@ -2469,7 +2469,7 @@
break;
case eCSR_ROAM_FT_START:
- // When we roam for CCX and 11r, we dont want the
+ // When we roam for EsE and 11r, we dont want the
// OS to be informed that the link is down. So mark
// the link ready for ft_start. After this the
// eCSR_ROAM_SHOULD_ROAM will be received.
@@ -2513,16 +2513,16 @@
hdd_station_ctx_t *pHddStaCtx = WLAN_HDD_GET_STATION_CTX_PTR(pAdapter);
// notify apps that we can't pass traffic anymore
netif_tx_disable(dev);
-#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 (pHddStaCtx->ft_carrier_on == FALSE)
{
#endif
netif_carrier_off(dev);
-#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)
}
#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))
//We should clear all sta register with TL, for now, only one.
status = hdd_roamDeregisterSTA( pAdapter, pHddStaCtx->conn_info.staId [0] );
if ( !VOS_IS_STATUS_SUCCESS(status ) )
@@ -2741,7 +2741,7 @@
pRoamInfo->frameType);
break;
#endif
-#if defined(FEATURE_WLAN_CCX) && defined(FEATURE_WLAN_CCX_UPLOAD)
+#if defined(FEATURE_WLAN_ESE) && defined(FEATURE_WLAN_ESE_UPLOAD)
case eCSR_ROAM_TSM_IE_IND:
hdd_indicateTsmIe(pAdapter, pRoamInfo->tsmIe.tsid,
pRoamInfo->tsmIe.state, pRoamInfo->tsmIe.msmt_interval);
@@ -2757,18 +2757,18 @@
break;
}
- case eCSR_ROAM_CCX_ADJ_AP_REPORT_IND:
+ case eCSR_ROAM_ESE_ADJ_AP_REPORT_IND:
{
- hdd_indicateCcxAdjApRepInd(pAdapter, pRoamInfo);
+ hdd_indicateEseAdjApRepInd(pAdapter, pRoamInfo);
break;
}
- case eCSR_ROAM_CCX_BCN_REPORT_IND:
+ case eCSR_ROAM_ESE_BCN_REPORT_IND:
{
- hdd_indicateCcxBcnReportInd(pAdapter, pRoamInfo);
+ hdd_indicateEseBcnReportInd(pAdapter, pRoamInfo);
break;
}
-#endif /* FEATURE_WLAN_CCX && FEATURE_WLAN_CCX_UPLOAD */
+#endif /* FEATURE_WLAN_ESE && FEATURE_WLAN_ESE_UPLOAD */
default:
break;
}
@@ -2798,12 +2798,12 @@
auth_type = eCSR_AUTH_TYPE_FT_RSN;
} else
#endif
-#ifdef FEATURE_WLAN_CCX
+#ifdef FEATURE_WLAN_ESE
if (memcmp(auth_suite , ccpRSNOui06, 4) == 0)
{
auth_type = eCSR_AUTH_TYPE_CCKM_RSN;
} else
-#endif /* FEATURE_WLAN_CCX */
+#endif /* FEATURE_WLAN_ESE */
#ifdef WLAN_FEATURE_11W
if (memcmp(auth_suite , ccpRSNOui07, 4) == 0)
{
@@ -2829,12 +2829,12 @@
{
auth_type = eCSR_AUTH_TYPE_WPA_PSK;
} else
-#ifdef FEATURE_WLAN_CCX
+#ifdef FEATURE_WLAN_ESE
if (memcmp(auth_suite , ccpWpaOui06, 4) == 0)
{
auth_type = eCSR_AUTH_TYPE_CCKM_WPA;
} else
-#endif /* FEATURE_WLAN_CCX */
+#endif /* FEATURE_WLAN_ESE */
{
auth_type = eCSR_AUTH_TYPE_UNKNOWN;
}
@@ -3144,7 +3144,7 @@
switch( pHddStaCtx->conn_info.authType)
{
case eCSR_AUTH_TYPE_OPEN_SYSTEM:
-#ifdef FEATURE_WLAN_CCX
+#ifdef FEATURE_WLAN_ESE
case eCSR_AUTH_TYPE_CCKM_WPA:
case eCSR_AUTH_TYPE_CCKM_RSN:
#endif
@@ -3154,7 +3154,7 @@
} else
if (pWextState->wpaVersion & IW_AUTH_WPA_VERSION_WPA) {
-#ifdef FEATURE_WLAN_CCX
+#ifdef FEATURE_WLAN_ESE
if ((RSNAuthType == eCSR_AUTH_TYPE_CCKM_WPA) &&
((pWextState->authKeyMgmt & IW_AUTH_KEY_MGMT_802_1X)
== IW_AUTH_KEY_MGMT_802_1X)) {
@@ -3178,7 +3178,7 @@
}
}
if (pWextState->wpaVersion & IW_AUTH_WPA_VERSION_WPA2) {
-#ifdef FEATURE_WLAN_CCX
+#ifdef FEATURE_WLAN_ESE
if ((RSNAuthType == eCSR_AUTH_TYPE_CCKM_RSN) &&
((pWextState->authKeyMgmt & IW_AUTH_KEY_MGMT_802_1X)
== IW_AUTH_KEY_MGMT_802_1X)) {
@@ -3229,9 +3229,9 @@
break;
default:
-#ifdef FEATURE_WLAN_CCX
+#ifdef FEATURE_WLAN_ESE
hddLog( LOG1, "%s: In default, unknown auth type.", __func__);
-#endif /* FEATURE_WLAN_CCX */
+#endif /* FEATURE_WLAN_ESE */
pRoamProfile->AuthType.authType[0] = eCSR_AUTH_TYPE_UNKNOWN;
break;
}
@@ -3607,7 +3607,7 @@
case IW_AUTH_KEY_MGMT:
{
-#ifdef FEATURE_WLAN_CCX
+#ifdef FEATURE_WLAN_ESE
#define IW_AUTH_KEY_MGMT_CCKM 8 /* Should be in linux/wireless.h */
/*Check for CCKM AKM type */
if ( wrqu->param.value & IW_AUTH_KEY_MGMT_CCKM) {
@@ -3620,7 +3620,7 @@
pWextState->authKeyMgmt |= IW_AUTH_KEY_MGMT_CCKM;
/*Set the key management to 802.1X*/
//pWextState->authKeyMgmt = IW_AUTH_KEY_MGMT_802_1X;
- pWextState->isCCXConnection = eANI_BOOLEAN_TRUE;
+ pWextState->isESEConnection = eANI_BOOLEAN_TRUE;
//This is test code. I need to actually KNOW whether this is an RSN Assoc or WPA.
pWextState->collectedAuthType = eCSR_AUTH_TYPE_CCKM_RSN;
} else if ( wrqu->param.value & IW_AUTH_KEY_MGMT_PSK) {
@@ -3643,7 +3643,7 @@
#else
/*Save the key management*/
pWextState->authKeyMgmt = wrqu->param.value;
-#endif /* FEATURE_WLAN_CCX */
+#endif /* FEATURE_WLAN_ESE */
}
break;
@@ -3950,7 +3950,7 @@
}
#endif
-#if defined (FEATURE_WLAN_CCX) && defined(FEATURE_WLAN_CCX_UPLOAD)
+#if defined (FEATURE_WLAN_ESE) && defined(FEATURE_WLAN_ESE_UPLOAD)
void hdd_indicateTsmIe(hdd_adapter_t *pAdapter, tANI_U8 tid,
tANI_U8 state,
tANI_U16 measInterval )
@@ -4015,7 +4015,7 @@
wireless_send_event(pAdapter->dev, IWEVCUSTOM, &wrqu, buf);
}
-void hdd_indicateCcxAdjApRepInd(hdd_adapter_t *pAdapter, tCsrRoamInfo *pRoamInfo)
+void hdd_indicateEseAdjApRepInd(hdd_adapter_t *pAdapter, tCsrRoamInfo *pRoamInfo)
{
union iwreq_data wrqu;
char buf[IW_CUSTOM_MAX + 1];
@@ -4039,7 +4039,7 @@
wireless_send_event(pAdapter->dev, IWEVCUSTOM, &wrqu, buf);
}
-void hdd_indicateCcxBcnReportInd(const hdd_adapter_t *pAdapter,
+void hdd_indicateEseBcnReportInd(const hdd_adapter_t *pAdapter,
const tCsrRoamInfo *pRoamInfo)
{
union iwreq_data wrqu;
@@ -4049,7 +4049,10 @@
tANI_U8 i = 0, len = 0;
tANI_U8 tot_bcn_ieLen = 0; /* total size of the beacon report data */
tANI_U8 lastSent = 0, sendBss = 0;
- int bcnRepFieldSize = sizeof(pRoamInfo->pCcxBcnReportRsp->bcnRepBssInfo[0].bcnReportFields);
+ int bcnRepFieldSize = sizeof(pRoamInfo->pEseBcnReportRsp->bcnRepBssInfo[0].bcnReportFields);
+ tANI_U8 ieLenByte = 1;
+ /* CCXBCNREP=meas_tok<sp>flag<sp>no_of_bss<sp>tot_bcn_ie_len = 18 bytes */
+#define ESEBCNREPHEADER_LEN (18)
if ((NULL == pAdapter) || (NULL == pRoamInfo))
return;
@@ -4063,7 +4066,7 @@
CCXBCNREP=meas_tok<sp>flag<sp>no_of_bss<sp>tot_bcn_ie_len = 18 bytes
*/
- if ((pRoamInfo->pCcxBcnReportRsp->flag >> 1) && (!pRoamInfo->pCcxBcnReportRsp->numBss))
+ if ((pRoamInfo->pEseBcnReportRsp->flag >> 1) && (!pRoamInfo->pEseBcnReportRsp->numBss))
{
hddLog(VOS_TRACE_LEVEL_INFO, "Measurement Done but no scan results");
/* If the measurement is none and no scan results found,
@@ -4072,12 +4075,12 @@
memset(buf, '\0', sizeof(buf));
hddLog(VOS_TRACE_LEVEL_INFO, "CCXBCNREP=%d %d %d %d",
- pRoamInfo->pCcxBcnReportRsp->measurementToken, pRoamInfo->pCcxBcnReportRsp->flag,
- pRoamInfo->pCcxBcnReportRsp->numBss, tot_bcn_ieLen);
+ pRoamInfo->pEseBcnReportRsp->measurementToken, pRoamInfo->pEseBcnReportRsp->flag,
+ pRoamInfo->pEseBcnReportRsp->numBss, tot_bcn_ieLen);
nBytes = snprintf(pos, freeBytes, "CCXBCNREP=%d %d %d",
- pRoamInfo->pCcxBcnReportRsp->measurementToken, pRoamInfo->pCcxBcnReportRsp->flag,
- pRoamInfo->pCcxBcnReportRsp->numBss);
+ pRoamInfo->pEseBcnReportRsp->measurementToken, pRoamInfo->pEseBcnReportRsp->flag,
+ pRoamInfo->pEseBcnReportRsp->numBss);
wrqu.data.pointer = buf;
wrqu.data.length = nBytes;
@@ -4086,7 +4089,7 @@
}
else
{
- while (lastSent < pRoamInfo->pCcxBcnReportRsp->numBss)
+ while (lastSent < pRoamInfo->pEseBcnReportRsp->numBss)
{
memset(&wrqu, '\0', sizeof(wrqu));
memset(buf, '\0', sizeof(buf));
@@ -4095,10 +4098,10 @@
pos = buf;
freeBytes = IW_CUSTOM_MAX;
- for (i = lastSent; i < pRoamInfo->pCcxBcnReportRsp->numBss; i++)
+ for (i = lastSent; i < pRoamInfo->pEseBcnReportRsp->numBss; i++)
{
- len = bcnRepFieldSize + 1 + pRoamInfo->pCcxBcnReportRsp->bcnRepBssInfo[i].ieLen;
- if ((len + tot_bcn_ieLen) > (IW_CUSTOM_MAX - 18))
+ len = bcnRepFieldSize + ieLenByte + pRoamInfo->pEseBcnReportRsp->bcnRepBssInfo[i].ieLen;
+ if ((len + tot_bcn_ieLen) > (IW_CUSTOM_MAX - ESEBCNREPHEADER_LEN))
{
break;
}
@@ -4107,18 +4110,18 @@
hddLog(VOS_TRACE_LEVEL_INFO, "i(%d) sizeof bcnReportFields(%d)"
"IeLength(%d) Length of Ie(%d) totLen(%d)",
i, bcnRepFieldSize, 1,
- pRoamInfo->pCcxBcnReportRsp->bcnRepBssInfo[i].ieLen,
+ pRoamInfo->pEseBcnReportRsp->bcnRepBssInfo[i].ieLen,
tot_bcn_ieLen);
}
hddLog(VOS_TRACE_LEVEL_INFO, "Sending %d BSS Info", sendBss);
hddLog(VOS_TRACE_LEVEL_INFO, "CCXBCNREP=%d %d %d %d",
- pRoamInfo->pCcxBcnReportRsp->measurementToken, pRoamInfo->pCcxBcnReportRsp->flag,
- pRoamInfo->pCcxBcnReportRsp->numBss, tot_bcn_ieLen);
+ pRoamInfo->pEseBcnReportRsp->measurementToken, pRoamInfo->pEseBcnReportRsp->flag,
+ sendBss, tot_bcn_ieLen);
nBytes = snprintf(pos, freeBytes, "CCXBCNREP=%d %d %d ",
- pRoamInfo->pCcxBcnReportRsp->measurementToken, pRoamInfo->pCcxBcnReportRsp->flag,
- pRoamInfo->pCcxBcnReportRsp->numBss);
+ pRoamInfo->pEseBcnReportRsp->measurementToken, pRoamInfo->pEseBcnReportRsp->flag,
+ sendBss);
pos += nBytes;
freeBytes -= nBytes;
@@ -4133,37 +4136,37 @@
" PhyType(%d) RecvSigPower(%d) ParentTSF(%u)"
" TargetTSF[0](%u) TargetTSF[1](%u) BeaconInterval(%u)"
" CapabilityInfo(%d) BSSID(%02X:%02X:%02X:%02X:%02X:%02X)",
- pRoamInfo->pCcxBcnReportRsp->bcnRepBssInfo[i+lastSent].bcnReportFields.ChanNum,
- pRoamInfo->pCcxBcnReportRsp->bcnRepBssInfo[i+lastSent].bcnReportFields.Spare,
- pRoamInfo->pCcxBcnReportRsp->bcnRepBssInfo[i+lastSent].bcnReportFields.MeasDuration,
- pRoamInfo->pCcxBcnReportRsp->bcnRepBssInfo[i+lastSent].bcnReportFields.PhyType,
- pRoamInfo->pCcxBcnReportRsp->bcnRepBssInfo[i+lastSent].bcnReportFields.RecvSigPower,
- pRoamInfo->pCcxBcnReportRsp->bcnRepBssInfo[i+lastSent].bcnReportFields.ParentTsf,
- pRoamInfo->pCcxBcnReportRsp->bcnRepBssInfo[i+lastSent].bcnReportFields.TargetTsf[0],
- pRoamInfo->pCcxBcnReportRsp->bcnRepBssInfo[i+lastSent].bcnReportFields.TargetTsf[1],
- pRoamInfo->pCcxBcnReportRsp->bcnRepBssInfo[i+lastSent].bcnReportFields.BcnInterval,
- pRoamInfo->pCcxBcnReportRsp->bcnRepBssInfo[i+lastSent].bcnReportFields.CapabilityInfo,
- pRoamInfo->pCcxBcnReportRsp->bcnRepBssInfo[i+lastSent].bcnReportFields.Bssid[0],
- pRoamInfo->pCcxBcnReportRsp->bcnRepBssInfo[i+lastSent].bcnReportFields.Bssid[1],
- pRoamInfo->pCcxBcnReportRsp->bcnRepBssInfo[i+lastSent].bcnReportFields.Bssid[2],
- pRoamInfo->pCcxBcnReportRsp->bcnRepBssInfo[i+lastSent].bcnReportFields.Bssid[3],
- pRoamInfo->pCcxBcnReportRsp->bcnRepBssInfo[i+lastSent].bcnReportFields.Bssid[4],
- pRoamInfo->pCcxBcnReportRsp->bcnRepBssInfo[i+lastSent].bcnReportFields.Bssid[5]);
+ pRoamInfo->pEseBcnReportRsp->bcnRepBssInfo[i+lastSent].bcnReportFields.ChanNum,
+ pRoamInfo->pEseBcnReportRsp->bcnRepBssInfo[i+lastSent].bcnReportFields.Spare,
+ pRoamInfo->pEseBcnReportRsp->bcnRepBssInfo[i+lastSent].bcnReportFields.MeasDuration,
+ pRoamInfo->pEseBcnReportRsp->bcnRepBssInfo[i+lastSent].bcnReportFields.PhyType,
+ pRoamInfo->pEseBcnReportRsp->bcnRepBssInfo[i+lastSent].bcnReportFields.RecvSigPower,
+ pRoamInfo->pEseBcnReportRsp->bcnRepBssInfo[i+lastSent].bcnReportFields.ParentTsf,
+ pRoamInfo->pEseBcnReportRsp->bcnRepBssInfo[i+lastSent].bcnReportFields.TargetTsf[0],
+ pRoamInfo->pEseBcnReportRsp->bcnRepBssInfo[i+lastSent].bcnReportFields.TargetTsf[1],
+ pRoamInfo->pEseBcnReportRsp->bcnRepBssInfo[i+lastSent].bcnReportFields.BcnInterval,
+ pRoamInfo->pEseBcnReportRsp->bcnRepBssInfo[i+lastSent].bcnReportFields.CapabilityInfo,
+ pRoamInfo->pEseBcnReportRsp->bcnRepBssInfo[i+lastSent].bcnReportFields.Bssid[0],
+ pRoamInfo->pEseBcnReportRsp->bcnRepBssInfo[i+lastSent].bcnReportFields.Bssid[1],
+ pRoamInfo->pEseBcnReportRsp->bcnRepBssInfo[i+lastSent].bcnReportFields.Bssid[2],
+ pRoamInfo->pEseBcnReportRsp->bcnRepBssInfo[i+lastSent].bcnReportFields.Bssid[3],
+ pRoamInfo->pEseBcnReportRsp->bcnRepBssInfo[i+lastSent].bcnReportFields.Bssid[4],
+ pRoamInfo->pEseBcnReportRsp->bcnRepBssInfo[i+lastSent].bcnReportFields.Bssid[5]);
/* bcn report fields are copied */
- len = sizeof(pRoamInfo->pCcxBcnReportRsp->bcnRepBssInfo[i+lastSent].bcnReportFields);
- vos_mem_copy(pos, (char*)&pRoamInfo->pCcxBcnReportRsp->bcnRepBssInfo[i+lastSent].bcnReportFields, len);
+ len = sizeof(pRoamInfo->pEseBcnReportRsp->bcnRepBssInfo[i+lastSent].bcnReportFields);
+ vos_mem_copy(pos, (char*)&pRoamInfo->pEseBcnReportRsp->bcnRepBssInfo[i+lastSent].bcnReportFields, len);
pos += len;
freeBytes -= len;
/* Add 1 byte of ie len */
- len = pRoamInfo->pCcxBcnReportRsp->bcnRepBssInfo[i+lastSent].ieLen;
+ len = pRoamInfo->pEseBcnReportRsp->bcnRepBssInfo[i+lastSent].ieLen;
vos_mem_copy(pos, (char*)&len, sizeof(len));
pos += sizeof(len);
freeBytes -= sizeof(len);
/* copy IE from scan results */
- vos_mem_copy(pos, (char*)pRoamInfo->pCcxBcnReportRsp->bcnRepBssInfo[i+lastSent].pBuf, len);
+ vos_mem_copy(pos, (char*)pRoamInfo->pEseBcnReportRsp->bcnRepBssInfo[i+lastSent].pBuf, len);
pos += len;
freeBytes -= len;
}
@@ -4178,5 +4181,5 @@
}
}
-#endif /* FEATURE_WLAN_CCX && FEATURE_WLAN_CCX_UPLOAD */
+#endif /* FEATURE_WLAN_ESE && FEATURE_WLAN_ESE_UPLOAD */
diff --git a/CORE/HDD/src/wlan_hdd_cfg.c b/CORE/HDD/src/wlan_hdd_cfg.c
index 6d32178..e5bce37 100644
--- a/CORE/HDD/src/wlan_hdd_cfg.c
+++ b/CORE/HDD/src/wlan_hdd_cfg.c
@@ -60,7 +60,7 @@
#include <pmcApi.h>
#include <wlan_hdd_misc.h>
-#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)
static void cbNotifySetRoamPrefer5GHz(hdd_context_t *pHddCtx, unsigned long NotifyId)
{
sme_UpdateRoamPrefer5GHz((tHalHandle)(pHddCtx->hHal), pHddCtx->cfg_ini->nRoamPrefer5GHz);
@@ -126,11 +126,11 @@
}
#endif
-#ifdef FEATURE_WLAN_CCX
-static void cbNotifySetCcxFeatureEnabled(hdd_context_t *pHddCtx, unsigned long NotifyId)
+#ifdef FEATURE_WLAN_ESE
+static void cbNotifySetEseFeatureEnabled(hdd_context_t *pHddCtx, unsigned long NotifyId)
{
// at the point this routine is called, the value in the cfg_ini table has already been updated
- sme_UpdateIsCcxFeatureEnabled((tHalHandle)(pHddCtx->hHal), pHddCtx->cfg_ini->isCcxIniFeatureEnabled );
+ sme_UpdateIsEseFeatureEnabled((tHalHandle)(pHddCtx->hHal), pHddCtx->cfg_ini->isEseIniFeatureEnabled );
}
#endif
@@ -1031,21 +1031,21 @@
CFG_QOS_WMM_INFRA_UAPSD_BK_SUS_INTV_MIN,
CFG_QOS_WMM_INFRA_UAPSD_BK_SUS_INTV_MAX ),
-#ifdef FEATURE_WLAN_CCX
+#ifdef FEATURE_WLAN_ESE
REG_VARIABLE( CFG_QOS_WMM_INFRA_INACTIVITY_INTERVAL_NAME, WLAN_PARAM_Integer,
hdd_config_t, InfraInactivityInterval,
VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT,
CFG_QOS_WMM_INFRA_INACTIVITY_INTERVAL_DEFAULT,
CFG_QOS_WMM_INFRA_INACTIVITY_INTERVAL_MIN,
CFG_QOS_WMM_INFRA_INACTIVITY_INTERVAL_MAX),
- REG_DYNAMIC_VARIABLE( CFG_CCX_FEATURE_ENABLED_NAME, WLAN_PARAM_Integer,
- hdd_config_t, isCcxIniFeatureEnabled,
+ REG_DYNAMIC_VARIABLE( CFG_ESE_FEATURE_ENABLED_NAME, WLAN_PARAM_Integer,
+ hdd_config_t, isEseIniFeatureEnabled,
VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT,
- CFG_CCX_FEATURE_ENABLED_DEFAULT,
- CFG_CCX_FEATURE_ENABLED_MIN,
- CFG_CCX_FEATURE_ENABLED_MAX,
- cbNotifySetCcxFeatureEnabled, 0 ),
-#endif // FEATURE_WLAN_CCX
+ CFG_ESE_FEATURE_ENABLED_DEFAULT,
+ CFG_ESE_FEATURE_ENABLED_MIN,
+ CFG_ESE_FEATURE_ENABLED_MAX,
+ cbNotifySetEseFeatureEnabled, 0 ),
+#endif // FEATURE_WLAN_ESE
#ifdef FEATURE_WLAN_LFR
// flag to turn ON/OFF Legacy Fast Roaming
@@ -1068,8 +1068,8 @@
#endif // FEATURE_WLAN_LFR
-#if defined (WLAN_FEATURE_VOWIFI_11R) || defined (FEATURE_WLAN_CCX) || defined(FEATURE_WLAN_LFR)
- // flag to turn ON/OFF 11r and CCX FastTransition
+#if defined (WLAN_FEATURE_VOWIFI_11R) || defined (FEATURE_WLAN_ESE) || defined(FEATURE_WLAN_LFR)
+ // flag to turn ON/OFF 11r and ESE FastTransition
REG_DYNAMIC_VARIABLE( CFG_FAST_TRANSITION_ENABLED_NAME, WLAN_PARAM_Integer,
hdd_config_t, isFastTransitionEnabled,
VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT,
@@ -2265,7 +2265,7 @@
CFG_LINK_SPEED_RSSI_LOW_MAX,
NULL, 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)
REG_DYNAMIC_VARIABLE( CFG_ROAM_PREFER_5GHZ, WLAN_PARAM_Integer,
hdd_config_t, nRoamPrefer5GHz,
VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT,
@@ -3180,9 +3180,9 @@
VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_INFO_HIGH, "Name = [InfraUapsdBkSrvIntv] Value = [%u] ",pHddCtx->cfg_ini->InfraUapsdBkSrvIntv);
VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_INFO_HIGH, "Name = [InfraUapsdBkSuspIntv] Value = [%u] ",pHddCtx->cfg_ini->InfraUapsdBkSuspIntv);
-#ifdef FEATURE_WLAN_CCX
+#ifdef FEATURE_WLAN_ESE
VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_INFO_HIGH, "Name = [InfraInactivityInterval] Value = [%u] ",pHddCtx->cfg_ini->InfraInactivityInterval);
- VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_INFO_HIGH, "Name = [CcxEnabled] Value = [%u] ",pHddCtx->cfg_ini->isCcxIniFeatureEnabled);
+ VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_INFO_HIGH, "Name = [EseEnabled] Value = [%u] ",pHddCtx->cfg_ini->isEseIniFeatureEnabled);
VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_INFO_HIGH, "Name = [FastTransitionEnabled] Value = [%u] ",pHddCtx->cfg_ini->isFastTransitionEnabled);
VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_INFO_HIGH, "Name = [gTxPowerCap] Value = [%u] dBm ",pHddCtx->cfg_ini->nTxPowerCap);
#endif
@@ -3190,7 +3190,7 @@
VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_INFO_HIGH, "Name = [FastRoamEnabled] Value = [%u] ",pHddCtx->cfg_ini->isFastRoamIniFeatureEnabled);
VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_INFO_HIGH, "Name = [MAWCEnabled] Value = [%u] ",pHddCtx->cfg_ini->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)
VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_INFO_HIGH, "Name = [RoamRssiDiff] Value = [%u] ",pHddCtx->cfg_ini->RoamRssiDiff);
VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_INFO_HIGH, "Name = [ImmediateRoamRssiDiff] Value = [%u] ",pHddCtx->cfg_ini->nImmediateRoamRssiDiff);
VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_INFO_HIGH, "Name = [isWESModeEnabled] Value = [%u] ",pHddCtx->cfg_ini->isWESModeEnabled);
@@ -4736,7 +4736,7 @@
smeConfig.csrConfig.nTxPowerCap = pConfig->nTxPowerCap;
smeConfig.csrConfig.fEnableBypass11d = pConfig->enableBypass11d;
smeConfig.csrConfig.fEnableDFSChnlScan = pConfig->enableDFSChnlScan;
-#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)
smeConfig.csrConfig.nRoamPrefer5GHz = pConfig->nRoamPrefer5GHz;
smeConfig.csrConfig.nRoamIntraBand = pConfig->nRoamIntraBand;
smeConfig.csrConfig.nProbes = pConfig->nProbes;
@@ -4773,14 +4773,14 @@
smeConfig.csrConfig.isFastRoamIniFeatureEnabled = pConfig->isFastRoamIniFeatureEnabled;
smeConfig.csrConfig.MAWCEnabled = pConfig->MAWCEnabled;
#endif
-#ifdef FEATURE_WLAN_CCX
- smeConfig.csrConfig.isCcxIniFeatureEnabled = pConfig->isCcxIniFeatureEnabled;
- if( pConfig->isCcxIniFeatureEnabled )
+#ifdef FEATURE_WLAN_ESE
+ smeConfig.csrConfig.isEseIniFeatureEnabled = pConfig->isEseIniFeatureEnabled;
+ if( pConfig->isEseIniFeatureEnabled )
{
pConfig->isFastTransitionEnabled = TRUE;
}
#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)
smeConfig.csrConfig.isFastTransitionEnabled = pConfig->isFastTransitionEnabled;
smeConfig.csrConfig.RoamRssiDiff = pConfig->RoamRssiDiff;
smeConfig.csrConfig.nImmediateRoamRssiDiff = pConfig->nImmediateRoamRssiDiff;
diff --git a/CORE/HDD/src/wlan_hdd_cfg80211.c b/CORE/HDD/src/wlan_hdd_cfg80211.c
index 9cc4ff2..f2ea016 100644
--- a/CORE/HDD/src/wlan_hdd_cfg80211.c
+++ b/CORE/HDD/src/wlan_hdd_cfg80211.c
@@ -148,7 +148,7 @@
WLAN_CIPHER_SUITE_WEP40,
WLAN_CIPHER_SUITE_WEP104,
WLAN_CIPHER_SUITE_TKIP,
-#ifdef FEATURE_WLAN_CCX
+#ifdef FEATURE_WLAN_ESE
#define WLAN_CIPHER_SUITE_KRK 0x004096ff /* use for KRK */
WLAN_CIPHER_SUITE_KRK,
WLAN_CIPHER_SUITE_CCMP,
@@ -733,13 +733,13 @@
wiphy->country_ie_pref = NL80211_COUNTRY_IE_IGNORE_CORE;
#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)
if (pCfg->isFastTransitionEnabled
#ifdef FEATURE_WLAN_LFR
|| pCfg->isFastRoamIniFeatureEnabled
#endif
-#ifdef FEATURE_WLAN_CCX
- || pCfg->isCcxIniFeatureEnabled
+#ifdef FEATURE_WLAN_ESE
+ || pCfg->isEseIniFeatureEnabled
#endif
)
{
@@ -3701,7 +3701,7 @@
}
#endif
-#ifdef FEATURE_WLAN_CCX
+#ifdef FEATURE_WLAN_ESE
case WLAN_CIPHER_SUITE_KRK:
setKey.encType = eCSR_ENCRYPT_TYPE_KRK;
break;
@@ -5715,7 +5715,7 @@
"%s: set authentication type to SHARED", __func__);
pHddStaCtx->conn_info.authType = eCSR_AUTH_TYPE_SHARED_KEY;
break;
-#ifdef FEATURE_WLAN_CCX
+#ifdef FEATURE_WLAN_ESE
case NL80211_AUTHTYPE_NETWORK_EAP:
hddLog(VOS_TRACE_LEVEL_INFO,
"%s: set authentication type to CCKM WPA", __func__);
@@ -5769,7 +5769,7 @@
__func__);
pWextState->authKeyMgmt |= IW_AUTH_KEY_MGMT_802_1X;
break;
-#ifdef FEATURE_WLAN_CCX
+#ifdef FEATURE_WLAN_ESE
#define WLAN_AKM_SUITE_CCKM 0x00409600 /* Should be in ieee802_11_defs.h */
#define IW_AUTH_KEY_MGMT_CCKM 8 /* Should be in linux/wireless.h */
case WLAN_AKM_SUITE_CCKM:
@@ -5841,7 +5841,7 @@
break;
#endif
-#ifdef FEATURE_WLAN_CCX
+#ifdef FEATURE_WLAN_ESE
case WLAN_CIPHER_SUITE_KRK:
encryptionType = eCSR_ENCRYPT_TYPE_KRK;
break;
diff --git a/CORE/HDD/src/wlan_hdd_main.c b/CORE/HDD/src/wlan_hdd_main.c
index e721281..8925d18 100644
--- a/CORE/HDD/src/wlan_hdd_main.c
+++ b/CORE/HDD/src/wlan_hdd_main.c
@@ -172,14 +172,24 @@
#define SIZE_OF_SETROAMMODE 11 /* size of SETROAMMODE */
#define SIZE_OF_GETROAMMODE 11 /* size of GETROAMMODE */
-#if defined(FEATURE_WLAN_CCX) && defined(FEATURE_WLAN_CCX_UPLOAD)
+#ifdef FEATURE_CESIUM_PROPRIETARY
+/*
+ * Ibss prop IE from command will be of size 5 + 1(Element ID) + 1(length)
+ */
+#define WLAN_HDD_IBSS_PROP_IE_SIZE 7
+#define WLAN_HDD_IBSS_PROP_VENDOR_ID 0xDD
+#define WLAN_HDD_IBSS_PROP_OUI_DATA_LEN 0x05
+static tANI_U8 ibssPropIe[3] = {0x00,0x16,0x32};
+#endif
+
+#if defined(FEATURE_WLAN_ESE) && defined(FEATURE_WLAN_ESE_UPLOAD)
#define TID_MIN_VALUE 0
#define TID_MAX_VALUE 15
static VOS_STATUS hdd_get_tsm_stats(hdd_adapter_t *pAdapter, const tANI_U8 tid,
tAniTrafStrmMetrics* pTsmMetrics);
-static VOS_STATUS hdd_parse_ccx_beacon_req(tANI_U8 *pValue,
- tCsrCcxBeaconReq *pCcxBcnReq);
-#endif /* FEATURE_WLAN_CCX && FEATURE_WLAN_CCX_UPLOAD */
+static VOS_STATUS hdd_parse_ese_beacon_req(tANI_U8 *pValue,
+ tCsrEseBeaconReq *pEseBcnReq);
+#endif /* FEATURE_WLAN_ESE && FEATURE_WLAN_ESE_UPLOAD */
#define WLAN_PRIV_DATA_MAX_LEN 4096
@@ -214,7 +224,7 @@
extern int hdd_setBand_helper(struct net_device *dev, tANI_U8* ptr);
-#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 hdd_getBand_helper(hdd_context_t *pHddCtx, int *pBand);
static VOS_STATUS hdd_parse_channellist(tANI_U8 *pValue, tANI_U8 *pChannelList, tANI_U8 *pNumChannels);
static VOS_STATUS hdd_parse_send_action_frame_data(tANI_U8 *pValue, tANI_U8 *pTargetApBssid,
@@ -224,9 +234,9 @@
tANI_U8 *pTargetApBssid,
tANI_U8 *pChannel);
#endif
-#if defined(FEATURE_WLAN_CCX) && defined(FEATURE_WLAN_CCX_UPLOAD)
+#if defined(FEATURE_WLAN_ESE) && defined(FEATURE_WLAN_ESE_UPLOAD)
VOS_STATUS hdd_parse_get_cckm_ie(tANI_U8 *pValue, tANI_U8 **pCckmIe, tANI_U8 *pCckmIeLen);
-#endif /* FEATURE_WLAN_CCX && FEATURE_WLAN_CCX_UPLOAD */
+#endif /* FEATURE_WLAN_ESE && FEATURE_WLAN_ESE_UPLOAD */
static VOS_STATUS wlan_hdd_init_channels(hdd_context_t *pHddCtx);
@@ -2341,7 +2351,7 @@
}
#endif
#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)
else if (strncmp(command, "SETROAMDELTA", 12) == 0)
{
tANI_U8 *value = command;
@@ -2401,7 +2411,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)
else if (strncmp(command, "GETBAND", 7) == 0)
{
int band = -1;
@@ -2497,25 +2507,25 @@
}
else if (strncmp(command, "GETCCXMODE", 10) == 0)
{
- tANI_BOOLEAN ccxMode = sme_getIsCcxFeatureEnabled((tHalHandle)(pHddCtx->hHal));
+ tANI_BOOLEAN eseMode = sme_getIsEseFeatureEnabled((tHalHandle)(pHddCtx->hHal));
char extra[32];
tANI_U8 len = 0;
- /* Check if the features OKC/CCX/11R are supported simultaneously,
+ /* Check if the features OKC/ESE/11R are supported simultaneously,
then this operation is not permitted (return FAILURE) */
- if (ccxMode &&
+ if (eseMode &&
hdd_is_okc_mode_enabled(pHddCtx) &&
sme_getIsFtFeatureEnabled((tHalHandle)(pHddCtx->hHal)))
{
VOS_TRACE( VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_WARN,
- "%s: OKC/CCX/11R are supported simultaneously"
+ "%s: OKC/ESE/11R are supported simultaneously"
" hence this operation is not permitted!", __func__);
ret = -EPERM;
goto exit;
}
len = scnprintf(extra, sizeof(extra), "%s %d",
- "GETCCXMODE", ccxMode);
+ "GETCCXMODE", eseMode);
if (copy_to_user(priv_data.buf, &extra, len + 1))
{
VOS_TRACE( VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR,
@@ -2530,14 +2540,14 @@
char extra[32];
tANI_U8 len = 0;
- /* Check if the features OKC/CCX/11R are supported simultaneously,
+ /* Check if the features OKC/ESE/11R are supported simultaneously,
then this operation is not permitted (return FAILURE) */
if (okcMode &&
- sme_getIsCcxFeatureEnabled((tHalHandle)(pHddCtx->hHal)) &&
+ sme_getIsEseFeatureEnabled((tHalHandle)(pHddCtx->hHal)) &&
sme_getIsFtFeatureEnabled((tHalHandle)(pHddCtx->hHal)))
{
VOS_TRACE( VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_WARN,
- "%s: OKC/CCX/11R are supported simultaneously"
+ "%s: OKC/ESE/11R are supported simultaneously"
" hence this operation is not permitted!", __func__);
ret = -EPERM;
goto exit;
@@ -3143,7 +3153,7 @@
goto exit;
}
}
-#endif /* WLAN_FEATURE_VOWIFI_11R || FEATURE_WLAN_CCX || FEATURE_WLAN_LFR */
+#endif /* WLAN_FEATURE_VOWIFI_11R || FEATURE_WLAN_ESE || FEATURE_WLAN_LFR */
#ifdef FEATURE_WLAN_LFR
else if (strncmp(command, "SETFASTROAM", 11) == 0)
{
@@ -3270,20 +3280,20 @@
(tSmeFastRoamTrigger)(trigger));
}
#endif
-#ifdef FEATURE_WLAN_CCX
+#ifdef FEATURE_WLAN_ESE
else if (strncmp(command, "SETCCXMODE", 10) == 0)
{
tANI_U8 *value = command;
- tANI_U8 ccxMode = CFG_CCX_FEATURE_ENABLED_DEFAULT;
+ tANI_U8 eseMode = CFG_ESE_FEATURE_ENABLED_DEFAULT;
- /* Check if the features OKC/CCX/11R are supported simultaneously,
+ /* Check if the features OKC/ESE/11R are supported simultaneously,
then this operation is not permitted (return FAILURE) */
- if (sme_getIsCcxFeatureEnabled((tHalHandle)(pHddCtx->hHal)) &&
+ if (sme_getIsEseFeatureEnabled((tHalHandle)(pHddCtx->hHal)) &&
hdd_is_okc_mode_enabled(pHddCtx) &&
sme_getIsFtFeatureEnabled((tHalHandle)(pHddCtx->hHal)))
{
VOS_TRACE( VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_WARN,
- "%s: OKC/CCX/11R are supported simultaneously"
+ "%s: OKC/ESE/11R are supported simultaneously"
" hence this operation is not permitted!", __func__);
ret = -EPERM;
goto exit;
@@ -3292,34 +3302,34 @@
/* Move pointer to ahead of SETCCXMODE<delimiter> */
value = value + 11;
/* Convert the value from ascii to integer */
- ret = kstrtou8(value, 10, &ccxMode);
+ ret = kstrtou8(value, 10, &eseMode);
if (ret < 0)
{
/* If the input value is greater than max value of datatype, then also
kstrtou8 fails */
VOS_TRACE( VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR,
"%s: kstrtou8 failed range [%d - %d]", __func__,
- CFG_CCX_FEATURE_ENABLED_MIN,
- CFG_CCX_FEATURE_ENABLED_MAX);
+ CFG_ESE_FEATURE_ENABLED_MIN,
+ CFG_ESE_FEATURE_ENABLED_MAX);
ret = -EINVAL;
goto exit;
}
- if ((ccxMode < CFG_CCX_FEATURE_ENABLED_MIN) ||
- (ccxMode > CFG_CCX_FEATURE_ENABLED_MAX))
+ if ((eseMode < CFG_ESE_FEATURE_ENABLED_MIN) ||
+ (eseMode > CFG_ESE_FEATURE_ENABLED_MAX))
{
VOS_TRACE( VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR,
- "Ccx mode value %d is out of range"
- " (Min: %d Max: %d)", ccxMode,
- CFG_CCX_FEATURE_ENABLED_MIN,
- CFG_CCX_FEATURE_ENABLED_MAX);
+ "Ese mode value %d is out of range"
+ " (Min: %d Max: %d)", eseMode,
+ CFG_ESE_FEATURE_ENABLED_MIN,
+ CFG_ESE_FEATURE_ENABLED_MAX);
ret = -EINVAL;
goto exit;
}
VOS_TRACE( VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_INFO,
- "%s: Received Command to change ccx mode = %d", __func__, ccxMode);
+ "%s: Received Command to change ese mode = %d", __func__, eseMode);
- pHddCtx->cfg_ini->isCcxIniFeatureEnabled = ccxMode;
- sme_UpdateIsCcxFeatureEnabled((tHalHandle)(pHddCtx->hHal), ccxMode);
+ pHddCtx->cfg_ini->isEseIniFeatureEnabled = eseMode;
+ sme_UpdateIsEseFeatureEnabled((tHalHandle)(pHddCtx->hHal), eseMode);
}
#endif
else if (strncmp(command, "SETROAMSCANCONTROL", 18) == 0)
@@ -3360,14 +3370,14 @@
tANI_U8 *value = command;
tANI_U8 okcMode = CFG_OKC_FEATURE_ENABLED_DEFAULT;
- /* Check if the features OKC/CCX/11R are supported simultaneously,
+ /* Check if the features OKC/ESE/11R are supported simultaneously,
then this operation is not permitted (return FAILURE) */
- if (sme_getIsCcxFeatureEnabled((tHalHandle)(pHddCtx->hHal)) &&
+ if (sme_getIsEseFeatureEnabled((tHalHandle)(pHddCtx->hHal)) &&
hdd_is_okc_mode_enabled(pHddCtx) &&
sme_getIsFtFeatureEnabled((tHalHandle)(pHddCtx->hHal)))
{
VOS_TRACE( VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_WARN,
- "%s: OKC/CCX/11R are supported simultaneously"
+ "%s: OKC/ESE/11R are supported simultaneously"
" hence this operation is not permitted!", __func__);
ret = -EPERM;
goto exit;
@@ -3611,7 +3621,7 @@
ret = hdd_handle_batch_scan_ioctl(pAdapter, &priv_data, command);
}
#endif
-#if defined(FEATURE_WLAN_CCX) && defined(FEATURE_WLAN_CCX_UPLOAD)
+#if defined(FEATURE_WLAN_ESE) && defined(FEATURE_WLAN_ESE_UPLOAD)
else if (strncmp(command, "SETCCXROAMSCANCHANNELS", 22) == 0)
{
tANI_U8 *value = command;
@@ -3636,7 +3646,7 @@
ret = -EINVAL;
goto exit;
}
- status = sme_SetCcxRoamScanChannelList((tHalHandle)(pHddCtx->hHal),
+ status = sme_SetEseRoamScanChannelList((tHalHandle)(pHddCtx->hHal),
ChannelList,
numChannels);
if (eHAL_STATUS_SUCCESS != status)
@@ -3772,20 +3782,27 @@
else if (strncmp(command, "CCXBEACONREQ", 12) == 0)
{
tANI_U8 *value = command;
- tCsrCcxBeaconReq ccxBcnReq;
+ tCsrEseBeaconReq eseBcnReq;
eHalStatus status = eHAL_STATUS_SUCCESS;
- status = hdd_parse_ccx_beacon_req(value, &ccxBcnReq);
+ status = hdd_parse_ese_beacon_req(value, &eseBcnReq);
if (eHAL_STATUS_SUCCESS != status)
{
VOS_TRACE( VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR,
- "%s: Failed to parse ccx beacon req", __func__);
+ "%s: Failed to parse ese beacon req", __func__);
ret = -EINVAL;
goto exit;
}
- sme_SetCcxBeaconRequest((tHalHandle)(pHddCtx->hHal), pAdapter->sessionId, &ccxBcnReq);
+ status = sme_SetEseBeaconRequest((tHalHandle)(pHddCtx->hHal), pAdapter->sessionId, &eseBcnReq);
+ if (eHAL_STATUS_SUCCESS != status)
+ {
+ VOS_TRACE( VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR,
+ "%s: sme_SetEseBeaconRequest failed (%d)", __func__, status);
+ ret = -EINVAL;
+ goto exit;
+ }
}
-#endif /* FEATURE_WLAN_CCX && FEATURE_WLAN_CCX_UPLOAD */
+#endif /* FEATURE_WLAN_ESE && FEATURE_WLAN_ESE_UPLOAD */
else {
MTRACE(vos_trace(VOS_MODULE_ID_HDD,
TRACE_CODE_HDD_UNSUPPORTED_IOCTL,
@@ -3805,12 +3822,12 @@
-#if defined(FEATURE_WLAN_CCX) && defined(FEATURE_WLAN_CCX_UPLOAD)
+#if defined(FEATURE_WLAN_ESE) && defined(FEATURE_WLAN_ESE_UPLOAD)
/**---------------------------------------------------------------------------
- \brief hdd_parse_ccx_beacon_req() - Parse ccx beacon request
+ \brief hdd_parse_ese_beacon_req() - Parse ese beacon request
- This function parses the ccx beacon request passed in the format
+ This function parses the ese beacon request passed in the format
CCXBEACONREQ<space><Number of fields><space><Measurement token>
<space>Channel 1<space>Scan Mode <space>Meas Duration<space>Channel N
<space>Scan Mode N<space>Meas Duration N
@@ -3821,13 +3838,13 @@
This function does not take care of removing duplicate channels from the list
\param - pValue Pointer to data
- \param - pCcxBcnReq output pointer to store parsed ie information
+ \param - pEseBcnReq output pointer to store parsed ie information
\return - 0 for success non-zero for failure
--------------------------------------------------------------------------*/
-static VOS_STATUS hdd_parse_ccx_beacon_req(tANI_U8 *pValue,
- tCsrCcxBeaconReq *pCcxBcnReq)
+static VOS_STATUS hdd_parse_ese_beacon_req(tANI_U8 *pValue,
+ tCsrEseBeaconReq *pEseBcnReq)
{
tANI_U8 *inPtr = pValue;
int tempInt = 0;
@@ -3859,12 +3876,12 @@
v = kstrtos32(buf, 10, &tempInt);
if ( v < 0) return -EINVAL;
- pCcxBcnReq->numBcnReqIe = tempInt;
+ pEseBcnReq->numBcnReqIe = tempInt;
VOS_TRACE( VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_INFO_HIGH,
- "Number of Bcn Req Ie fields(%d)", pCcxBcnReq->numBcnReqIe);
+ "Number of Bcn Req Ie fields(%d)", pEseBcnReq->numBcnReqIe);
- for (j = 0; j < (pCcxBcnReq->numBcnReqIe); j++)
+ for (j = 0; j < (pEseBcnReq->numBcnReqIe); j++)
{
for (i = 0; i < 4; i++)
{
@@ -3894,7 +3911,7 @@
"Invalid Measurement Token(%d)", tempInt);
return -EINVAL;
}
- pCcxBcnReq->bcnReq[j].measurementToken = tempInt;
+ pEseBcnReq->bcnReq[j].measurementToken = tempInt;
break;
case 1: /* Channel number */
@@ -3905,7 +3922,7 @@
"Invalid Channel Number(%d)", tempInt);
return -EINVAL;
}
- pCcxBcnReq->bcnReq[j].channel = tempInt;
+ pEseBcnReq->bcnReq[j].channel = tempInt;
break;
case 2: /* Scan mode */
@@ -3915,32 +3932,32 @@
"Invalid Scan Mode(%d) Expected{0|1|2}", tempInt);
return -EINVAL;
}
- pCcxBcnReq->bcnReq[j].scanMode= tempInt;
+ pEseBcnReq->bcnReq[j].scanMode= tempInt;
break;
case 3: /* Measurement duration */
- if (((tempInt <= 0) && (pCcxBcnReq->bcnReq[j].scanMode != eSIR_BEACON_TABLE)) ||
- ((tempInt < 0) && (pCcxBcnReq->bcnReq[j].scanMode == eSIR_BEACON_TABLE)))
+ if (((tempInt <= 0) && (pEseBcnReq->bcnReq[j].scanMode != eSIR_BEACON_TABLE)) ||
+ ((tempInt < 0) && (pEseBcnReq->bcnReq[j].scanMode == eSIR_BEACON_TABLE)))
{
VOS_TRACE( VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR,
"Invalid Measurement Duration(%d)", tempInt);
return -EINVAL;
}
- pCcxBcnReq->bcnReq[j].measurementDuration = tempInt;
+ pEseBcnReq->bcnReq[j].measurementDuration = tempInt;
break;
}
}
}
- for (j = 0; j < pCcxBcnReq->numBcnReqIe; j++)
+ for (j = 0; j < pEseBcnReq->numBcnReqIe; j++)
{
VOS_TRACE( VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_INFO,
"Index(%d) Measurement Token(%u)Channel(%u) Scan Mode(%u) Measurement Duration(%u)\n",
j,
- pCcxBcnReq->bcnReq[j].measurementToken,
- pCcxBcnReq->bcnReq[j].channel,
- pCcxBcnReq->bcnReq[j].scanMode,
- pCcxBcnReq->bcnReq[j].measurementDuration);
+ pEseBcnReq->bcnReq[j].measurementToken,
+ pEseBcnReq->bcnReq[j].channel,
+ pEseBcnReq->bcnReq[j].scanMode,
+ pEseBcnReq->bcnReq[j].measurementDuration);
}
return VOS_STATUS_SUCCESS;
@@ -4083,9 +4100,9 @@
}
return vstatus;
}
-#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)
void hdd_getBand_helper(hdd_context_t *pHddCtx, int *pBand)
{
eCsrBand band = -1;
@@ -4497,7 +4514,7 @@
#endif
-#if defined(FEATURE_WLAN_CCX) && defined(FEATURE_WLAN_CCX_UPLOAD)
+#if defined(FEATURE_WLAN_ESE) && defined(FEATURE_WLAN_ESE_UPLOAD)
/**---------------------------------------------------------------------------
\brief hdd_parse_get_cckm_ie() - HDD Parse and fetch the CCKM IE
@@ -4580,7 +4597,7 @@
return VOS_STATUS_SUCCESS;
}
-#endif /* FEATURE_WLAN_CCX && FEATURE_WLAN_CCX_UPLOAD */
+#endif /* FEATURE_WLAN_ESE && FEATURE_WLAN_ESE_UPLOAD */
/**---------------------------------------------------------------------------
diff --git a/CORE/HDD/src/wlan_hdd_wext.c b/CORE/HDD/src/wlan_hdd_wext.c
index 6400f87..544dc7e 100644
--- a/CORE/HDD/src/wlan_hdd_wext.c
+++ b/CORE/HDD/src/wlan_hdd_wext.c
@@ -872,7 +872,7 @@
return VOS_STATUS_SUCCESS;
}
-#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)
static void hdd_GetRoamRssiCB( v_S7_t rssi, tANI_U32 staId, void *pContext )
{
@@ -3708,12 +3708,12 @@
setKey.encType = eCSR_ENCRYPT_TYPE_AES;
break;
-#ifdef FEATURE_WLAN_CCX
+#ifdef FEATURE_WLAN_ESE
#define IW_ENCODE_ALG_KRK 6
case IW_ENCODE_ALG_KRK:
setKey.encType = eCSR_ENCRYPT_TYPE_KRK;
break;
-#endif /* FEATURE_WLAN_CCX */
+#endif /* FEATURE_WLAN_ESE */
default:
setKey.encType = eCSR_ENCRYPT_TYPE_NONE;
@@ -4897,7 +4897,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)
case WE_GET_ROAM_RSSI:
{
v_S7_t s7Rssi = 0;
@@ -7840,7 +7840,7 @@
IW_PRIV_TYPE_CHAR| WE_MAX_STR_LEN,
"getRSSI" },
#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)
{ WE_GET_ROAM_RSSI,
0,
IW_PRIV_TYPE_CHAR| WE_MAX_STR_LEN,
diff --git a/CORE/HDD/src/wlan_hdd_wmm.c b/CORE/HDD/src/wlan_hdd_wmm.c
index 206a4f5..564ca29 100644
--- a/CORE/HDD/src/wlan_hdd_wmm.c
+++ b/CORE/HDD/src/wlan_hdd_wmm.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.
*
@@ -431,7 +431,7 @@
return VOS_TRUE;
}
-#ifdef FEATURE_WLAN_CCX
+#ifdef FEATURE_WLAN_ESE
/**
@brief hdd_wmm_inactivity_timer_cb() - timer handler function which is
called for every inactivity interval per AC. This function gets the
@@ -572,7 +572,7 @@
return vos_status;
}
-#endif // FEATURE_WLAN_CCX
+#endif // FEATURE_WLAN_ESE
/**
@brief hdd_wmm_sme_callback() - callback registered by HDD with SME for receiving
@@ -675,7 +675,7 @@
hdd_wmm_notify_app(pQosContext);
}
-#ifdef FEATURE_WLAN_CCX
+#ifdef FEATURE_WLAN_ESE
// Check if the inactivity interval is specified
if (pCurrentQosInfo && pCurrentQosInfo->inactivity_interval) {
VOS_TRACE(VOS_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO,
@@ -683,7 +683,7 @@
__func__, pCurrentQosInfo->inactivity_interval, acType);
hdd_wmm_enable_inactivity_timer(pQosContext, pCurrentQosInfo->inactivity_interval);
}
-#endif // FEATURE_WLAN_CCX
+#endif // FEATURE_WLAN_ESE
// notify TL to enable trigger frames if necessary
hdd_wmm_enable_tl_uapsd(pQosContext);
@@ -1383,7 +1383,7 @@
qosInfo.suspension_interval = (WLAN_HDD_GET_CTX(pAdapter))->cfg_ini->InfraUapsdBkSuspIntv;
break;
}
-#ifdef FEATURE_WLAN_CCX
+#ifdef FEATURE_WLAN_ESE
qosInfo.inactivity_interval = (WLAN_HDD_GET_CTX(pAdapter))->cfg_ini->InfraInactivityInterval;
#endif
qosInfo.ts_info.burst_size_defn = (WLAN_HDD_GET_CTX(pAdapter))->cfg_ini->burstSizeDefinition;
@@ -1617,7 +1617,7 @@
{
pQosContext = list_first_entry(&pAdapter->hddWmmStatus.wmmContextList,
hdd_wmm_qos_context_t, node);
-#ifdef FEATURE_WLAN_CCX
+#ifdef FEATURE_WLAN_ESE
hdd_wmm_disable_inactivity_timer(pQosContext);
#endif
#ifdef WLAN_OPEN_SOURCE
@@ -2610,7 +2610,7 @@
// need to tell TL to stop trigger timer, etc
hdd_wmm_disable_tl_uapsd(pQosContext);
-#ifdef FEATURE_WLAN_CCX
+#ifdef FEATURE_WLAN_ESE
// disable the inactivity timer
hdd_wmm_disable_inactivity_timer(pQosContext);
#endif