diff options
| author | Akash Patel <akashp@codeaurora.org> | 2014-03-23 14:18:25 -0700 |
|---|---|---|
| committer | Akash Patel <akashp@codeaurora.org> | 2014-03-23 14:19:28 -0700 |
| commit | 1954d76a43030c5802fc04d2c9face024a11c7d5 (patch) | |
| tree | c99b637260d0803c09f1bcde2adf3152715432a2 | |
| parent | 4f18236781c9d3e48e870ae49f3cd1f15934f01c (diff) | |
| parent | 6a5ad00b54c8b727644addf55db4a3c458424491 (diff) | |
Release 1.0.0.69 QCACLD WLAN Driver
Merge remote-tracking branch 'origin/caf/caf-wlan/master'
* origin/caf/caf-wlan/master:
Cafstaging Release 1.0.0.69
wlan: Enterprise Security Enhancements
qcacld: ipa: Add one additional descriptor in IPA TX pipe descriptor FIFO
qcacld-new: WMI interface event logging
Change-Id: I8e9ef15aab460b8ce57d7f6086f81d31cf4abb03
87 files changed, 3537 insertions, 2619 deletions
diff --git a/CORE/CLD_TXRX/TLSHIM/tl_shim.c b/CORE/CLD_TXRX/TLSHIM/tl_shim.c index d13287ebb76c..73c9e294796b 100644 --- a/CORE/CLD_TXRX/TLSHIM/tl_shim.c +++ b/CORE/CLD_TXRX/TLSHIM/tl_shim.c @@ -57,7 +57,7 @@ #define TLSHIM_LOGP(args...) \ VOS_TRACE( VOS_MODULE_ID_TL, VOS_TRACE_LEVEL_FATAL, ## args) -#if defined(FEATURE_WLAN_CCX) && !defined(FEATURE_WLAN_CCX_UPLOAD) +#if defined(FEATURE_WLAN_ESE) && !defined(FEATURE_WLAN_ESE_UPLOAD) /************************/ /* Internal defines */ @@ -186,7 +186,7 @@ tlshim_mgmt_over_data_rx_handler(struct work_struct *ptr_work) * if not native wifi populate: copy just part after 802.11 hdr * i.e. part starting from snap header */ - tpCcxIappHdr iapp_hdr_ptr = (tpCcxIappHdr)&data[ETHERNET_HDR_LEN]; + tpEseIappHdr iapp_hdr_ptr = (tpEseIappHdr)&data[ETHERNET_HDR_LEN]; u_int8_t *snap_hdr_ptr = &(((u_int8_t*)wh)[SIZEOF_80211_HDR]); tpSirMacFrameCtl ptr_80211_FC = (tpSirMacFrameCtl)&wh->i_fc; ptr_80211_FC->protVer = SIR_MAC_PROTOCOL_VERSION; @@ -318,7 +318,7 @@ tlshim_check_n_process_iapp_frame (pVosContextType pVosGCtx, /* if returned false the packet will be handled by the upper layer */ return false; } -#endif /* defined(FEATURE_WLAN_CCX) && !defined(FEATURE_WLAN_CCX_UPLOAD) */ +#endif /* defined(FEATURE_WLAN_ESE) && !defined(FEATURE_WLAN_ESE_UPLOAD) */ #ifdef QCA_WIFI_ISOC @@ -751,7 +751,7 @@ static void tlshim_data_rx_handler(void *context, u_int16_t staid, { struct txrx_tl_shim_ctx *tl_shim; #if defined(IPA_OFFLOAD) || \ - (defined(FEATURE_WLAN_CCX) && !defined(FEATURE_WLAN_CCX_UPLOAD)) + (defined(FEATURE_WLAN_ESE) && !defined(FEATURE_WLAN_ESE_UPLOAD)) void *vos_ctx = vos_get_global_context(VOS_MODULE_ID_TL, context); #endif struct tlshim_sta_info *sta_info; @@ -813,7 +813,7 @@ static void tlshim_data_rx_handler(void *context, u_int16_t staid, if (ret == VOS_STATUS_E_INVAL) { #endif -#if defined(FEATURE_WLAN_CCX) && !defined(FEATURE_WLAN_CCX_UPLOAD) +#if defined(FEATURE_WLAN_ESE) && !defined(FEATURE_WLAN_ESE_UPLOAD) /* * in case following returns true, a defered task was created * inside function, which does following: @@ -1609,7 +1609,7 @@ VOS_STATUS WLANTL_Close(void *vos_ctx) return VOS_STATUS_E_FAILURE; } -#ifdef FEATURE_WLAN_CCX +#ifdef FEATURE_WLAN_ESE vos_flush_work(&tl_shim->iapp_work.deferred_work); #endif vos_flush_work(&tl_shim->cache_flush_work); @@ -1664,7 +1664,7 @@ VOS_STATUS WLANTL_Open(void *vos_ctx, WLANTL_ConfigInfoType *tl_cfg) } INIT_WORK(&tl_shim->cache_flush_work, tl_shim_cache_flush_work); -#if defined(FEATURE_WLAN_CCX) && !defined(FEATURE_WLAN_CCX_UPLOAD) +#if defined(FEATURE_WLAN_ESE) && !defined(FEATURE_WLAN_ESE_UPLOAD) INIT_WORK(&(tl_shim->iapp_work.deferred_work), tlshim_mgmt_over_data_rx_handler); #endif diff --git a/CORE/CLD_TXRX/TLSHIM/tl_shim.h b/CORE/CLD_TXRX/TLSHIM/tl_shim.h index 292b6f8875fd..5f2779c53444 100644 --- a/CORE/CLD_TXRX/TLSHIM/tl_shim.h +++ b/CORE/CLD_TXRX/TLSHIM/tl_shim.h @@ -31,7 +31,7 @@ #include <ol_txrx_osif_api.h> #include <adf_os_lock.h> -#ifdef FEATURE_WLAN_CCX +#ifdef FEATURE_WLAN_ESE typedef struct deferred_iapp_work { pVosContextType pVosGCtx; adf_nbuf_t nbuf; @@ -71,7 +71,7 @@ struct txrx_tl_shim_ctx { adf_os_spinlock_t bufq_lock; struct work_struct cache_flush_work; -#ifdef FEATURE_WLAN_CCX +#ifdef FEATURE_WLAN_ESE /* * work structures to defer IAPP processing to * non interrupt context diff --git a/CORE/CLD_TXRX/TXRX/ol_txrx.c b/CORE/CLD_TXRX/TXRX/ol_txrx.c index b104633cf8a9..6aaec4100346 100644 --- a/CORE/CLD_TXRX/TXRX/ol_txrx.c +++ b/CORE/CLD_TXRX/TXRX/ol_txrx.c @@ -580,7 +580,7 @@ ol_txrx_pdev_attach( adf_os_mem_zero(&pdev->tx_delay, sizeof(pdev->tx_delay)); adf_os_spinlock_init(&pdev->tx_delay.mutex); - /* initialize compute interval with 5 seconds (CCX default) */ + /* initialize compute interval with 5 seconds (ESE default) */ pdev->tx_delay.avg_period_ticks = adf_os_msecs_to_ticks(5000); { u_int32_t bin_width_1000ticks; diff --git a/CORE/HDD/inc/wlan_hdd_cfg.h b/CORE/HDD/inc/wlan_hdd_cfg.h index 15b81987f7ea..7d3cdf27b532 100644 --- a/CORE/HDD/inc/wlan_hdd_cfg.h +++ b/CORE/HDD/inc/wlan_hdd_cfg.h @@ -357,7 +357,7 @@ typedef enum #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 ) @@ -656,7 +656,7 @@ typedef enum #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 @@ -767,17 +767,17 @@ typedef enum #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" @@ -791,13 +791,13 @@ typedef enum #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) @@ -843,7 +843,7 @@ typedef enum #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" @@ -2503,11 +2503,11 @@ typedef struct 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; @@ -2623,7 +2623,7 @@ typedef struct 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 2ff15b6f6449..b44a599848c8 100644 --- a/CORE/HDD/inc/wlan_hdd_main.h +++ b/CORE/HDD/inc/wlan_hdd_main.h @@ -651,7 +651,7 @@ struct hdd_station_ctx 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 @@ -1038,7 +1038,7 @@ struct hdd_adapter_s #endif hdd_scaninfo_t scan_info; -#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 2db90c6735b3..dea1cfc57e84 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. * @@ -296,9 +296,9 @@ typedef struct hdd_wext_state_s 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; @@ -409,7 +409,7 @@ void hdd_wmm_tx_snapshot(hdd_adapter_t *pAdapter); #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 c2400ecaca66..e182e5cbc412 100644 --- a/CORE/HDD/inc/wlan_hdd_wmm.h +++ b/CORE/HDD/inc/wlan_hdd_wmm.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011-2012 The Linux Foundation. All rights reserved. + * Copyright (c) 2011-2012,2014 The Linux Foundation. All rights reserved. * * Previously licensed under the ISC license by Qualcomm Atheros, Inc. * @@ -180,7 +180,7 @@ typedef struct 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 c0b45ef7678e..dbfdbd51bd0d 100644 --- a/CORE/HDD/src/wlan_hdd_assoc.c +++ b/CORE/HDD/src/wlan_hdd_assoc.c @@ -81,9 +81,9 @@ v_U8_t ccpWpaOui02[ HDD_WPA_OUI_SIZE ] = { 0x00, 0x50, 0xf2, 0x02 }; 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 @@ -91,9 +91,9 @@ v_U8_t ccpRSNOui02[ HDD_RSN_OUI_SIZE ] = { 0x00, 0x0F, 0xAC, 0x02 }; // TKIP or 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 @@ -113,18 +113,18 @@ void hdd_indicateUnprotMgmtFrame(hdd_adapter_t *pAdapter, 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, +static void hdd_indicateEseAdjApRepInd(hdd_adapter_t *pAdapter, tCsrRoamInfo *pRoamInfo); -static void hdd_indicateCcxBcnReportInd(const hdd_adapter_t *pAdapter, +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, @@ -321,7 +321,7 @@ void hdd_connSaveConnectInfo( hdd_adapter_t *pAdapter, tCsrRoamInfo *pRoamInfo, /* * 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 @@ -499,10 +499,10 @@ void hdd_SendFTEvent(hdd_adapter_t *pAdapter) #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. @@ -531,7 +531,7 @@ static void hdd_SendNewAPChannelInfo(struct net_device *dev, hdd_adapter_t *pAda 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) { @@ -677,7 +677,7 @@ static void hdd_SendAssociationEvent(struct net_device *dev,tCsrRoamInfo *pCsrRo // 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 @@ -747,7 +747,7 @@ static void hdd_SendAssociationEvent(struct net_device *dev,tCsrRoamInfo *pCsrRo (pHddCtx->isUnloadInProgress != 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) || @@ -1069,9 +1069,9 @@ static VOS_STATUS hdd_roamRegisterSTA( hdd_adapter_t *pAdapter, } -#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 */ @@ -1285,7 +1285,7 @@ static eHalStatus hdd_AssociationCompletionHandler( hdd_adapter_t *pAdapter, tCs 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; @@ -1321,7 +1321,7 @@ static eHalStatus hdd_AssociationCompletionHandler( hdd_adapter_t *pAdapter, tCs 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 @@ -1344,7 +1344,7 @@ static eHalStatus hdd_AssociationCompletionHandler( hdd_adapter_t *pAdapter, tCs // 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; @@ -1496,11 +1496,11 @@ static eHalStatus hdd_AssociationCompletionHandler( hdd_adapter_t *pAdapter, tCs 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 */ { /* inform connect result to nl80211 */ @@ -2754,8 +2754,8 @@ eHalStatus hdd_smeRoamCallback( void *pContext, tCsrRoamInfo *pRoamInfo, tANI_U3 } 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 */ @@ -2770,7 +2770,7 @@ eHalStatus hdd_smeRoamCallback( void *pContext, tCsrRoamInfo *pRoamInfo, tANI_U3 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. @@ -2814,16 +2814,16 @@ eHalStatus hdd_smeRoamCallback( void *pContext, tCsrRoamInfo *pRoamInfo, tANI_U3 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 ) ) @@ -3049,7 +3049,7 @@ eHalStatus hdd_smeRoamCallback( void *pContext, tCsrRoamInfo *pRoamInfo, tANI_U3 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); @@ -3065,18 +3065,18 @@ eHalStatus hdd_smeRoamCallback( void *pContext, tCsrRoamInfo *pRoamInfo, tANI_U3 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; } @@ -3106,12 +3106,12 @@ eCsrAuthType hdd_TranslateRSNToCsrAuthType( u_int8_t auth_suite[4]) 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) { @@ -3137,12 +3137,12 @@ hdd_TranslateWPAToCsrAuthType(u_int8_t auth_suite[4]) { 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; } @@ -3442,7 +3442,7 @@ int hdd_set_csr_auth_type ( hdd_adapter_t *pAdapter, eCsrAuthType RSNAuthType) 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 @@ -3452,7 +3452,7 @@ int hdd_set_csr_auth_type ( hdd_adapter_t *pAdapter, eCsrAuthType RSNAuthType) } 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)) { @@ -3476,7 +3476,7 @@ int hdd_set_csr_auth_type ( hdd_adapter_t *pAdapter, eCsrAuthType RSNAuthType) } } 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)) { @@ -3527,9 +3527,9 @@ int hdd_set_csr_auth_type ( hdd_adapter_t *pAdapter, eCsrAuthType RSNAuthType) break; default: -#ifdef FEATURE_WLAN_CCX +#ifdef FEATURE_WLAN_ESE hddLog( LOG1, "%s: In default, unknown auth type.\n", __func__); -#endif /* FEATURE_WLAN_CCX */ +#endif /* FEATURE_WLAN_ESE */ pRoamProfile->AuthType.authType[0] = eCSR_AUTH_TYPE_UNKNOWN; break; } @@ -3905,7 +3905,7 @@ int iw_set_auth(struct net_device *dev,struct iw_request_info *info, 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) { @@ -3918,7 +3918,7 @@ int iw_set_auth(struct net_device *dev,struct iw_request_info *info, 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) { @@ -3941,7 +3941,7 @@ int iw_set_auth(struct net_device *dev,struct iw_request_info *info, #else /*Save the key management*/ pWextState->authKeyMgmt = wrqu->param.value; -#endif /* FEATURE_WLAN_CCX */ +#endif /* FEATURE_WLAN_ESE */ } break; @@ -4246,7 +4246,7 @@ void hdd_indicateUnprotMgmtFrame( hdd_adapter_t *pAdapter, } #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 ) @@ -4313,7 +4313,7 @@ void hdd_indicateCckmPreAuth(hdd_adapter_t *pAdapter, tCsrRoamInfo *pRoamInfo) wireless_send_event(pAdapter->dev, IWEVCUSTOM, &wrqu, buf); } -void hdd_indicateCcxAdjApRepInd(hdd_adapter_t *pAdapter, +void hdd_indicateEseAdjApRepInd(hdd_adapter_t *pAdapter, tCsrRoamInfo *pRoamInfo) { union iwreq_data wrqu; @@ -4338,7 +4338,7 @@ void hdd_indicateCcxAdjApRepInd(hdd_adapter_t *pAdapter, 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; @@ -4348,10 +4348,10 @@ void hdd_indicateCcxBcnReportInd(const hdd_adapter_t *pAdapter, 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 CCXBCNREPHEADER_LEN (18) +#define ESEBCNREPHEADER_LEN (18) if ((NULL == pAdapter) || (NULL == pRoamInfo)) return; @@ -4365,7 +4365,7 @@ void hdd_indicateCcxBcnReportInd(const hdd_adapter_t *pAdapter, 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, @@ -4374,12 +4374,12 @@ void hdd_indicateCcxBcnReportInd(const hdd_adapter_t *pAdapter, 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; @@ -4388,7 +4388,7 @@ void hdd_indicateCcxBcnReportInd(const hdd_adapter_t *pAdapter, } else { - while (lastSent < pRoamInfo->pCcxBcnReportRsp->numBss) + while (lastSent < pRoamInfo->pEseBcnReportRsp->numBss) { memset(&wrqu, '\0', sizeof(wrqu)); memset(buf, '\0', sizeof(buf)); @@ -4397,10 +4397,10 @@ void hdd_indicateCcxBcnReportInd(const hdd_adapter_t *pAdapter, pos = buf; freeBytes = IW_CUSTOM_MAX; - for (i = lastSent; i < pRoamInfo->pCcxBcnReportRsp->numBss; i++) + for (i = lastSent; i < pRoamInfo->pEseBcnReportRsp->numBss; i++) { - len = bcnRepFieldSize + ieLenByte + pRoamInfo->pCcxBcnReportRsp->bcnRepBssInfo[i].ieLen; - if ((len + tot_bcn_ieLen) > (IW_CUSTOM_MAX - CCXBCNREPHEADER_LEN)) + len = bcnRepFieldSize + ieLenByte + pRoamInfo->pEseBcnReportRsp->bcnRepBssInfo[i].ieLen; + if ((len + tot_bcn_ieLen) > (IW_CUSTOM_MAX - ESEBCNREPHEADER_LEN)) { break; } @@ -4409,17 +4409,17 @@ void hdd_indicateCcxBcnReportInd(const hdd_adapter_t *pAdapter, 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->pEseBcnReportRsp->measurementToken, pRoamInfo->pEseBcnReportRsp->flag, sendBss, tot_bcn_ieLen); nBytes = snprintf(pos, freeBytes, "CCXBCNREP=%d %d %d ", - pRoamInfo->pCcxBcnReportRsp->measurementToken, pRoamInfo->pCcxBcnReportRsp->flag, + pRoamInfo->pEseBcnReportRsp->measurementToken, pRoamInfo->pEseBcnReportRsp->flag, sendBss); pos += nBytes; freeBytes -= nBytes; @@ -4435,37 +4435,37 @@ void hdd_indicateCcxBcnReportInd(const hdd_adapter_t *pAdapter, " 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; } @@ -4480,4 +4480,4 @@ void hdd_indicateCcxBcnReportInd(const hdd_adapter_t *pAdapter, } } -#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 5ae8a6dd790f..8712c1b256ae 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); @@ -145,11 +145,11 @@ static void NotifyIsMAWCIniFeatureEnabled(hdd_context_t *pHddCtx, unsigned long } #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 @@ -1096,21 +1096,21 @@ REG_TABLE_ENTRY g_registry_table[] = 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 @@ -1133,8 +1133,8 @@ REG_TABLE_ENTRY g_registry_table[] = #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, @@ -2350,7 +2350,7 @@ REG_TABLE_ENTRY g_registry_table[] = 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, @@ -3496,9 +3496,9 @@ static void print_hdd_cfg(hdd_context_t *pHddCtx) 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 @@ -3506,7 +3506,7 @@ static void print_hdd_cfg(hdd_context_t *pHddCtx) 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); @@ -5193,7 +5193,7 @@ VOS_STATUS hdd_set_sme_config( hdd_context_t *pHddCtx ) 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; @@ -5240,14 +5240,14 @@ VOS_STATUS hdd_set_sme_config( hdd_context_t *pHddCtx ) 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; if (pConfig->nSelect5GHzMargin) { diff --git a/CORE/HDD/src/wlan_hdd_cfg80211.c b/CORE/HDD/src/wlan_hdd_cfg80211.c index d091b716c32a..fe32ec1c7887 100644 --- a/CORE/HDD/src/wlan_hdd_cfg80211.c +++ b/CORE/HDD/src/wlan_hdd_cfg80211.c @@ -171,7 +171,7 @@ static const u32 hdd_cipher_suites[] = 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, @@ -818,13 +818,13 @@ int wlan_hdd_cfg80211_init(struct device *dev, wiphy->wowlan.pattern_min_len = 1; wiphy->wowlan.pattern_max_len = WOWL_PTRN_MAX_SIZE; -#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 ) { @@ -3811,7 +3811,7 @@ static int wlan_hdd_cfg80211_add_key( struct wiphy *wiphy, } #endif -#ifdef FEATURE_WLAN_CCX +#ifdef FEATURE_WLAN_ESE case WLAN_CIPHER_SUITE_KRK: setKey.encType = eCSR_ENCRYPT_TYPE_KRK; break; @@ -5813,7 +5813,7 @@ static int wlan_hdd_cfg80211_set_auth_type(hdd_adapter_t *pAdapter, "%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__); @@ -5867,7 +5867,7 @@ static int wlan_hdd_set_akm_suite( hdd_adapter_t *pAdapter, __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: @@ -5939,7 +5939,7 @@ static int wlan_hdd_cfg80211_set_cipher( hdd_adapter_t *pAdapter, 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_ipa.c b/CORE/HDD/src/wlan_hdd_ipa.c index 6d0aa84458e3..a198040111e3 100644 --- a/CORE/HDD/src/wlan_hdd_ipa.c +++ b/CORE/HDD/src/wlan_hdd_ipa.c @@ -912,13 +912,26 @@ static int hdd_ipa_setup_sys_pipe(struct hdd_ipa_priv *hdd_ipa) { int i, ret = 0; struct ipa_sys_connect_params *ipa; + uint32_t desc_fifo_sz; + + /* The maximum number of descriptors that can be provided to a BAM at + * once is one less than the total number of descriptors that the buffer + * can contain. + * If max_num_of_descriptors = (BAM_PIPE_DESCRIPTOR_FIFO_SIZE / sizeof + * (SPS_DESCRIPTOR)), then (max_num_of_descriptors - 1) descriptors can + * be provided at once. + * Because of above requirement, one extra descriptor will be added to + * make sure hardware always has one descriptor. + */ + desc_fifo_sz = hdd_ipa->hdd_ctx->cfg_ini->IpaDescSize + + sizeof(struct sps_iovec); /*setup TX pipes */ for (i = 0; i < HDD_IPA_MAX_IFACE; i++) { ipa = &hdd_ipa->sys_pipe[i].ipa_sys_params; ipa->client = hdd_ipa_adapter_2_client[i].cons_client; - ipa->desc_fifo_sz = hdd_ipa->hdd_ctx->cfg_ini->IpaDescSize; + ipa->desc_fifo_sz = desc_fifo_sz; ipa->priv = &hdd_ipa->iface_context[i]; ipa->notify = hdd_ipa_i2w_cb; @@ -944,17 +957,7 @@ static int hdd_ipa_setup_sys_pipe(struct hdd_ipa_priv *hdd_ipa) ipa->client = hdd_ipa->prod_client; - /* The maximum number of descriptors that can be provided to a BAM at - * once is one less than the total number of descriptors that the buffer - * can contain. - * If max_num_of_descriptors = (BAM_PIPE_DESCRIPTOR_FIFO_SIZE / sizeof - * (SPS_DESCRIPTOR)), then (max_num_of_descriptors - 1) descriptors can - * be provided at once. - * Because of above requirement, one extra descriptor will be added to - * make sure hardware always has one descriptor. - */ - ipa->desc_fifo_sz = hdd_ipa->hdd_ctx->cfg_ini->IpaDescSize - + sizeof(struct sps_iovec); + ipa->desc_fifo_sz = desc_fifo_sz; ipa->priv = hdd_ipa; ipa->notify = hdd_ipa_w2i_cb; diff --git a/CORE/HDD/src/wlan_hdd_main.c b/CORE/HDD/src/wlan_hdd_main.c index 501dca00ed5c..c3e5ef6bae8c 100644 --- a/CORE/HDD/src/wlan_hdd_main.c +++ b/CORE/HDD/src/wlan_hdd_main.c @@ -175,15 +175,15 @@ DEFINE_SPINLOCK(hdd_context_lock); #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) +#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 */ /* * Maximum buffer size used for returning the data back to user space */ @@ -227,7 +227,7 @@ int isWDresetInProgress(void); 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, @@ -253,11 +253,11 @@ extern int hdd_ftm_stop(hdd_context_t *pHddCtx); v_VOID_t wlan_hdd_auto_shutdown_cb(v_PVOID_t data); #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 int hdd_netdev_notifier_call(struct notifier_block * nb, unsigned long state, @@ -1990,13 +1990,13 @@ static int hdd_parse_setrmcrate_command(tANI_U8 *pValue, return 0; } -#if defined(FEATURE_WLAN_CCX) && defined(FEATURE_WLAN_CCX_UPLOAD) +#if defined(FEATURE_WLAN_ESE) && defined(FEATURE_WLAN_ESE_UPLOAD) /**--------------------------------------------------------------------------- \brief hdd_parse_plm_cmd() - HDD Parse Plm command This function parses the plm command passed in the format - CCXPLMREQ<space><enable><space><dialog_token><space> + ESEPLMREQ<space><enable><space><dialog_token><space> <meas_token><space><num_of_bursts><space><burst_int><space> <measu duration><space><burst_len><space><desired_tx_pwr> <space><multcast_addr><space><number_of_channels> @@ -2750,7 +2750,7 @@ int hdd_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd) } #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; @@ -2807,7 +2807,7 @@ int hdd_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd) } } #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; @@ -2897,25 +2897,25 @@ int hdd_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd) } 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, @@ -2930,14 +2930,14 @@ int hdd_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd) 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; @@ -3616,7 +3616,7 @@ int hdd_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd) 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) { @@ -3743,8 +3743,8 @@ int hdd_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd) (tSmeFastRoamTrigger)(trigger)); } #endif -#if defined(FEATURE_WLAN_CCX) && defined(FEATURE_WLAN_CCX_UPLOAD) - else if (strncmp(command, "CCXPLMREQ", 9) == 0) +#if defined(FEATURE_WLAN_ESE) && defined(FEATURE_WLAN_ESE_UPLOAD) + else if (strncmp(command, "ESEPLMREQ", 9) == 0) { tANI_U8 *value = command; eHalStatus status = eHAL_STATUS_SUCCESS; @@ -3775,20 +3775,20 @@ int hdd_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd) } } #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; @@ -3797,34 +3797,34 @@ int hdd_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd) /* 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) @@ -3863,14 +3863,14 @@ int hdd_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd) 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; @@ -4117,7 +4117,7 @@ int hdd_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd) } #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; @@ -4143,7 +4143,7 @@ int hdd_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd) ret = -EINVAL; goto exit; } - status = sme_SetCcxRoamScanChannelList((tHalHandle)(pHddCtx->hHal), + status = sme_SetEseRoamScanChannelList((tHalHandle)(pHddCtx->hHal), ChannelList, numChannels); if (eHAL_STATUS_SUCCESS != status) @@ -4298,32 +4298,32 @@ int hdd_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd) 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; } - status = sme_SetCcxBeaconRequest((tHalHandle)(pHddCtx->hHal), + status = sme_SetEseBeaconRequest((tHalHandle)(pHddCtx->hHal), pAdapter->sessionId, - &ccxBcnReq); + &eseBcnReq); if (eHAL_STATUS_SUCCESS != status) { VOS_TRACE( VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR, - "%s: sme_SetCcxBeaconRequest failed (%d)", + "%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 if (strncmp(command, "SETMCRATE", 9) == 0) { tANI_U8 *value = command; @@ -4349,12 +4349,12 @@ exit: return ret; } -#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 @@ -4365,13 +4365,13 @@ exit: 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; @@ -4403,12 +4403,12 @@ static VOS_STATUS hdd_parse_ccx_beacon_req(tANI_U8 *pValue, 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++) { @@ -4438,7 +4438,7 @@ static VOS_STATUS hdd_parse_ccx_beacon_req(tANI_U8 *pValue, "Invalid Measurement Token(%d)", tempInt); return -EINVAL; } - pCcxBcnReq->bcnReq[j].measurementToken = tempInt; + pEseBcnReq->bcnReq[j].measurementToken = tempInt; break; case 1: /* Channel number */ @@ -4449,7 +4449,7 @@ static VOS_STATUS hdd_parse_ccx_beacon_req(tANI_U8 *pValue, "Invalid Channel Number(%d)", tempInt); return -EINVAL; } - pCcxBcnReq->bcnReq[j].channel = tempInt; + pEseBcnReq->bcnReq[j].channel = tempInt; break; case 2: /* Scan mode */ @@ -4459,32 +4459,32 @@ static VOS_STATUS hdd_parse_ccx_beacon_req(tANI_U8 *pValue, "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)", 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; @@ -4628,9 +4628,9 @@ static VOS_STATUS hdd_get_tsm_stats(hdd_adapter_t *pAdapter, } 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; @@ -5634,7 +5634,7 @@ VOS_STATUS hdd_parse_reassoc_command_data(tANI_U8 *pValue, #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 This function parses the SETCCKM IE command @@ -5710,7 +5710,7 @@ VOS_STATUS hdd_parse_get_cckm_ie(tANI_U8 *pValue, tANI_U8 **pCckmIe, *pCckmIeLen = i; 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 648126e8733c..56da370d8eec 100644 --- a/CORE/HDD/src/wlan_hdd_wext.c +++ b/CORE/HDD/src/wlan_hdd_wext.c @@ -1084,7 +1084,7 @@ VOS_STATUS wlan_hdd_get_snr(hdd_adapter_t *pAdapter, v_S7_t *snr) 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 ) { @@ -3946,12 +3946,12 @@ static int iw_set_encodeext(struct net_device *dev, 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; @@ -6783,7 +6783,7 @@ static int iw_get_char_setnone(struct net_device *dev, struct iw_request_info *i } #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; @@ -10428,7 +10428,7 @@ static const struct iw_priv_args we_private_args[] = { 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 d0d49e4c3d0c..493ab1beb868 100644 --- a/CORE/HDD/src/wlan_hdd_wmm.c +++ b/CORE/HDD/src/wlan_hdd_wmm.c @@ -440,7 +440,7 @@ static v_BOOL_t hdd_wmm_is_access_allowed(hdd_adapter_t* pAdapter, 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 @@ -581,7 +581,7 @@ VOS_STATUS hdd_wmm_disable_inactivity_timer(hdd_wmm_qos_context_t* pQosContext) return vos_status; } -#endif // FEATURE_WLAN_CCX +#endif // FEATURE_WLAN_ESE /** @brief hdd_wmm_sme_callback() - callback registered by HDD with SME for receiving @@ -682,7 +682,7 @@ static eHalStatus hdd_wmm_sme_callback (tHalHandle hHal, 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, @@ -690,7 +690,7 @@ static eHalStatus hdd_wmm_sme_callback (tHalHandle hHal, __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); @@ -1407,7 +1407,7 @@ static void hdd_wmm_do_implicit_qos(struct work_struct *work) 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; @@ -1642,7 +1642,7 @@ VOS_STATUS hdd_wmm_adapter_close ( hdd_adapter_t* pAdapter ) { 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 vos_flush_work(&pQosContext->wmmAcSetupImplicitQos); @@ -2665,7 +2665,7 @@ hdd_wlan_wmm_status_e hdd_wmm_delts( hdd_adapter_t* pAdapter, // 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 diff --git a/CORE/MAC/inc/aniGlobal.h b/CORE/MAC/inc/aniGlobal.h index 4d38f3e6bc88..5052601e821f 100644 --- a/CORE/MAC/inc/aniGlobal.h +++ b/CORE/MAC/inc/aniGlobal.h @@ -85,9 +85,9 @@ typedef struct sAniSirGlobal *tpAniSirGlobal; #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" @@ -238,8 +238,8 @@ typedef struct sLimTimers 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 @@ -913,7 +913,7 @@ tLimMlmOemDataRsp *gpLimMlmOemDataRsp; 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 d63c39541d27..ca79ec57513a 100644 --- a/CORE/MAC/inc/aniSystemDefs.h +++ b/CORE/MAC/inc/aniSystemDefs.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011-2013 The Linux Foundation. All rights reserved. + * Copyright (c) 2011-2014 The Linux Foundation. All rights reserved. * * Previously licensed under the ISC license by Qualcomm Atheros, Inc. * @@ -84,7 +84,7 @@ typedef enum eAniAuthType #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 @@ typedef struct sSirAddie 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/qwlan_version.h b/CORE/MAC/inc/qwlan_version.h index 6f6594213e0a..21195c79c49e 100644 --- a/CORE/MAC/inc/qwlan_version.h +++ b/CORE/MAC/inc/qwlan_version.h @@ -42,9 +42,9 @@ BRIEF DESCRIPTION: #define QWLAN_VERSION_MINOR 0 #define QWLAN_VERSION_PATCH 0 #define QWLAN_VERSION_EXTRA "" -#define QWLAN_VERSION_BUILD 68 +#define QWLAN_VERSION_BUILD 69 -#define QWLAN_VERSIONSTR "1.0.0.68" +#define QWLAN_VERSIONSTR "1.0.0.69" #ifdef QCA_WIFI_2_0 diff --git a/CORE/MAC/inc/sirApi.h b/CORE/MAC/inc/sirApi.h index b917cdb161dd..4841972ecc29 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 @@ -697,7 +697,7 @@ typedef struct sSirBssDescription 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 +734,7 @@ typedef struct sSirSmeStartBssRsp 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 +743,17 @@ typedef struct sSirDFSChannelList } 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 @@ -1041,7 +1041,7 @@ typedef struct sSirSmeJoinReq 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. @@ -1064,13 +1064,13 @@ typedef struct sSirSmeJoinReq #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 @@ -1119,7 +1119,7 @@ typedef struct sSirSmeJoinRsp #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 @@ -2160,7 +2160,7 @@ typedef struct sAniGetSnrReq 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 @@ -2176,7 +2176,7 @@ typedef struct sAniGetRoamRssiRsp #endif -#if defined(FEATURE_WLAN_CCX) || defined(FEATURE_WLAN_CCX_UPLOAD) +#if defined(FEATURE_WLAN_ESE) || defined(FEATURE_WLAN_ESE_UPLOAD) typedef struct sSirTsmIE { tANI_U8 tsid; @@ -2231,22 +2231,22 @@ typedef struct sAniGetTsmStatsRsp 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 @@ -2534,40 +2534,40 @@ typedef __ani_attr_pre_packed struct sSirTclasInfo }__ani_attr_packed tclasParams; } __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; -typedef struct sSirMacCCXTSMIE +} tSirMacESETSRSIE; +typedef struct sSirMacESETSMIE { tANI_U8 tsid; tANI_U8 state; tANI_U16 msmt_interval; -} tSirMacCCXTSMIE; +} tSirMacESETSMIE; typedef struct sTSMStats { tANI_U8 tid; tSirMacAddr bssId; tTrafStrmMetrics tsmMetrics; } tTSMStats, *tpTSMStats; -typedef struct sCcxTSMContext +typedef struct sEseTSMContext { tANI_U8 tid; - tSirMacCCXTSMIE tsmInfo; + tSirMacESETSMIE tsmInfo; tTrafStrmMetrics tsmMetrics; -} tCcxTSMContext, *tpCcxTSMContext; -typedef struct sCcxPEContext +} tEseTSMContext, *tpEseTSMContext; +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; -#endif /* FEATURE_WLAN_CCX && FEATURE_WLAN_CCX_UPLOAD */ + tEseTSMContext tsm; +} tEsePEContext, *tpEsePEContext; +#endif /* FEATURE_WLAN_ESE && FEATURE_WLAN_ESE_UPLOAD */ typedef struct sSirAddtsReqInfo { @@ -2577,8 +2577,8 @@ typedef struct sSirAddtsReqInfo 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; @@ -2598,8 +2598,8 @@ typedef struct sSirAddtsRspInfo 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; @@ -2666,7 +2666,7 @@ typedef struct sSirDeltsRsp tSirDeltsReqInfo rsp; } tSirDeltsRsp, *tpSirDeltsRsp; -#if defined(FEATURE_WLAN_CCX) && defined(FEATURE_WLAN_CCX_UPLOAD) +#if defined(FEATURE_WLAN_ESE) && defined(FEATURE_WLAN_ESE_UPLOAD) typedef struct sSirPlmReq { tANI_U16 diag_token; // Dialog token @@ -2687,7 +2687,7 @@ typedef struct sSirPlmReq } tSirPlmReq, *tpSirPlmReq; #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) #define SIR_QOS_NUM_TSPEC_MAX 2 #define SIR_QOS_NUM_AC_MAX 4 @@ -2724,7 +2724,7 @@ typedef struct sSirAggrQosRsp tSirAggrQosRspInfo aggrInfo; } tSirAggrQosRsp, *tpSirAggrQosRsp; -#endif/*WLAN_FEATURE_VOWIFI_11R || FEATURE_WLAN_CCX*/ +#endif/*WLAN_FEATURE_VOWIFI_11R || FEATURE_WLAN_ESE*/ typedef struct sSirSetTxPowerReq { @@ -3829,7 +3829,7 @@ typedef struct sSirRoamOffloadScanReq 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 c64ab8d94900..732300499d97 100644 --- a/CORE/MAC/inc/sirMacProtDef.h +++ b/CORE/MAC/inc/sirMacProtDef.h @@ -424,9 +424,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 @@ -711,11 +711,11 @@ typedef enum eSirMacStatusCodes 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 @@ -2418,7 +2418,7 @@ typedef __ani_attr_pre_packed struct sSirMacActionFrameHdr 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 f329492ff55f..0285578e8748 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 @@ enum eWniMsgTypes 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, diff --git a/CORE/MAC/src/include/dot11f.h b/CORE/MAC/src/include/dot11f.h index 851304b6a8f1..c460f78493d0 100644 --- a/CORE/MAC/src/include/dot11f.h +++ b/CORE/MAC/src/include/dot11f.h @@ -38,7 +38,7 @@ * * * This file was automatically generated by 'framesc' - * Tue Jan 7 20:37:51 2014 from the following file(s): + * Fri Mar 21 17:49:18 2014 from the following file(s): * * dot11f.frms * @@ -3142,164 +3142,6 @@ tANI_U32 dot11fGetPackedIEAirgo(tpAniSirGlobal, tDot11fIEAirgo*, tANI_U32*); #ifdef __cplusplus }; /* End extern "C". */ #endif /* C++ */ -// EID 156 (0x9c) {OUI 0x00, 0x40, 0x96, 0x00} -typedef struct sDot11fIECCXCckmOpaque { - tANI_U8 present; - tANI_U8 num_data; - tANI_U8 data[20]; -} tDot11fIECCXCckmOpaque; - -#define DOT11F_EID_CCXCCKMOPAQUE ( 156 ) - -// N.B. These #defines do *not* include the EID & length -#define DOT11F_IE_CCXCCKMOPAQUE_MIN_LEN ( 10 ) - -#define DOT11F_IE_CCXCCKMOPAQUE_MAX_LEN ( 24 ) - -#ifdef __cplusplus -extern "C" { -#endif /* C++ */ -tANI_U32 dot11fUnpackIeCCXCckmOpaque(tpAniSirGlobal, tANI_U8*,tANI_U8, tDot11fIECCXCckmOpaque*); - -tANI_U32 dot11fPackIeCCXCckmOpaque(tpAniSirGlobal, tDot11fIECCXCckmOpaque*, tANI_U8*, tANI_U32, tANI_U32*); - -tANI_U32 dot11fGetPackedIECCXCckmOpaque(tpAniSirGlobal, tDot11fIECCXCckmOpaque*, tANI_U32*); - -#ifdef __cplusplus -}; /* End extern "C". */ -#endif /* C++ */ -// EID 221 (0xdd) {OUI 0x00, 0x40, 0x96, 0x01} -typedef struct sDot11fIECCXRadMgmtCap { - tANI_U8 present; - tANI_U8 mgmt_state; - tANI_U8 mbssid_mask: 3; - tANI_U8 reserved: 5; -} tDot11fIECCXRadMgmtCap; - -#define DOT11F_EID_CCXRADMGMTCAP ( 221 ) - -// N.B. These #defines do *not* include the EID & length -#define DOT11F_IE_CCXRADMGMTCAP_MIN_LEN ( 6 ) - -#define DOT11F_IE_CCXRADMGMTCAP_MAX_LEN ( 6 ) - -#ifdef __cplusplus -extern "C" { -#endif /* C++ */ -tANI_U32 dot11fUnpackIeCCXRadMgmtCap(tpAniSirGlobal, tANI_U8*,tANI_U8, tDot11fIECCXRadMgmtCap*); - -tANI_U32 dot11fPackIeCCXRadMgmtCap(tpAniSirGlobal, tDot11fIECCXRadMgmtCap*, tANI_U8*, tANI_U32, tANI_U32*); - -tANI_U32 dot11fGetPackedIECCXRadMgmtCap(tpAniSirGlobal, tDot11fIECCXRadMgmtCap*, tANI_U32*); - -#ifdef __cplusplus -}; /* End extern "C". */ -#endif /* C++ */ -// EID 221 (0xdd) {OUI 0x00, 0x40, 0x96, 0x07} -typedef struct sDot11fIECCXTrafStrmMet { - tANI_U8 present; - tANI_U8 tsid; - tANI_U8 state; - tANI_U16 msmt_interval; -} tDot11fIECCXTrafStrmMet; - -#define DOT11F_EID_CCXTRAFSTRMMET ( 221 ) - -// N.B. These #defines do *not* include the EID & length -#define DOT11F_IE_CCXTRAFSTRMMET_MIN_LEN ( 8 ) - -#define DOT11F_IE_CCXTRAFSTRMMET_MAX_LEN ( 8 ) - -#ifdef __cplusplus -extern "C" { -#endif /* C++ */ -tANI_U32 dot11fUnpackIeCCXTrafStrmMet(tpAniSirGlobal, tANI_U8*,tANI_U8, tDot11fIECCXTrafStrmMet*); - -tANI_U32 dot11fPackIeCCXTrafStrmMet(tpAniSirGlobal, tDot11fIECCXTrafStrmMet*, tANI_U8*, tANI_U32, tANI_U32*); - -tANI_U32 dot11fGetPackedIECCXTrafStrmMet(tpAniSirGlobal, tDot11fIECCXTrafStrmMet*, tANI_U32*); - -#ifdef __cplusplus -}; /* End extern "C". */ -#endif /* C++ */ -// EID 221 (0xdd) {OUI 0x00, 0x40, 0x96, 0x08} -typedef struct sDot11fIECCXTrafStrmRateSet { - tANI_U8 present; - tANI_U8 tsid; - tANI_U8 num_tsrates; - tANI_U8 tsrates[8]; -} tDot11fIECCXTrafStrmRateSet; - -#define DOT11F_EID_CCXTRAFSTRMRATESET ( 221 ) - -// N.B. These #defines do *not* include the EID & length -#define DOT11F_IE_CCXTRAFSTRMRATESET_MIN_LEN ( 5 ) - -#define DOT11F_IE_CCXTRAFSTRMRATESET_MAX_LEN ( 13 ) - -#ifdef __cplusplus -extern "C" { -#endif /* C++ */ -tANI_U32 dot11fUnpackIeCCXTrafStrmRateSet(tpAniSirGlobal, tANI_U8*,tANI_U8, tDot11fIECCXTrafStrmRateSet*); - -tANI_U32 dot11fPackIeCCXTrafStrmRateSet(tpAniSirGlobal, tDot11fIECCXTrafStrmRateSet*, tANI_U8*, tANI_U32, tANI_U32*); - -tANI_U32 dot11fGetPackedIECCXTrafStrmRateSet(tpAniSirGlobal, tDot11fIECCXTrafStrmRateSet*, tANI_U32*); - -#ifdef __cplusplus -}; /* End extern "C". */ -#endif /* C++ */ -// EID 150 (0x96) {OUI 0x00, 0x40, 0x96, 0x00} -typedef struct sDot11fIECCXTxmitPower { - tANI_U8 present; - tANI_U8 power_limit; - tANI_U8 reserved; -} tDot11fIECCXTxmitPower; - -#define DOT11F_EID_CCXTXMITPOWER ( 150 ) - -// N.B. These #defines do *not* include the EID & length -#define DOT11F_IE_CCXTXMITPOWER_MIN_LEN ( 6 ) - -#define DOT11F_IE_CCXTXMITPOWER_MAX_LEN ( 6 ) - -#ifdef __cplusplus -extern "C" { -#endif /* C++ */ -tANI_U32 dot11fUnpackIeCCXTxmitPower(tpAniSirGlobal, tANI_U8*,tANI_U8, tDot11fIECCXTxmitPower*); - -tANI_U32 dot11fPackIeCCXTxmitPower(tpAniSirGlobal, tDot11fIECCXTxmitPower*, tANI_U8*, tANI_U32, tANI_U32*); - -tANI_U32 dot11fGetPackedIECCXTxmitPower(tpAniSirGlobal, tDot11fIECCXTxmitPower*, tANI_U32*); - -#ifdef __cplusplus -}; /* End extern "C". */ -#endif /* C++ */ -// EID 221 (0xdd) {OUI 0x00, 0x40, 0x96, 0x03} -typedef struct sDot11fIECCXVersion { - tANI_U8 present; - tANI_U8 version; -} tDot11fIECCXVersion; - -#define DOT11F_EID_CCXVERSION ( 221 ) - -// N.B. These #defines do *not* include the EID & length -#define DOT11F_IE_CCXVERSION_MIN_LEN ( 5 ) - -#define DOT11F_IE_CCXVERSION_MAX_LEN ( 5 ) - -#ifdef __cplusplus -extern "C" { -#endif /* C++ */ -tANI_U32 dot11fUnpackIeCCXVersion(tpAniSirGlobal, tANI_U8*,tANI_U8, tDot11fIECCXVersion*); - -tANI_U32 dot11fPackIeCCXVersion(tpAniSirGlobal, tDot11fIECCXVersion*, tANI_U8*, tANI_U32, tANI_U32*); - -tANI_U32 dot11fGetPackedIECCXVersion(tpAniSirGlobal, tDot11fIECCXVersion*, tANI_U32*); - -#ifdef __cplusplus -}; /* End extern "C". */ -#endif /* C++ */ // EID 4 (0x04) typedef struct sDot11fIECFParams { tANI_U8 present; @@ -3515,6 +3357,164 @@ tANI_U32 dot11fGetPackedIEERPInfo(tpAniSirGlobal, tDot11fIEERPInfo*, tANI_U32*); #ifdef __cplusplus }; /* End extern "C". */ #endif /* C++ */ +// EID 156 (0x9c) {OUI 0x00, 0x40, 0x96, 0x00} +typedef struct sDot11fIEESECckmOpaque { + tANI_U8 present; + tANI_U8 num_data; + tANI_U8 data[20]; +} tDot11fIEESECckmOpaque; + +#define DOT11F_EID_ESECCKMOPAQUE ( 156 ) + +// N.B. These #defines do *not* include the EID & length +#define DOT11F_IE_ESECCKMOPAQUE_MIN_LEN ( 10 ) + +#define DOT11F_IE_ESECCKMOPAQUE_MAX_LEN ( 24 ) + +#ifdef __cplusplus +extern "C" { +#endif /* C++ */ +tANI_U32 dot11fUnpackIeESECckmOpaque(tpAniSirGlobal, tANI_U8*,tANI_U8, tDot11fIEESECckmOpaque*); + +tANI_U32 dot11fPackIeESECckmOpaque(tpAniSirGlobal, tDot11fIEESECckmOpaque*, tANI_U8*, tANI_U32, tANI_U32*); + +tANI_U32 dot11fGetPackedIEESECckmOpaque(tpAniSirGlobal, tDot11fIEESECckmOpaque*, tANI_U32*); + +#ifdef __cplusplus +}; /* End extern "C". */ +#endif /* C++ */ +// EID 221 (0xdd) {OUI 0x00, 0x40, 0x96, 0x01} +typedef struct sDot11fIEESERadMgmtCap { + tANI_U8 present; + tANI_U8 mgmt_state; + tANI_U8 mbssid_mask: 3; + tANI_U8 reserved: 5; +} tDot11fIEESERadMgmtCap; + +#define DOT11F_EID_ESERADMGMTCAP ( 221 ) + +// N.B. These #defines do *not* include the EID & length +#define DOT11F_IE_ESERADMGMTCAP_MIN_LEN ( 6 ) + +#define DOT11F_IE_ESERADMGMTCAP_MAX_LEN ( 6 ) + +#ifdef __cplusplus +extern "C" { +#endif /* C++ */ +tANI_U32 dot11fUnpackIeESERadMgmtCap(tpAniSirGlobal, tANI_U8*,tANI_U8, tDot11fIEESERadMgmtCap*); + +tANI_U32 dot11fPackIeESERadMgmtCap(tpAniSirGlobal, tDot11fIEESERadMgmtCap*, tANI_U8*, tANI_U32, tANI_U32*); + +tANI_U32 dot11fGetPackedIEESERadMgmtCap(tpAniSirGlobal, tDot11fIEESERadMgmtCap*, tANI_U32*); + +#ifdef __cplusplus +}; /* End extern "C". */ +#endif /* C++ */ +// EID 221 (0xdd) {OUI 0x00, 0x40, 0x96, 0x07} +typedef struct sDot11fIEESETrafStrmMet { + tANI_U8 present; + tANI_U8 tsid; + tANI_U8 state; + tANI_U16 msmt_interval; +} tDot11fIEESETrafStrmMet; + +#define DOT11F_EID_ESETRAFSTRMMET ( 221 ) + +// N.B. These #defines do *not* include the EID & length +#define DOT11F_IE_ESETRAFSTRMMET_MIN_LEN ( 8 ) + +#define DOT11F_IE_ESETRAFSTRMMET_MAX_LEN ( 8 ) + +#ifdef __cplusplus +extern "C" { +#endif /* C++ */ +tANI_U32 dot11fUnpackIeESETrafStrmMet(tpAniSirGlobal, tANI_U8*,tANI_U8, tDot11fIEESETrafStrmMet*); + +tANI_U32 dot11fPackIeESETrafStrmMet(tpAniSirGlobal, tDot11fIEESETrafStrmMet*, tANI_U8*, tANI_U32, tANI_U32*); + +tANI_U32 dot11fGetPackedIEESETrafStrmMet(tpAniSirGlobal, tDot11fIEESETrafStrmMet*, tANI_U32*); + +#ifdef __cplusplus +}; /* End extern "C". */ +#endif /* C++ */ +// EID 221 (0xdd) {OUI 0x00, 0x40, 0x96, 0x08} +typedef struct sDot11fIEESETrafStrmRateSet { + tANI_U8 present; + tANI_U8 tsid; + tANI_U8 num_tsrates; + tANI_U8 tsrates[8]; +} tDot11fIEESETrafStrmRateSet; + +#define DOT11F_EID_ESETRAFSTRMRATESET ( 221 ) + +// N.B. These #defines do *not* include the EID & length +#define DOT11F_IE_ESETRAFSTRMRATESET_MIN_LEN ( 5 ) + +#define DOT11F_IE_ESETRAFSTRMRATESET_MAX_LEN ( 13 ) + +#ifdef __cplusplus +extern "C" { +#endif /* C++ */ +tANI_U32 dot11fUnpackIeESETrafStrmRateSet(tpAniSirGlobal, tANI_U8*,tANI_U8, tDot11fIEESETrafStrmRateSet*); + +tANI_U32 dot11fPackIeESETrafStrmRateSet(tpAniSirGlobal, tDot11fIEESETrafStrmRateSet*, tANI_U8*, tANI_U32, tANI_U32*); + +tANI_U32 dot11fGetPackedIEESETrafStrmRateSet(tpAniSirGlobal, tDot11fIEESETrafStrmRateSet*, tANI_U32*); + +#ifdef __cplusplus +}; /* End extern "C". */ +#endif /* C++ */ +// EID 150 (0x96) {OUI 0x00, 0x40, 0x96, 0x00} +typedef struct sDot11fIEESETxmitPower { + tANI_U8 present; + tANI_U8 power_limit; + tANI_U8 reserved; +} tDot11fIEESETxmitPower; + +#define DOT11F_EID_ESETXMITPOWER ( 150 ) + +// N.B. These #defines do *not* include the EID & length +#define DOT11F_IE_ESETXMITPOWER_MIN_LEN ( 6 ) + +#define DOT11F_IE_ESETXMITPOWER_MAX_LEN ( 6 ) + +#ifdef __cplusplus +extern "C" { +#endif /* C++ */ +tANI_U32 dot11fUnpackIeESETxmitPower(tpAniSirGlobal, tANI_U8*,tANI_U8, tDot11fIEESETxmitPower*); + +tANI_U32 dot11fPackIeESETxmitPower(tpAniSirGlobal, tDot11fIEESETxmitPower*, tANI_U8*, tANI_U32, tANI_U32*); + +tANI_U32 dot11fGetPackedIEESETxmitPower(tpAniSirGlobal, tDot11fIEESETxmitPower*, tANI_U32*); + +#ifdef __cplusplus +}; /* End extern "C". */ +#endif /* C++ */ +// EID 221 (0xdd) {OUI 0x00, 0x40, 0x96, 0x03} +typedef struct sDot11fIEESEVersion { + tANI_U8 present; + tANI_U8 version; +} tDot11fIEESEVersion; + +#define DOT11F_EID_ESEVERSION ( 221 ) + +// N.B. These #defines do *not* include the EID & length +#define DOT11F_IE_ESEVERSION_MIN_LEN ( 5 ) + +#define DOT11F_IE_ESEVERSION_MAX_LEN ( 5 ) + +#ifdef __cplusplus +extern "C" { +#endif /* C++ */ +tANI_U32 dot11fUnpackIeESEVersion(tpAniSirGlobal, tANI_U8*,tANI_U8, tDot11fIEESEVersion*); + +tANI_U32 dot11fPackIeESEVersion(tpAniSirGlobal, tDot11fIEESEVersion*, tANI_U8*, tANI_U32, tANI_U32*); + +tANI_U32 dot11fGetPackedIEESEVersion(tpAniSirGlobal, tDot11fIEESEVersion*, tANI_U32*); + +#ifdef __cplusplus +}; /* End extern "C". */ +#endif /* C++ */ // EID 127 (0x7f) typedef struct sDot11fIEExtCap { tANI_U8 present; @@ -3758,32 +3758,6 @@ tANI_U32 dot11fGetPackedIEFTInfo(tpAniSirGlobal, tDot11fIEFTInfo*, tANI_U32*); #ifdef __cplusplus }; /* End extern "C". */ #endif /* C++ */ -// EID 56 (0x38) -typedef struct sDot11fIEFTTimeoutInterval { - tANI_U8 present; - tANI_U8 timeoutType; - tANI_U32 timeoutValue; -} tDot11fIEFTTimeoutInterval; - -#define DOT11F_EID_FTTIMEOUTINTERVAL ( 56 ) - -// N.B. These #defines do *not* include the EID & length -#define DOT11F_IE_FTTIMEOUTINTERVAL_MIN_LEN ( 5 ) - -#define DOT11F_IE_FTTIMEOUTINTERVAL_MAX_LEN ( 5 ) - -#ifdef __cplusplus -extern "C" { -#endif /* C++ */ -tANI_U32 dot11fUnpackIeFTTimeoutInterval(tpAniSirGlobal, tANI_U8*,tANI_U8, tDot11fIEFTTimeoutInterval*); - -tANI_U32 dot11fPackIeFTTimeoutInterval(tpAniSirGlobal, tDot11fIEFTTimeoutInterval*, tANI_U8*, tANI_U32, tANI_U32*); - -tANI_U32 dot11fGetPackedIEFTTimeoutInterval(tpAniSirGlobal, tDot11fIEFTTimeoutInterval*, tANI_U32*); - -#ifdef __cplusplus -}; /* End extern "C". */ -#endif /* C++ */ // EID 45 (0x2d) typedef struct sDot11fIEHTCaps { tANI_U8 present; @@ -4176,6 +4150,37 @@ tANI_U32 dot11fGetPackedIENeighborReport(tpAniSirGlobal, tDot11fIENeighborReport #ifdef __cplusplus }; /* End extern "C". */ #endif /* C++ */ +// EID 74 (0x4a) +typedef struct sDot11fIEOBSSScanParameters { + tANI_U8 present; + tANI_U16 obssScanPassiveDwell; + tANI_U16 obssScanActiveDwell; + tANI_U16 bssChannelWidthTriggerScanInterval; + tANI_U16 obssScanPassiveTotalPerChannel; + tANI_U16 obssScanActiveTotalPerChannel; + tANI_U16 bssWidthChannelTransitionDelayFactor; + tANI_U16 obssScanActivityThreshold; +} tDot11fIEOBSSScanParameters; + +#define DOT11F_EID_OBSSSCANPARAMETERS ( 74 ) + +// N.B. These #defines do *not* include the EID & length +#define DOT11F_IE_OBSSSCANPARAMETERS_MIN_LEN ( 14 ) + +#define DOT11F_IE_OBSSSCANPARAMETERS_MAX_LEN ( 14 ) + +#ifdef __cplusplus +extern "C" { +#endif /* C++ */ +tANI_U32 dot11fUnpackIeOBSSScanParameters(tpAniSirGlobal, tANI_U8*,tANI_U8, tDot11fIEOBSSScanParameters*); + +tANI_U32 dot11fPackIeOBSSScanParameters(tpAniSirGlobal, tDot11fIEOBSSScanParameters*, tANI_U8*, tANI_U32, tANI_U32*); + +tANI_U32 dot11fGetPackedIEOBSSScanParameters(tpAniSirGlobal, tDot11fIEOBSSScanParameters*, tANI_U32*); + +#ifdef __cplusplus +}; /* End extern "C". */ +#endif /* C++ */ // EID 199 (0xc7) typedef struct sDot11fIEOperatingMode { tANI_U8 present; @@ -4976,6 +4981,32 @@ tANI_U32 dot11fGetPackedIEQOSCapsStation(tpAniSirGlobal, tDot11fIEQOSCapsStation #ifdef __cplusplus }; /* End extern "C". */ #endif /* C++ */ +// EID 110 (0x6e) +typedef struct sDot11fIEQosMapSet { + tANI_U8 present; + tANI_U8 num_dscp_exceptions; + tANI_U8 dscp_exceptions[60]; +} tDot11fIEQosMapSet; + +#define DOT11F_EID_QOSMAPSET ( 110 ) + +// N.B. These #defines do *not* include the EID & length +#define DOT11F_IE_QOSMAPSET_MIN_LEN ( 0 ) + +#define DOT11F_IE_QOSMAPSET_MAX_LEN ( 60 ) + +#ifdef __cplusplus +extern "C" { +#endif /* C++ */ +tANI_U32 dot11fUnpackIeQosMapSet(tpAniSirGlobal, tANI_U8*,tANI_U8, tDot11fIEQosMapSet*); + +tANI_U32 dot11fPackIeQosMapSet(tpAniSirGlobal, tDot11fIEQosMapSet*, tANI_U8*, tANI_U32, tANI_U32*); + +tANI_U32 dot11fGetPackedIEQosMapSet(tpAniSirGlobal, tDot11fIEQosMapSet*, tANI_U32*); + +#ifdef __cplusplus +}; /* End extern "C". */ +#endif /* C++ */ // EID 40 (0x28) typedef struct sDot11fIEQuiet { tANI_U8 present; @@ -5178,6 +5209,32 @@ tANI_U32 dot11fGetPackedIESuppChannels(tpAniSirGlobal, tDot11fIESuppChannels*, t #ifdef __cplusplus }; /* End extern "C". */ #endif /* C++ */ +// EID 59 (0x3b) +typedef struct sDot11fIESuppOperatingClasses { + tANI_U8 present; + tANI_U8 num_classes; + tANI_U8 classes[32]; +} tDot11fIESuppOperatingClasses; + +#define DOT11F_EID_SUPPOPERATINGCLASSES ( 59 ) + +// N.B. These #defines do *not* include the EID & length +#define DOT11F_IE_SUPPOPERATINGCLASSES_MIN_LEN ( 1 ) + +#define DOT11F_IE_SUPPOPERATINGCLASSES_MAX_LEN ( 32 ) + +#ifdef __cplusplus +extern "C" { +#endif /* C++ */ +tANI_U32 dot11fUnpackIeSuppOperatingClasses(tpAniSirGlobal, tANI_U8*,tANI_U8, tDot11fIESuppOperatingClasses*); + +tANI_U32 dot11fPackIeSuppOperatingClasses(tpAniSirGlobal, tDot11fIESuppOperatingClasses*, tANI_U8*, tANI_U32, tANI_U32*); + +tANI_U32 dot11fGetPackedIESuppOperatingClasses(tpAniSirGlobal, tDot11fIESuppOperatingClasses*, tANI_U32*); + +#ifdef __cplusplus +}; /* End extern "C". */ +#endif /* C++ */ // EID 1 (0x01) typedef struct sDot11fIESuppRates { tANI_U8 present; @@ -5203,7 +5260,7 @@ typedef struct sDot11fIESuppRates { ((_x) == 48) || \ ((_x) == 72) || \ ((_x) == 96) || \ - ((_x) == 108)) + ((_x) == 108)) #ifdef __cplusplus extern "C" { @@ -5296,6 +5353,32 @@ tANI_U32 dot11fGetPackedIETPCRequest(tpAniSirGlobal, tDot11fIETPCRequest*, tANI_ #ifdef __cplusplus }; /* End extern "C". */ #endif /* C++ */ +// EID 56 (0x38) +typedef struct sDot11fIETimeoutInterval { + tANI_U8 present; + tANI_U8 timeoutType; + tANI_U32 timeoutValue; +} tDot11fIETimeoutInterval; + +#define DOT11F_EID_TIMEOUTINTERVAL ( 56 ) + +// N.B. These #defines do *not* include the EID & length +#define DOT11F_IE_TIMEOUTINTERVAL_MIN_LEN ( 5 ) + +#define DOT11F_IE_TIMEOUTINTERVAL_MAX_LEN ( 5 ) + +#ifdef __cplusplus +extern "C" { +#endif /* C++ */ +tANI_U32 dot11fUnpackIeTimeoutInterval(tpAniSirGlobal, tANI_U8*,tANI_U8, tDot11fIETimeoutInterval*); + +tANI_U32 dot11fPackIeTimeoutInterval(tpAniSirGlobal, tDot11fIETimeoutInterval*, tANI_U8*, tANI_U32, tANI_U32*); + +tANI_U32 dot11fGetPackedIETimeoutInterval(tpAniSirGlobal, tDot11fIETimeoutInterval*, tANI_U32*); + +#ifdef __cplusplus +}; /* End extern "C". */ +#endif /* C++ */ // EID 191 (0xbf) typedef struct sDot11fIEVHTCaps { tANI_U8 present; @@ -5664,7 +5747,7 @@ tANI_U32 dot11fGetPackedIEWMMParams(tpAniSirGlobal, tDot11fIEWMMParams*, tANI_U3 typedef struct sDot11fIEWPA { tANI_U8 present; tANI_U16 version /* Must be 1! */; - tANI_U8 multicast_cipher_present; //field added to fix the bug in dot11fPackIEWPA + tANI_U8 multicast_cipher_present; //field added to fix the bug in dot11fPackIEWPA tANI_U8 multicast_cipher[4]; tANI_U16 unicast_cipher_count; tANI_U8 unicast_ciphers[4][4]; @@ -6114,7 +6197,7 @@ typedef struct sDot11fAddTSRequest{ tANI_U16 num_WMMTCLAS; tDot11fIEWMMTCLAS WMMTCLAS[2]; tDot11fIEWMMTCLASPROC WMMTCLASPROC; - tDot11fIECCXTrafStrmRateSet CCXTrafStrmRateSet; + tDot11fIEESETrafStrmRateSet ESETrafStrmRateSet; } tDot11fAddTSRequest; #define DOT11F_ADDTSREQUEST ( 3 ) @@ -6148,7 +6231,7 @@ typedef struct sDot11fAddTSResponse{ tANI_U16 num_WMMTCLAS; tDot11fIEWMMTCLAS WMMTCLAS[2]; tDot11fIEWMMTCLASPROC WMMTCLASPROC; - tDot11fIECCXTrafStrmMet CCXTrafStrmMet; + tDot11fIEESETrafStrmMet ESETrafStrmMet; } tDot11fAddTSResponse; #define DOT11F_ADDTSRESPONSE ( 4 ) @@ -6184,13 +6267,14 @@ typedef struct sDot11fAssocRequest{ tDot11fIEAirgo Airgo; tDot11fIEWscIEOpaque WscIEOpaque; tDot11fIEWAPIOpaque WAPIOpaque; - tDot11fIECCXRadMgmtCap CCXRadMgmtCap; - tDot11fIECCXVersion CCXVersion; + tDot11fIEESERadMgmtCap ESERadMgmtCap; + tDot11fIEESEVersion ESEVersion; tDot11fIEP2PIEOpaque P2PIEOpaque; tDot11fIEWFDIEOpaque WFDIEOpaque; tDot11fIEVHTCaps VHTCaps; tDot11fIEExtCap ExtCap; tDot11fIEOperatingMode OperatingMode; + tDot11fIEQosMapSet QosMapSet; } tDot11fAssocRequest; #define DOT11F_ASSOCREQUEST ( 5 ) @@ -6208,35 +6292,38 @@ tANI_U32 dot11fGetPackedAssocRequestSize(tpAniSirGlobal pCtx, tDot11fAssocReques #endif /* C++ */ typedef struct sDot11fAssocResponse{ - tDot11fFfCapabilities Capabilities; - tDot11fFfStatus Status; - tDot11fFfAID AID; - tDot11fIESuppRates SuppRates; - tDot11fIEExtSuppRates ExtSuppRates; - tDot11fIEEDCAParamSet EDCAParamSet; - tDot11fIERCPIIE RCPIIE; - tDot11fIERSNIIE RSNIIE; - tDot11fIERRMEnabledCap RRMEnabledCap; - tDot11fIEMobilityDomain MobilityDomain; - tDot11fIEFTInfo FTInfo; - tANI_U16 num_RICDataDesc; - tDot11fIERICDataDesc RICDataDesc[2]; - tDot11fIEWPA WPA; - tDot11fIEHTCaps HTCaps; - tDot11fIEHTInfo HTInfo; - tDot11fIEWMMParams WMMParams; - tDot11fIEWMMCaps WMMCaps; - tDot11fIECCXRadMgmtCap CCXRadMgmtCap; - tDot11fIECCXTrafStrmMet CCXTrafStrmMet; - tDot11fIECCXTxmitPower CCXTxmitPower; - tANI_U16 num_WMMTSPEC; - tDot11fIEWMMTSPEC WMMTSPEC[4]; - tDot11fIEAirgo Airgo; - tDot11fIEWscAssocRes WscAssocRes; - tDot11fIEP2PAssocRes P2PAssocRes; - tDot11fIEVHTCaps VHTCaps; - tDot11fIEVHTOperation VHTOperation; - tDot11fIEExtCap ExtCap; + tDot11fFfCapabilities Capabilities; + tDot11fFfStatus Status; + tDot11fFfAID AID; + tDot11fIESuppRates SuppRates; + tDot11fIEExtSuppRates ExtSuppRates; + tDot11fIEEDCAParamSet EDCAParamSet; + tDot11fIERCPIIE RCPIIE; + tDot11fIERSNIIE RSNIIE; + tDot11fIERRMEnabledCap RRMEnabledCap; + tDot11fIEMobilityDomain MobilityDomain; + tDot11fIEFTInfo FTInfo; + tANI_U16 num_RICDataDesc; + tDot11fIERICDataDesc RICDataDesc[2]; + tDot11fIEWPA WPA; + tDot11fIETimeoutInterval TimeoutInterval; + tDot11fIEHTCaps HTCaps; + tDot11fIEHTInfo HTInfo; + tDot11fIEWMMParams WMMParams; + tDot11fIEWMMCaps WMMCaps; + tDot11fIEESERadMgmtCap ESERadMgmtCap; + tDot11fIEESETrafStrmMet ESETrafStrmMet; + tDot11fIEESETxmitPower ESETxmitPower; + tANI_U16 num_WMMTSPEC; + tDot11fIEWMMTSPEC WMMTSPEC[4]; + tDot11fIEAirgo Airgo; + tDot11fIEWscAssocRes WscAssocRes; + tDot11fIEP2PAssocRes P2PAssocRes; + tDot11fIEVHTCaps VHTCaps; + tDot11fIEVHTOperation VHTOperation; + tDot11fIEExtCap ExtCap; + tDot11fIEOBSSScanParameters OBSSScanParameters; + tDot11fIEQosMapSet QosMapSet; } tDot11fAssocResponse; #define DOT11F_ASSOCRESPONSE ( 6 ) @@ -6254,16 +6341,16 @@ tANI_U32 dot11fGetPackedAssocResponseSize(tpAniSirGlobal pCtx, tDot11fAssocRespo #endif /* C++ */ typedef struct sDot11fAuthentication{ - tDot11fFfAuthAlgo AuthAlgo; - tDot11fFfAuthSeqNo AuthSeqNo; - tDot11fFfStatus Status; - tDot11fIEChallengeText ChallengeText; - tDot11fIERSNOpaque RSNOpaque; - tDot11fIEMobilityDomain MobilityDomain; - tDot11fIEFTInfo FTInfo; - tDot11fIEFTTimeoutInterval FTTimeoutInterval; - tANI_U16 num_RICDataDesc; - tDot11fIERICDataDesc RICDataDesc[2]; + tDot11fFfAuthAlgo AuthAlgo; + tDot11fFfAuthSeqNo AuthSeqNo; + tDot11fFfStatus Status; + tDot11fIEChallengeText ChallengeText; + tDot11fIERSNOpaque RSNOpaque; + tDot11fIEMobilityDomain MobilityDomain; + tDot11fIEFTInfo FTInfo; + tDot11fIETimeoutInterval TimeoutInterval; + tANI_U16 num_RICDataDesc; + tDot11fIERICDataDesc RICDataDesc[2]; } tDot11fAuthentication; #define DOT11F_AUTHENTICATION ( 7 ) @@ -6315,9 +6402,9 @@ typedef struct sDot11fBeacon{ tDot11fIEWMMParams WMMParams; tDot11fIEWMMCaps WMMCaps; tDot11fIEWAPI WAPI; - tDot11fIECCXRadMgmtCap CCXRadMgmtCap; - tDot11fIECCXTrafStrmMet CCXTrafStrmMet; - tDot11fIECCXTxmitPower CCXTxmitPower; + tDot11fIEESERadMgmtCap ESERadMgmtCap; + tDot11fIEESETrafStrmMet ESETrafStrmMet; + tDot11fIEESETxmitPower ESETxmitPower; tDot11fIEAirgo Airgo; tDot11fIEWscBeacon WscBeacon; tDot11fIEP2PBeacon P2PBeacon; @@ -6327,6 +6414,7 @@ typedef struct sDot11fBeacon{ tDot11fIEExtCap ExtCap; tDot11fIEOperatingMode OperatingMode; tDot11fIEWiderBWChanSwitchAnn WiderBWChanSwitchAnn; + tDot11fIEOBSSScanParameters OBSSScanParameters; } tDot11fBeacon; #define DOT11F_BEACON ( 8 ) @@ -6390,9 +6478,9 @@ typedef struct sDot11fBeacon2{ tDot11fIEAirgo Airgo; tDot11fIEWscBeacon WscBeacon; tDot11fIEWAPI WAPI; - tDot11fIECCXRadMgmtCap CCXRadMgmtCap; - tDot11fIECCXTrafStrmMet CCXTrafStrmMet; - tDot11fIECCXTxmitPower CCXTxmitPower; + tDot11fIEESERadMgmtCap ESERadMgmtCap; + tDot11fIEESETrafStrmMet ESETrafStrmMet; + tDot11fIEESETxmitPower ESETxmitPower; tDot11fIEP2PBeacon P2PBeacon; tDot11fIEVHTCaps VHTCaps; tDot11fIEVHTOperation VHTOperation; @@ -6448,10 +6536,10 @@ typedef struct sDot11fBeaconIEs{ tDot11fIEWMMParams WMMParams; tDot11fIEWMMCaps WMMCaps; tDot11fIEWAPI WAPI; - tDot11fIECCXVersion CCXVersion; - tDot11fIECCXRadMgmtCap CCXRadMgmtCap; - tDot11fIECCXTrafStrmMet CCXTrafStrmMet; - tDot11fIECCXTxmitPower CCXTxmitPower; + tDot11fIEESEVersion ESEVersion; + tDot11fIEESERadMgmtCap ESERadMgmtCap; + tDot11fIEESETrafStrmMet ESETrafStrmMet; + tDot11fIEESETxmitPower ESETxmitPower; tDot11fIEAirgo Airgo; tDot11fIEWscBeaconProbeRes WscBeaconProbeRes; tDot11fIEP2PBeaconProbeRes P2PBeaconProbeRes; @@ -6461,6 +6549,7 @@ typedef struct sDot11fBeaconIEs{ tDot11fIEExtCap ExtCap; tDot11fIEOperatingMode OperatingMode; tDot11fIEWiderBWChanSwitchAnn WiderBWChanSwitchAnn; + tDot11fIEOBSSScanParameters OBSSScanParameters; } tDot11fBeaconIEs; #define DOT11F_BEACONIES ( 11 ) @@ -7013,48 +7102,49 @@ tANI_U32 dot11fGetPackedProbeRequestSize(tpAniSirGlobal pCtx, tDot11fProbeReques #endif /* C++ */ typedef struct sDot11fProbeResponse{ - tDot11fFfTimeStamp TimeStamp; - tDot11fFfBeaconInterval BeaconInterval; - tDot11fFfCapabilities Capabilities; - tDot11fIESSID SSID; - tDot11fIESuppRates SuppRates; - tDot11fIEFHParamSet FHParamSet; - tDot11fIEDSParams DSParams; - tDot11fIECFParams CFParams; - tDot11fIEIBSSParams IBSSParams; - tDot11fIECountry Country; - tDot11fIEFHParams FHParams; - tDot11fIEFHPattTable FHPattTable; - tDot11fIEPowerConstraints PowerConstraints; - tDot11fIEChanSwitchAnn ChanSwitchAnn; - tDot11fIEQuiet Quiet; - tDot11fIETPCReport TPCReport; - tDot11fIEERPInfo ERPInfo; - tDot11fIEExtSuppRates ExtSuppRates; - tDot11fIERSNOpaque RSNOpaque; - tDot11fIEQBSSLoad QBSSLoad; - tDot11fIEEDCAParamSet EDCAParamSet; - tDot11fIERRMEnabledCap RRMEnabledCap; - tDot11fIEAPChannelReport APChannelReport; - tDot11fIEMobilityDomain MobilityDomain; - tDot11fIEWPA WPA; - tDot11fIEHTCaps HTCaps; - tDot11fIEHTInfo HTInfo; - tDot11fIEExtChanSwitchAnn ExtChanSwitchAnn; - tDot11fIEWMMInfoAp WMMInfoAp; - tDot11fIEWMMParams WMMParams; - tDot11fIEWMMCaps WMMCaps; - tDot11fIEWAPI WAPI; - tDot11fIECCXRadMgmtCap CCXRadMgmtCap; - tDot11fIECCXTrafStrmMet CCXTrafStrmMet; - tDot11fIECCXTxmitPower CCXTxmitPower; - tDot11fIEAirgo Airgo; - tDot11fIEWscProbeRes WscProbeRes; - tDot11fIEP2PProbeRes P2PProbeRes; - tDot11fIEVHTCaps VHTCaps; - tDot11fIEVHTOperation VHTOperation; - tDot11fIEVHTExtBssLoad VHTExtBssLoad; - tDot11fIEExtCap ExtCap; + tDot11fFfTimeStamp TimeStamp; + tDot11fFfBeaconInterval BeaconInterval; + tDot11fFfCapabilities Capabilities; + tDot11fIESSID SSID; + tDot11fIESuppRates SuppRates; + tDot11fIEFHParamSet FHParamSet; + tDot11fIEDSParams DSParams; + tDot11fIECFParams CFParams; + tDot11fIEIBSSParams IBSSParams; + tDot11fIECountry Country; + tDot11fIEFHParams FHParams; + tDot11fIEFHPattTable FHPattTable; + tDot11fIEPowerConstraints PowerConstraints; + tDot11fIEChanSwitchAnn ChanSwitchAnn; + tDot11fIEQuiet Quiet; + tDot11fIETPCReport TPCReport; + tDot11fIEERPInfo ERPInfo; + tDot11fIEExtSuppRates ExtSuppRates; + tDot11fIERSNOpaque RSNOpaque; + tDot11fIEQBSSLoad QBSSLoad; + tDot11fIEEDCAParamSet EDCAParamSet; + tDot11fIERRMEnabledCap RRMEnabledCap; + tDot11fIEAPChannelReport APChannelReport; + tDot11fIEMobilityDomain MobilityDomain; + tDot11fIEWPA WPA; + tDot11fIEHTCaps HTCaps; + tDot11fIEHTInfo HTInfo; + tDot11fIEExtChanSwitchAnn ExtChanSwitchAnn; + tDot11fIEWMMInfoAp WMMInfoAp; + tDot11fIEWMMParams WMMParams; + tDot11fIEWMMCaps WMMCaps; + tDot11fIEWAPI WAPI; + tDot11fIEESERadMgmtCap ESERadMgmtCap; + tDot11fIEESETrafStrmMet ESETrafStrmMet; + tDot11fIEESETxmitPower ESETxmitPower; + tDot11fIEAirgo Airgo; + tDot11fIEWscProbeRes WscProbeRes; + tDot11fIEP2PProbeRes P2PProbeRes; + tDot11fIEVHTCaps VHTCaps; + tDot11fIEVHTOperation VHTOperation; + tDot11fIEVHTExtBssLoad VHTExtBssLoad; + tDot11fIEExtCap ExtCap; + tDot11fIEOBSSScanParameters OBSSScanParameters; } tDot11fProbeResponse; #define DOT11F_PROBERESPONSE ( 36 ) @@ -7117,6 +7207,26 @@ tANI_U32 dot11fGetPackedProvisionDiscoveryResSize(tpAniSirGlobal pCtx, tDot11fPr } /* End extern "C". */ #endif /* C++ */ +typedef struct sDot11fQosMapConfigure{ + tDot11fFfCategory Category; + tDot11fFfAction Action; + tDot11fIEQosMapSet QosMapSet; +} tDot11fQosMapConfigure; + +#define DOT11F_QOSMAPCONFIGURE ( 39 ) + +#ifdef __cplusplus +extern "C" { +#endif /* C++ */ + +tANI_U32 dot11fUnpackQosMapConfigure(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U32 nBuf, tDot11fQosMapConfigure *pFrm); +tANI_U32 dot11fPackQosMapConfigure(tpAniSirGlobal pCtx, tDot11fQosMapConfigure *pFrm, tANI_U8 *pBuf, tANI_U32 nBuf, tANI_U32 *pnConsumed); +tANI_U32 dot11fGetPackedQosMapConfigureSize(tpAniSirGlobal pCtx, tDot11fQosMapConfigure *pFrm, tANI_U32 *pnNeeded); + +#ifdef __cplusplus +} /* End extern "C". */ +#endif /* C++ */ + typedef struct sDot11fRadioMeasurementReport{ tDot11fFfCategory Category; tDot11fFfAction Action; @@ -7125,7 +7235,7 @@ typedef struct sDot11fRadioMeasurementReport{ tDot11fIEMeasurementReport MeasurementReport[4]; } tDot11fRadioMeasurementReport; -#define DOT11F_RADIOMEASUREMENTREPORT ( 39 ) +#define DOT11F_RADIOMEASUREMENTREPORT ( 40 ) #ifdef __cplusplus extern "C" { @@ -7148,7 +7258,7 @@ typedef struct sDot11fRadioMeasurementRequest{ tDot11fIEMeasurementRequest MeasurementRequest[2]; } tDot11fRadioMeasurementRequest; -#define DOT11F_RADIOMEASUREMENTREQUEST ( 40 ) +#define DOT11F_RADIOMEASUREMENTREQUEST ( 41 ) #ifdef __cplusplus extern "C" { @@ -7185,20 +7295,21 @@ typedef struct sDot11fReAssocRequest{ tDot11fIEAirgo Airgo; tDot11fIEWscIEOpaque WscIEOpaque; tDot11fIEWAPIOpaque WAPIOpaque; - tDot11fIECCXRadMgmtCap CCXRadMgmtCap; - tDot11fIECCXVersion CCXVersion; - tDot11fIECCXCckmOpaque CCXCckmOpaque; + tDot11fIEESERadMgmtCap ESERadMgmtCap; + tDot11fIEESEVersion ESEVersion; + tDot11fIEESECckmOpaque ESECckmOpaque; tANI_U16 num_WMMTSPEC; tDot11fIEWMMTSPEC WMMTSPEC[4]; - tDot11fIECCXTrafStrmRateSet CCXTrafStrmRateSet; + tDot11fIEESETrafStrmRateSet ESETrafStrmRateSet; tDot11fIEP2PIEOpaque P2PIEOpaque; tDot11fIEWFDIEOpaque WFDIEOpaque; tDot11fIEVHTCaps VHTCaps; tDot11fIEExtCap ExtCap; tDot11fIEOperatingMode OperatingMode; + tDot11fIEQosMapSet QosMapSet; } tDot11fReAssocRequest; -#define DOT11F_REASSOCREQUEST ( 41 ) +#define DOT11F_REASSOCREQUEST ( 42 ) #ifdef __cplusplus extern "C" { @@ -7228,24 +7339,27 @@ typedef struct sDot11fReAssocResponse{ tANI_U16 num_RICDataDesc; tDot11fIERICDataDesc RICDataDesc[2]; tDot11fIEWPA WPA; + tDot11fIETimeoutInterval TimeoutInterval; tDot11fIEHTCaps HTCaps; tDot11fIEHTInfo HTInfo; tDot11fIEWMMParams WMMParams; - tDot11fIECCXRadMgmtCap CCXRadMgmtCap; - tDot11fIECCXTrafStrmMet CCXTrafStrmMet; - tDot11fIECCXTxmitPower CCXTxmitPower; + tDot11fIEESERadMgmtCap ESERadMgmtCap; + tDot11fIEESETrafStrmMet ESETrafStrmMet; + tDot11fIEESETxmitPower ESETxmitPower; tANI_U16 num_WMMTSPEC; tDot11fIEWMMTSPEC WMMTSPEC[4]; - tDot11fIECCXTrafStrmRateSet CCXTrafStrmRateSet; + tDot11fIEESETrafStrmRateSet ESETrafStrmRateSet; tDot11fIEAirgo Airgo; tDot11fIEWscReassocRes WscReassocRes; tDot11fIEP2PAssocRes P2PAssocRes; tDot11fIEVHTCaps VHTCaps; tDot11fIEVHTOperation VHTOperation; tDot11fIEExtCap ExtCap; + tDot11fIEOBSSScanParameters OBSSScanParameters; + tDot11fIEQosMapSet QosMapSet; } tDot11fReAssocResponse; -#define DOT11F_REASSOCRESPONSE ( 42 ) +#define DOT11F_REASSOCRESPONSE ( 43 ) #ifdef __cplusplus extern "C" { @@ -7265,7 +7379,7 @@ typedef struct sDot11fSMPowerSave{ tDot11fFfSMPowerModeSet SMPowerModeSet; } tDot11fSMPowerSave; -#define DOT11F_SMPOWERSAVE ( 43 ) +#define DOT11F_SMPOWERSAVE ( 44 ) #ifdef __cplusplus extern "C" { @@ -7279,13 +7393,33 @@ tANI_U32 dot11fGetPackedSMPowerSaveSize(tpAniSirGlobal pCtx, tDot11fSMPowerSave } /* End extern "C". */ #endif /* C++ */ +typedef struct sDot11fSaQueryReq{ + tDot11fFfCategory Category; + tDot11fFfAction Action; + tDot11fFfTransactionId TransactionId; +} tDot11fSaQueryReq; + +#define DOT11F_SAQUERYREQ ( 45 ) + +#ifdef __cplusplus +extern "C" { +#endif /* C++ */ + +tANI_U32 dot11fUnpackSaQueryReq(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U32 nBuf, tDot11fSaQueryReq *pFrm); +tANI_U32 dot11fPackSaQueryReq(tpAniSirGlobal pCtx, tDot11fSaQueryReq *pFrm, tANI_U8 *pBuf, tANI_U32 nBuf, tANI_U32 *pnConsumed); +tANI_U32 dot11fGetPackedSaQueryReqSize(tpAniSirGlobal pCtx, tDot11fSaQueryReq *pFrm, tANI_U32 *pnNeeded); + +#ifdef __cplusplus +} /* End extern "C". */ +#endif /* C++ */ + typedef struct sDot11fSaQueryRsp{ tDot11fFfCategory Category; tDot11fFfAction Action; tDot11fFfTransactionId TransactionId; } tDot11fSaQueryRsp; -#define DOT11F_SAQUERYRSP ( 44 ) +#define DOT11F_SAQUERYRSP ( 46 ) #ifdef __cplusplus extern "C" { @@ -7306,7 +7440,7 @@ typedef struct sDot11fTDLSDisReq{ tDot11fIELinkIdentifier LinkIdentifier; } tDot11fTDLSDisReq; -#define DOT11F_TDLSDISREQ ( 45 ) +#define DOT11F_TDLSDISREQ ( 47 ) #ifdef __cplusplus extern "C" { @@ -7321,24 +7455,25 @@ tANI_U32 dot11fGetPackedTDLSDisReqSize(tpAniSirGlobal pCtx, tDot11fTDLSDisReq *p #endif /* C++ */ typedef struct sDot11fTDLSDisRsp{ - tDot11fFfCategory Category; - tDot11fFfAction Action; - tDot11fFfDialogToken DialogToken; - tDot11fFfCapabilities Capabilities; - tDot11fIESuppRates SuppRates; - tDot11fIEExtSuppRates ExtSuppRates; - tDot11fIESuppChannels SuppChannels; - tDot11fIERSN RSN; - tDot11fIEExtCap ExtCap; - tDot11fIEFTInfo FTInfo; - tDot11fIEFTTimeoutInterval FTTimeoutInterval; - tDot11fIERICData RICData; - tDot11fIEHTCaps HTCaps; - tDot11fIELinkIdentifier LinkIdentifier; - tDot11fIEVHTCaps VHTCaps; + tDot11fFfCategory Category; + tDot11fFfAction Action; + tDot11fFfDialogToken DialogToken; + tDot11fFfCapabilities Capabilities; + tDot11fIESuppRates SuppRates; + tDot11fIEExtSuppRates ExtSuppRates; + tDot11fIESuppChannels SuppChannels; + tDot11fIESuppOperatingClasses SuppOperatingClasses; + tDot11fIERSN RSN; + tDot11fIEExtCap ExtCap; + tDot11fIEFTInfo FTInfo; + tDot11fIETimeoutInterval TimeoutInterval; + tDot11fIERICData RICData; + tDot11fIEHTCaps HTCaps; + tDot11fIELinkIdentifier LinkIdentifier; + tDot11fIEVHTCaps VHTCaps; } tDot11fTDLSDisRsp; -#define DOT11F_TDLSDISRSP ( 46 ) +#define DOT11F_TDLSDISRSP ( 48 ) #ifdef __cplusplus extern "C" { @@ -7361,7 +7496,7 @@ typedef struct sDot11fTDLSPeerTrafficInd{ tDot11fIEPUBufferStatus PUBufferStatus; } tDot11fTDLSPeerTrafficInd; -#define DOT11F_TDLSPEERTRAFFICIND ( 47 ) +#define DOT11F_TDLSPEERTRAFFICIND ( 49 ) #ifdef __cplusplus extern "C" { @@ -7382,7 +7517,7 @@ typedef struct sDot11fTDLSPeerTrafficRsp{ tDot11fIELinkIdentifier LinkIdentifier; } tDot11fTDLSPeerTrafficRsp; -#define DOT11F_TDLSPEERTRAFFICRSP ( 48 ) +#define DOT11F_TDLSPEERTRAFFICRSP ( 50 ) #ifdef __cplusplus extern "C" { @@ -7397,22 +7532,22 @@ tANI_U32 dot11fGetPackedTDLSPeerTrafficRspSize(tpAniSirGlobal pCtx, tDot11fTDLSP #endif /* C++ */ typedef struct sDot11fTDLSSetupCnf{ - tDot11fFfCategory Category; - tDot11fFfAction Action; - tDot11fFfStatus Status; - tDot11fFfDialogToken DialogToken; - tDot11fIERSN RSN; - tDot11fIEEDCAParamSet EDCAParamSet; - tDot11fIEFTInfo FTInfo; - tDot11fIEFTTimeoutInterval FTTimeoutInterval; - tDot11fIEHTInfo HTInfo; - tDot11fIELinkIdentifier LinkIdentifier; - tDot11fIEWMMInfoStation WMMInfoStation; - tDot11fIEVHTOperation VHTOperation; - tDot11fIEOperatingMode OperatingMode; + tDot11fFfCategory Category; + tDot11fFfAction Action; + tDot11fFfStatus Status; + tDot11fFfDialogToken DialogToken; + tDot11fIERSN RSN; + tDot11fIEEDCAParamSet EDCAParamSet; + tDot11fIEFTInfo FTInfo; + tDot11fIETimeoutInterval TimeoutInterval; + tDot11fIEHTInfo HTInfo; + tDot11fIELinkIdentifier LinkIdentifier; + tDot11fIEWMMInfoStation WMMInfoStation; + tDot11fIEVHTOperation VHTOperation; + tDot11fIEOperatingMode OperatingMode; } tDot11fTDLSSetupCnf; -#define DOT11F_TDLSSETUPCNF ( 49 ) +#define DOT11F_TDLSSETUPCNF ( 51 ) #ifdef __cplusplus extern "C" { @@ -7427,28 +7562,29 @@ tANI_U32 dot11fGetPackedTDLSSetupCnfSize(tpAniSirGlobal pCtx, tDot11fTDLSSetupCn #endif /* C++ */ typedef struct sDot11fTDLSSetupReq{ - tDot11fFfCategory Category; - tDot11fFfAction Action; - tDot11fFfDialogToken DialogToken; - tDot11fFfCapabilities Capabilities; - tDot11fIESuppRates SuppRates; - tDot11fIECountry Country; - tDot11fIEExtSuppRates ExtSuppRates; - tDot11fIESuppChannels SuppChannels; - tDot11fIERSN RSN; - tDot11fIEExtCap ExtCap; - tDot11fIEQOSCapsStation QOSCapsStation; - tDot11fIEFTInfo FTInfo; - tDot11fIEFTTimeoutInterval FTTimeoutInterval; - tDot11fIERICData RICData; - tDot11fIEHTCaps HTCaps; - tDot11fIELinkIdentifier LinkIdentifier; - tDot11fIEWMMInfoStation WMMInfoStation; - tDot11fIEAID AID; - tDot11fIEVHTCaps VHTCaps; + tDot11fFfCategory Category; + tDot11fFfAction Action; + tDot11fFfDialogToken DialogToken; + tDot11fFfCapabilities Capabilities; + tDot11fIESuppRates SuppRates; + tDot11fIECountry Country; + tDot11fIEExtSuppRates ExtSuppRates; + tDot11fIESuppChannels SuppChannels; + tDot11fIERSN RSN; + tDot11fIEExtCap ExtCap; + tDot11fIESuppOperatingClasses SuppOperatingClasses; + tDot11fIEQOSCapsStation QOSCapsStation; + tDot11fIEFTInfo FTInfo; + tDot11fIETimeoutInterval TimeoutInterval; + tDot11fIERICData RICData; + tDot11fIEHTCaps HTCaps; + tDot11fIELinkIdentifier LinkIdentifier; + tDot11fIEWMMInfoStation WMMInfoStation; + tDot11fIEAID AID; + tDot11fIEVHTCaps VHTCaps; } tDot11fTDLSSetupReq; -#define DOT11F_TDLSSETUPREQ ( 50 ) +#define DOT11F_TDLSSETUPREQ ( 52 ) #ifdef __cplusplus extern "C" { @@ -7463,30 +7599,31 @@ tANI_U32 dot11fGetPackedTDLSSetupReqSize(tpAniSirGlobal pCtx, tDot11fTDLSSetupRe #endif /* C++ */ typedef struct sDot11fTDLSSetupRsp{ - tDot11fFfCategory Category; - tDot11fFfAction Action; - tDot11fFfStatus Status; - tDot11fFfDialogToken DialogToken; - tDot11fFfCapabilities Capabilities; - tDot11fIESuppRates SuppRates; - tDot11fIECountry Country; - tDot11fIEExtSuppRates ExtSuppRates; - tDot11fIESuppChannels SuppChannels; - tDot11fIERSN RSN; - tDot11fIEExtCap ExtCap; - tDot11fIEQOSCapsStation QOSCapsStation; - tDot11fIEFTInfo FTInfo; - tDot11fIEFTTimeoutInterval FTTimeoutInterval; - tDot11fIERICData RICData; - tDot11fIEHTCaps HTCaps; - tDot11fIELinkIdentifier LinkIdentifier; - tDot11fIEWMMInfoStation WMMInfoStation; - tDot11fIEAID AID; - tDot11fIEVHTCaps VHTCaps; - tDot11fIEOperatingMode OperatingMode; + tDot11fFfCategory Category; + tDot11fFfAction Action; + tDot11fFfStatus Status; + tDot11fFfDialogToken DialogToken; + tDot11fFfCapabilities Capabilities; + tDot11fIESuppRates SuppRates; + tDot11fIECountry Country; + tDot11fIEExtSuppRates ExtSuppRates; + tDot11fIESuppChannels SuppChannels; + tDot11fIERSN RSN; + tDot11fIEExtCap ExtCap; + tDot11fIESuppOperatingClasses SuppOperatingClasses; + tDot11fIEQOSCapsStation QOSCapsStation; + tDot11fIEFTInfo FTInfo; + tDot11fIETimeoutInterval TimeoutInterval; + tDot11fIERICData RICData; + tDot11fIEHTCaps HTCaps; + tDot11fIELinkIdentifier LinkIdentifier; + tDot11fIEWMMInfoStation WMMInfoStation; + tDot11fIEAID AID; + tDot11fIEVHTCaps VHTCaps; + tDot11fIEOperatingMode OperatingMode; } tDot11fTDLSSetupRsp; -#define DOT11F_TDLSSETUPRSP ( 51 ) +#define DOT11F_TDLSSETUPRSP ( 53 ) #ifdef __cplusplus extern "C" { @@ -7508,7 +7645,7 @@ typedef struct sDot11fTDLSTeardown{ tDot11fIELinkIdentifier LinkIdentifier; } tDot11fTDLSTeardown; -#define DOT11F_TDLSTEARDOWN ( 52 ) +#define DOT11F_TDLSTEARDOWN ( 54 ) #ifdef __cplusplus extern "C" { @@ -7529,7 +7666,7 @@ typedef struct sDot11fTPCReport{ tDot11fIETPCReport TPCReport; } tDot11fTPCReport; -#define DOT11F_TPCREPORT ( 53 ) +#define DOT11F_TPCREPORT ( 55 ) #ifdef __cplusplus extern "C" { @@ -7550,7 +7687,7 @@ typedef struct sDot11fTPCRequest{ tDot11fIETPCRequest TPCRequest; } tDot11fTPCRequest; -#define DOT11F_TPCREQUEST ( 54 ) +#define DOT11F_TPCREQUEST ( 56 ) #ifdef __cplusplus extern "C" { @@ -7571,7 +7708,7 @@ typedef struct sDot11fVHTGidManagementActionFrame{ tDot11fFfVhtUserPositionArray VhtUserPositionArray; } tDot11fVHTGidManagementActionFrame; -#define DOT11F_VHTGIDMANAGEMENTACTIONFRAME ( 55 ) +#define DOT11F_VHTGIDMANAGEMENTACTIONFRAME ( 57 ) #ifdef __cplusplus extern "C" { @@ -7591,10 +7728,10 @@ typedef struct sDot11fWMMAddTSRequest{ tDot11fFfDialogToken DialogToken; tDot11fFfStatusCode StatusCode; tDot11fIEWMMTSPEC WMMTSPEC; - tDot11fIECCXTrafStrmRateSet CCXTrafStrmRateSet; + tDot11fIEESETrafStrmRateSet ESETrafStrmRateSet; } tDot11fWMMAddTSRequest; -#define DOT11F_WMMADDTSREQUEST ( 56 ) +#define DOT11F_WMMADDTSREQUEST ( 58 ) #ifdef __cplusplus extern "C" { @@ -7614,10 +7751,10 @@ typedef struct sDot11fWMMAddTSResponse{ tDot11fFfDialogToken DialogToken; tDot11fFfStatusCode StatusCode; tDot11fIEWMMTSPEC WMMTSPEC; - tDot11fIECCXTrafStrmMet CCXTrafStrmMet; + tDot11fIEESETrafStrmMet ESETrafStrmMet; } tDot11fWMMAddTSResponse; -#define DOT11F_WMMADDTSRESPONSE ( 57 ) +#define DOT11F_WMMADDTSRESPONSE ( 59 ) #ifdef __cplusplus extern "C" { @@ -7639,7 +7776,7 @@ typedef struct sDot11fWMMDelTS{ tDot11fIEWMMTSPEC WMMTSPEC; } tDot11fWMMDelTS; -#define DOT11F_WMMDELTS ( 58 ) +#define DOT11F_WMMDELTS ( 60 ) #ifdef __cplusplus extern "C" { diff --git a/CORE/MAC/src/include/parserApi.h b/CORE/MAC/src/include/parserApi.h index df1a8328019e..2d87c4875959 100644 --- a/CORE/MAC/src/include/parserApi.h +++ b/CORE/MAC/src/include/parserApi.h @@ -101,8 +101,8 @@ typedef struct sSirProbeRespBeacon #ifdef WLAN_FEATURE_VOWIFI_11R tANI_U8 mdie[SIR_MDIE_SIZE]; #endif -#ifdef FEATURE_WLAN_CCX - tDot11fIECCXTxmitPower ccxTxPwr; +#ifdef FEATURE_WLAN_ESE + tDot11fIEESETxmitPower eseTxPwr; tDot11fIEQBSSLoad QBSSLoad; #endif tANI_U8 ssidPresent; @@ -238,10 +238,10 @@ typedef struct sSirAssocRsp tDot11fIERICDataDesc RICData[2]; #endif -#ifdef FEATURE_WLAN_CCX +#ifdef FEATURE_WLAN_ESE tANI_U8 num_tspecs; - tDot11fIEWMMTSPEC TSPECInfo[SIR_CCX_MAX_TSPEC_IES]; - tSirMacCCXTSMIE tsmIE; + tDot11fIEWMMTSPEC TSPECInfo[SIR_ESE_MAX_TSPEC_IES]; + tSirMacESETSMIE tsmIE; #endif tANI_U8 suppRatesPresent; @@ -256,7 +256,7 @@ typedef struct sSirAssocRsp tANI_U8 mdiePresent; tANI_U8 ricPresent; #endif -#ifdef FEATURE_WLAN_CCX +#ifdef FEATURE_WLAN_ESE tANI_U8 tspecPresent; tANI_U8 tsmPresent; #endif @@ -267,9 +267,9 @@ typedef struct sSirAssocRsp tDot11fIEExtCap ExtCap; } tSirAssocRsp, *tpSirAssocRsp; -#if defined(FEATURE_WLAN_CCX_UPLOAD) -// Structure to hold CCX Beacon report mandatory IEs -typedef struct sSirCcxBcnReportMandatoryIe +#if defined(FEATURE_WLAN_ESE_UPLOAD) +// Structure to hold ESE Beacon report mandatory IEs +typedef struct sSirEseBcnReportMandatoryIe { tSirMacSSid ssId; tSirMacRateSet supportedRates; @@ -288,8 +288,8 @@ typedef struct sSirCcxBcnReportMandatoryIe tANI_U8 ibssParamPresent; tANI_U8 timPresent; tANI_U8 rrmPresent; -} tSirCcxBcnReportMandatoryIe, *tpSirCcxBcnReportMandatoryIe; -#endif /* FEATURE_WLAN_CCX_UPLOAD */ +} tSirEseBcnReportMandatoryIe, *tpSirEseBcnReportMandatoryIe; +#endif /* FEATURE_WLAN_ESE_UPLOAD */ tANI_U8 sirIsPropCapabilityEnabled(struct sAniSirGlobal *pMac, tANI_U32 bitnum); @@ -386,14 +386,14 @@ sirParseBeaconIE(struct sAniSirGlobal *pMac, tANI_U8 *pPayload, tANI_U32 payloadLength); -#if defined(FEATURE_WLAN_CCX_UPLOAD) +#if defined(FEATURE_WLAN_ESE_UPLOAD) tSirRetStatus -sirFillBeaconMandatoryIEforCcxBcnReport(tpAniSirGlobal pMac, +sirFillBeaconMandatoryIEforEseBcnReport(tpAniSirGlobal pMac, tANI_U8 *pPayload, const tANI_U32 payloadLength, tANI_U8 **outIeBuf, tANI_U32 *pOutIeLen); -#endif /* FEATURE_WLAN_CCX_UPLOAD */ +#endif /* FEATURE_WLAN_ESE_UPLOAD */ tSirRetStatus sirConvertBeaconFrame2Struct(struct sAniSirGlobal *pMac, @@ -730,19 +730,19 @@ void PopulateDot11fWMM(tpAniSirGlobal pMac, void PopulateDot11fWMMCaps(tDot11fIEWMMCaps *pCaps); -#if defined(FEATURE_WLAN_CCX) -// Fill the CCX version IE -void PopulateDot11fCCXVersion(tDot11fIECCXVersion *pCCXVersion); +#if defined(FEATURE_WLAN_ESE) +// Fill the ESE version IE +void PopulateDot11fESEVersion(tDot11fIEESEVersion *pESEVersion); // Fill the Radio Management Capability -void PopulateDot11fCCXRadMgmtCap(tDot11fIECCXRadMgmtCap *pCCXRadMgmtCap); +void PopulateDot11fESERadMgmtCap(tDot11fIEESERadMgmtCap *pESERadMgmtCap); // Fill the CCKM IE -tSirRetStatus PopulateDot11fCCXCckmOpaque( tpAniSirGlobal pMac, +tSirRetStatus PopulateDot11fESECckmOpaque( tpAniSirGlobal pMac, tpSirCCKMie pCCKMie, - tDot11fIECCXCckmOpaque *pDot11f ); + tDot11fIEESECckmOpaque *pDot11f ); void PopulateDot11TSRSIE(tpAniSirGlobal pMac, - tSirMacCCXTSRSIE *pOld, - tDot11fIECCXTrafStrmRateSet *pDot11f, + tSirMacESETSRSIE *pOld, + tDot11fIEESETrafStrmRateSet *pDot11f, tANI_U8 rate_length); void PopulateDot11fReAssocTspec(tpAniSirGlobal pMac, tDot11fReAssocRequest *pReassoc, tpPESession psessionEntry); #endif diff --git a/CORE/MAC/src/include/sirParams.h b/CORE/MAC/src/include/sirParams.h index cf952d6257cd..0e60943ce69b 100644 --- a/CORE/MAC/src/include/sirParams.h +++ b/CORE/MAC/src/include/sirParams.h @@ -50,7 +50,7 @@ #define SIR_MAX_NUM_CHANNELS 64 #define SIR_MAX_NUM_STA_IN_IBSS 16 #define SIR_MAX_NUM_STA_IN_BSS 256 -#define SIR_CCX_MAX_MEAS_IE_REQS 8 +#define SIR_ESE_MAX_MEAS_IE_REQS 8 typedef enum { @@ -543,7 +543,7 @@ typedef struct sSirMbMsgP2p #define SIR_HAL_GTK_OFFLOAD_GETINFO_RSP (SIR_HAL_ITC_MSG_TYPES_BEGIN + 183) #endif //WLAN_FEATURE_GTK_OFFLOAD -#ifdef FEATURE_WLAN_CCX +#ifdef FEATURE_WLAN_ESE #define SIR_HAL_TSM_STATS_REQ (SIR_HAL_ITC_MSG_TYPES_BEGIN + 184) #define SIR_HAL_TSM_STATS_RSP (SIR_HAL_ITC_MSG_TYPES_BEGIN + 185) #endif @@ -651,7 +651,7 @@ typedef struct sSirMbMsgP2p #define SIR_HAL_INIT_THERMAL_INFO_CMD (SIR_HAL_ITC_MSG_TYPES_BEGIN + 248) #define SIR_HAL_SET_THERMAL_LEVEL (SIR_HAL_ITC_MSG_TYPES_BEGIN + 249) -#if defined(FEATURE_WLAN_CCX) && defined(FEATURE_WLAN_CCX_UPLOAD) +#if defined(FEATURE_WLAN_ESE) && defined(FEATURE_WLAN_ESE_UPLOAD) #define SIR_HAL_SET_PLM_REQ (SIR_HAL_ITC_MSG_TYPES_BEGIN + 250) #endif @@ -753,8 +753,8 @@ typedef struct sSirMbMsgP2p #endif #define SIR_LIM_BEACON_GEN_IND (SIR_LIM_TIMEOUT_MSG_START + 0x23) #define SIR_LIM_PERIODIC_PROBE_REQ_TIMEOUT (SIR_LIM_TIMEOUT_MSG_START + 0x24) -#ifdef FEATURE_WLAN_CCX -#define SIR_LIM_CCX_TSM_TIMEOUT (SIR_LIM_TIMEOUT_MSG_START + 0x25) +#ifdef FEATURE_WLAN_ESE +#define SIR_LIM_ESE_TSM_TIMEOUT (SIR_LIM_TIMEOUT_MSG_START + 0x25) #endif #define SIR_LIM_DISASSOC_ACK_TIMEOUT (SIR_LIM_TIMEOUT_MSG_START + 0x26) diff --git a/CORE/MAC/src/pe/include/limAdmitControl.h b/CORE/MAC/src/pe/include/limAdmitControl.h index 46a226bcbd2b..e1cecd63d900 100644 --- a/CORE/MAC/src/pe/include/limAdmitControl.h +++ b/CORE/MAC/src/pe/include/limAdmitControl.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011-2012 The Linux Foundation. All rights reserved. + * Copyright (c) 2011-2012,2014 The Linux Foundation. All rights reserved. * * Previously licensed under the ISC license by Qualcomm Atheros, Inc. * @@ -95,7 +95,7 @@ limUpdateAdmitPolicy( tpAniSirGlobal pMac); tSirRetStatus limAdmitControlInit(tpAniSirGlobal pMac); -#ifdef FEATURE_WLAN_CCX +#ifdef FEATURE_WLAN_ESE tSirRetStatus limSendHalMsgAddTs(tpAniSirGlobal pMac, tANI_U16 staIdx, tANI_U8 tspecIdx, diff --git a/CORE/MAC/src/pe/include/limSession.h b/CORE/MAC/src/pe/include/limSession.h index 0a15e58fd52b..9546b0ace976 100644 --- a/CORE/MAC/src/pe/include/limSession.h +++ b/CORE/MAC/src/pe/include/limSession.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. * @@ -108,7 +108,7 @@ typedef struct sPESession // Added to Support BT-AMP tpSirSmeJoinReq pLimJoinReq; // handle to sme join req tpSirSmeJoinReq pLimReAssocReq; //handle to sme reassoc req tpLimMlmJoinReq pLimMlmJoinReq; //handle to MLM join 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) void *pLimMlmReassocRetryReq; //keep reasoc req for retry #endif void *pLimMlmReassocReq; //handle to MLM reassoc Req @@ -192,7 +192,7 @@ typedef struct sPESession // Added to Support BT-AMP tANI_U32 RICDataLen; //Used to store the Ric data received in the assoc response tANI_U8 *ricData; #endif -#ifdef FEATURE_WLAN_CCX +#ifdef FEATURE_WLAN_ESE tANI_U32 tspecLen; //Used to store the TSPEC IEs received in the assoc response tANI_U8 *tspecIes; #endif @@ -281,11 +281,11 @@ typedef struct sPESession // Added to Support BT-AMP tAniBool is11Rconnection; #endif -#ifdef FEATURE_WLAN_CCX - tAniBool isCCXconnection; - tCcxPEContext ccxContext; +#ifdef FEATURE_WLAN_ESE + tAniBool isESEconnection; + tEsePEContext eseContext; #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 diff --git a/CORE/MAC/src/pe/include/rrmGlobal.h b/CORE/MAC/src/pe/include/rrmGlobal.h index 35daa37035a7..810a385c1525 100644 --- a/CORE/MAC/src/pe/include/rrmGlobal.h +++ b/CORE/MAC/src/pe/include/rrmGlobal.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011-2012 The Linux Foundation. All rights reserved. + * Copyright (c) 2011-2012,2014 The Linux Foundation. All rights reserved. * * Previously licensed under the ISC license by Qualcomm Atheros, Inc. * @@ -47,9 +47,9 @@ typedef enum eRrmRetStatus typedef enum eRrmMsgReqSource { - eRRM_MSG_SOURCE_LEGACY_CCX = 1, /* legacy ccx */ + eRRM_MSG_SOURCE_LEGACY_ESE = 1, /* legacy ese */ eRRM_MSG_SOURCE_11K = 2, /* 11k */ - eRRM_MSG_SOURCE_CCX_UPLOAD = 3, /* ccx upload approach */ + eRRM_MSG_SOURCE_ESE_UPLOAD = 3, /* ese upload approach */ } tRrmMsgReqSource; typedef struct sSirChannelInfo @@ -63,11 +63,11 @@ typedef struct sSirBeaconReportReqInd tANI_U16 messageType; // eWNI_SME_BEACON_REPORT_REQ_IND tANI_U16 length; tSirMacAddr bssId; - tANI_U16 measurementDuration[SIR_CCX_MAX_MEAS_IE_REQS]; //ms + tANI_U16 measurementDuration[SIR_ESE_MAX_MEAS_IE_REQS]; //ms tANI_U16 randomizationInterval; //ms tSirChannelInfo channelInfo; tSirMacAddr macaddrBssid; //0: wildcard - tANI_U8 fMeasurementtype[SIR_CCX_MAX_MEAS_IE_REQS]; //0:Passive, 1: Active, 2: table mode + tANI_U8 fMeasurementtype[SIR_ESE_MAX_MEAS_IE_REQS]; //0:Passive, 1: Active, 2: table mode tAniSSID ssId; //May be wilcard. tANI_U16 uDialogToken; tSirChannelList channelList; //From AP channel report. @@ -120,7 +120,7 @@ typedef struct sSirNeighborBssDescription tANI_U32 fMobilityDomain:1; tANI_U32 reserved:21; } rrmInfo; - struct _ccxInfo { + struct _eseInfo { tANI_U32 channelBand:8; tANI_U32 minRecvSigPower:8; tANI_U32 apTxPower:8; @@ -132,7 +132,7 @@ typedef struct sSirNeighborBssDescription tANI_U32 beaconInterval:16; tANI_U32 reserved: 16; - } ccxInfo; + } eseInfo; } bssidInfo; //Optional sub IEs....ignoring for now. diff --git a/CORE/MAC/src/pe/lim/limAdmitControl.c b/CORE/MAC/src/pe/lim/limAdmitControl.c index 440cae21986b..16b32fcbe5c8 100644 --- a/CORE/MAC/src/pe/lim/limAdmitControl.c +++ b/CORE/MAC/src/pe/lim/limAdmitControl.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011-2013 The Linux Foundation. All rights reserved. + * Copyright (c) 2011-2014 The Linux Foundation. All rights reserved. * * Previously licensed under the ISC license by Qualcomm Atheros, Inc. * @@ -1074,7 +1074,7 @@ tSirRetStatus limUpdateAdmitPolicy(tpAniSirGlobal pMac) \param tANI_U16 tsm_interval \return eSirRetStatus - status -------------------------------------------------------------*/ -#ifdef FEATURE_WLAN_CCX +#ifdef FEATURE_WLAN_ESE tSirRetStatus limSendHalMsgAddTs( tpAniSirGlobal pMac, @@ -1109,7 +1109,7 @@ limSendHalMsgAddTs( vos_mem_copy(&pAddTsParam->tspec, &tspecIE, sizeof(tSirMacTspecIE)); pAddTsParam->sessionId = sessionId; -#ifdef FEATURE_WLAN_CCX +#ifdef FEATURE_WLAN_ESE pAddTsParam->tsm_interval = tsm_interval; #endif diff --git a/CORE/MAC/src/pe/lim/limApi.c b/CORE/MAC/src/pe/lim/limApi.c index 754644abbdd1..b281194259b1 100644 --- a/CORE/MAC/src/pe/lim/limApi.c +++ b/CORE/MAC/src/pe/lim/limApi.c @@ -387,7 +387,7 @@ static void __limInitAssocVars(tpAniSirGlobal pMac) 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 2fb56bf75bda..77ef247b7d3f 100644 --- a/CORE/MAC/src/pe/lim/limAssocUtils.c +++ b/CORE/MAC/src/pe/lim/limAssocUtils.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011-2013 The Linux Foundation. All rights reserved. + * Copyright (c) 2011-2014 The Linux Foundation. All rights reserved. * * Previously licensed under the ISC license by Qualcomm Atheros, Inc. * @@ -687,12 +687,12 @@ limCleanupRxPath(tpAniSirGlobal pMac, tpDphHashNode pStaDs,tpPESession psessionE 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 @@ void limSendSmeUnprotectedMgmtFrameInd( } #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,4 +4680,4 @@ void limSendSmeTsmIEInd(tpAniSirGlobal pMac, tpPESession psessionEntry, 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 e69a77a1c9b3..0ba084232cf5 100644 --- a/CORE/MAC/src/pe/lim/limAssocUtils.h +++ b/CORE/MAC/src/pe/lim/limAssocUtils.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011-2013 The Linux Foundation. All rights reserved. + * Copyright (c) 2011-2014 The Linux Foundation. All rights reserved. * * Previously licensed under the ISC license by Qualcomm Atheros, Inc. * @@ -181,7 +181,7 @@ void limHandleAddBssInReAssocContext(tpAniSirGlobal pMac, tpDphHashNode pStaDs, /* 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 @@ -189,9 +189,9 @@ void limSendSmeUnprotectedMgmtFrameInd(tpAniSirGlobal pMac, tANI_U8 frameType, 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 791d6c213369..25cbc251e90c 100644 --- a/CORE/MAC/src/pe/lim/limFT.c +++ b/CORE/MAC/src/pe/lim/limFT.c @@ -355,12 +355,12 @@ void limPerformFTPreAuth(tpAniSirGlobal pMac, eHalStatus status, tANI_U32 *data, // 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; @@ -738,7 +738,7 @@ tpPESession limFillFTSession(tpAniSirGlobal pMac, /* 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; @@ -790,7 +790,7 @@ tpPESession limFillFTSession(tpAniSirGlobal pMac, // 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 @@ -841,7 +841,7 @@ tpPESession limFillFTSession(tpAniSirGlobal pMac, 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) ); @@ -896,10 +896,10 @@ void limFTSetupAuthSession(tpAniSirGlobal pMac, tpPESession psessionEntry) 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 3c0cac4d8f2a..a6c5c3626a56 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. * @@ -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" @@ -709,18 +709,18 @@ __limProcessAddTsRsp(tpAniSirGlobal pMac, tANI_U8 *pRxPacketInfo,tpPESession pse 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 @@ -820,7 +820,7 @@ __limProcessAddTsRsp(tpAniSirGlobal pMac, tANI_U8 *pRxPacketInfo,tpPESession pse if((addts.tspec.tsinfo.traffic.accessPolicy != SIR_MAC_ACCESSPOLICY_EDCA) || ((upToAc(addts.tspec.tsinfo.traffic.userPrio) < MAX_NUM_AC))) { -#ifdef FEATURE_WLAN_CCX +#ifdef FEATURE_WLAN_ESE retval = limSendHalMsgAddTs(pMac, pSta->staIndex, tspecInfo->idx, @@ -1060,12 +1060,12 @@ __limProcessDelTsReq(tpAniSirGlobal pMac, tANI_U8 *pRxPacketInfo,tpPESession pse 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 } @@ -2307,7 +2307,7 @@ limProcessActionFrame(tpAniSirGlobal pMac, tANI_U8 *pRxPacketInfo,tpPESession ps } 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) case SIR_MAC_ACTION_VENDOR_SPECIFIC_CATEGORY: { tpSirMacVendorSpecificFrameHdr pVendorSpecific = (tpSirMacVendorSpecificFrameHdr) pActionHdr; @@ -2345,7 +2345,7 @@ limProcessActionFrame(tpAniSirGlobal pMac, tANI_U8 *pRxPacketInfo,tpPESession ps } } break; -#endif /* WLAN_FEATURE_VOWIFI_11R || FEATURE_WLAN_CCX || +#endif /* WLAN_FEATURE_VOWIFI_11R || FEATURE_WLAN_ESE || FEATURE_WLAN_LFR */ case SIR_MAC_ACTION_PUBLIC_USAGE: switch(pActionHdr->actionID) { diff --git a/CORE/MAC/src/pe/lim/limProcessAssocRspFrame.c b/CORE/MAC/src/pe/lim/limProcessAssocRspFrame.c index 0e7b9ff14fc3..4542478f28d1 100644 --- a/CORE/MAC/src/pe/lim/limProcessAssocRspFrame.c +++ b/CORE/MAC/src/pe/lim/limProcessAssocRspFrame.c @@ -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); @@ -355,7 +355,7 @@ limProcessAssocRspFrame(tpAniSirGlobal pMac, tANI_U8 *pRxPacketInfo, tANI_U8 sub (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 @@ limProcessAssocRspFrame(tpAniSirGlobal pMac, tANI_U8 *pRxPacketInfo, tANI_U8 sub } #endif -#ifdef FEATURE_WLAN_CCX +#ifdef FEATURE_WLAN_ESE if (psessionEntry->tspecIes != NULL) { vos_mem_free(psessionEntry->tspecIes); @@ -575,7 +575,7 @@ limProcessAssocRspFrame(tpAniSirGlobal pMac, tANI_U8 *pRxPacketInfo, tANI_U8 sub 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)) { @@ -651,7 +651,7 @@ limProcessAssocRspFrame(tpAniSirGlobal pMac, tANI_U8 *pRxPacketInfo, tANI_U8 sub { // 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) @@ -662,10 +662,10 @@ limProcessAssocRspFrame(tpAniSirGlobal pMac, tANI_U8 *pRxPacketInfo, tANI_U8 sub // 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, @@ -673,9 +673,9 @@ limProcessAssocRspFrame(tpAniSirGlobal pMac, tANI_U8 *pRxPacketInfo, tANI_U8 sub 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; } @@ -710,7 +710,7 @@ limProcessAssocRspFrame(tpAniSirGlobal pMac, tANI_U8 *pRxPacketInfo, tANI_U8 sub 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 @@ -782,10 +782,10 @@ limProcessAssocRspFrame(tpAniSirGlobal pMac, tANI_U8 *pRxPacketInfo, tANI_U8 sub // 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 663490708222..73ce85ea8d39 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 @@ -579,10 +579,10 @@ limHandle80211Frames(tpAniSirGlobal pMac, tpSirMsgQ limMsg, tANI_U8 *pDeferMsg) goto end; } #endif //WLAN_FEATURE_ROAM_SCAN_OFFLOAD -#if defined(FEATURE_WLAN_CCX) && !defined(FEATURE_WLAN_CCX_UPLOAD) +#if defined(FEATURE_WLAN_ESE) && !defined(FEATURE_WLAN_ESE_UPLOAD) 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)); @@ -594,9 +594,9 @@ limHandle80211Frames(tpAniSirGlobal pMac, tpSirMsgQ limMsg, tANI_U8 *pDeferMsg) 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; @@ -604,7 +604,7 @@ limHandle80211Frames(tpAniSirGlobal pMac, tpSirMsgQ limMsg, tANI_U8 *pDeferMsg) 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 } else #endif @@ -820,12 +820,12 @@ limHandle80211Frames(tpAniSirGlobal pMac, tpSirMsgQ limMsg, tANI_U8 *pDeferMsg) } } #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 @@ -1332,8 +1332,8 @@ limProcessMessages(tpAniSirGlobal pMac, tpSirMsgQ limMsg) 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: @@ -1350,12 +1350,12 @@ limProcessMessages(tpAniSirGlobal pMac, tpSirMsgQ limMsg) 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; @@ -1571,18 +1571,18 @@ limProcessMessages(tpAniSirGlobal pMac, tpSirMsgQ limMsg) 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: @@ -1929,7 +1929,7 @@ limProcessMessages(tpAniSirGlobal pMac, tpSirMsgQ limMsg) 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 ba70ba4e1e21..f4d5f6a589a9 100644 --- a/CORE/MAC/src/pe/lim/limProcessMlmReqMessages.c +++ b/CORE/MAC/src/pe/lim/limProcessMlmReqMessages.c @@ -2190,7 +2190,7 @@ limProcessMlmPostJoinSuspendLink(tpAniSirGlobal pMac, eHalStatus status, tANI_U3 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 @@ -4410,7 +4410,7 @@ limProcessAssocFailureTimeout(tpAniSirGlobal pMac, tANI_U32 MsgType) 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 137d31e3bbec..7e0bf3e82fcc 100644 --- a/CORE/MAC/src/pe/lim/limProcessMlmRspMessages.c +++ b/CORE/MAC/src/pe/lim/limProcessMlmRspMessages.c @@ -2806,7 +2806,7 @@ limProcessStaMlmAddBssRspFT(tpAniSirGlobal pMac, tpSirMsgQ limMsgQ, tpPESession 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) { @@ -3012,7 +3012,7 @@ limProcessStaMlmAddBssRsp( tpAniSirGlobal pMac, tpSirMsgQ limMsgQ,tpPESession ps goto end; } if (eLIM_MLM_WT_ADD_BSS_RSP_REASSOC_STATE == psessionEntry->limMlmState -#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) || (eLIM_MLM_WT_ADD_BSS_RSP_FT_REASSOC_STATE == psessionEntry->limMlmState) #endif ) @@ -3035,7 +3035,7 @@ limProcessStaMlmAddBssRsp( tpAniSirGlobal pMac, tpSirMsgQ limMsgQ,tpPESession ps 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 7f543026be96..011624c7be52 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 12 @@ -1819,16 +1819,16 @@ __limProcessSmeJoinReq(tpAniSirGlobal pMac, tANI_U32 *pMsgBuf) 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 @@ -1931,7 +1931,7 @@ __limProcessSmeJoinReq(tpAniSirGlobal pMac, tANI_U32 *pMsgBuf) ); } -#ifdef FEATURE_WLAN_CCX +#ifdef FEATURE_WLAN_ESE psessionEntry->maxTxPower = limGetMaxTxPower(regMax, localPowerConstraint, pMac->roam.configParam.nTxPowerCap); #else psessionEntry->maxTxPower = VOS_MIN( regMax, (localPowerConstraint) ); @@ -2047,7 +2047,7 @@ end: } /*** end __limProcessSmeJoinReq() ***/ -#ifdef FEATURE_WLAN_CCX +#ifdef FEATURE_WLAN_ESE tANI_U8 limGetMaxTxPower(tPowerdBm regMax, tPowerdBm apTxPower, tANI_U8 iniTxPower) { tANI_U8 maxTxPower = 0; @@ -2150,7 +2150,7 @@ __limProcessSmeReassocReq(tpAniSirGlobal pMac, tANI_U32 *pMsgBuf) 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 @@ -4100,12 +4100,12 @@ __limProcessSmeDeltsReq(tpAniSirGlobal pMac, tANI_U32 *pMsgBuf) 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 @@ -4274,7 +4274,7 @@ __limProcessSmeGetStatisticsRequest(tpAniSirGlobal pMac, tANI_U32 *pMsgBuf) return; } -#if defined(FEATURE_WLAN_CCX) && defined(FEATURE_WLAN_CCX_UPLOAD) +#if defined(FEATURE_WLAN_ESE) && defined(FEATURE_WLAN_ESE_UPLOAD) /** *FUNCTION: __limProcessSmeGetTsmStatsRequest() * @@ -4301,9 +4301,9 @@ __limProcessSmeGetTsmStatsRequest(tpAniSirGlobal pMac, tANI_U32 *pMsgBuf) 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() * @@ -4596,7 +4596,7 @@ void __limProcessReportMessage(tpAniSirGlobal pMac, tpSirMsgQ pMsg) 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; @@ -4612,8 +4612,8 @@ void __limProcessReportMessage(tpAniSirGlobal pMac, tpSirMsgQ pMsg) 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 ); @@ -4623,7 +4623,7 @@ void __limProcessReportMessage(tpAniSirGlobal pMac, tpSirMsgQ pMsg) #endif } -#if defined(FEATURE_WLAN_CCX) || defined(WLAN_FEATURE_VOWIFI) +#if defined(FEATURE_WLAN_ESE) || defined(WLAN_FEATURE_VOWIFI) // -------------------------------------------------------------------- /** * limSendSetMaxTxPowerReq @@ -4660,7 +4660,7 @@ limSendSetMaxTxPowerReq ( tpAniSirGlobal pMac, tPowerdBm txPower, tpPESession pS 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 ) @@ -5630,19 +5630,19 @@ limProcessSmeReqMessages(tpAniSirGlobal pMac, tpSirMsgQ pMsg) //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; @@ -5695,8 +5695,8 @@ limProcessSmeReqMessages(tpAniSirGlobal pMac, tpSirMsgQ pMsg) 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 55b40c975dd8..30b4d094bb5d 100644 --- a/CORE/MAC/src/pe/lim/limPropExtsUtils.c +++ b/CORE/MAC/src/pe/lim/limPropExtsUtils.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011-2013 The Linux Foundation. All rights reserved. + * Copyright (c) 2011-2014 The Linux Foundation. All rights reserved. * * Previously licensed under the ISC license by Qualcomm Atheros, Inc. * @@ -133,14 +133,14 @@ limExtractApCapability(tpAniSirGlobal pMac, tANI_U8 *pIE, tANI_U16 ieLen, // 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 3d7cf39e3da6..bf5c4e68525a 100644 --- a/CORE/MAC/src/pe/lim/limScanResultUtils.c +++ b/CORE/MAC/src/pe/lim/limScanResultUtils.c @@ -276,7 +276,7 @@ limCollectBssDescription(tpAniSirGlobal pMac, } #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 9f86e950d4a4..a3d1fad1dc9e 100644 --- a/CORE/MAC/src/pe/lim/limSendManagementFrames.c +++ b/CORE/MAC/src/pe/lim/limSendManagementFrames.c @@ -1158,7 +1158,7 @@ limSendAddtsReqActionFrame(tpAniSirGlobal pMac, tANI_U32 nPayload, nBytes, nStatus; tpSirMacMgmtHdr pMacHdr; void *pPacket; -#ifdef FEATURE_WLAN_CCX +#ifdef FEATURE_WLAN_ESE tANI_U32 phyMode; #endif eHalStatus halstatus; @@ -1252,7 +1252,7 @@ limSendAddtsReqActionFrame(tpAniSirGlobal pMac, 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) @@ -1263,7 +1263,7 @@ limSendAddtsReqActionFrame(tpAniSirGlobal pMac, { 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 @@ -2444,19 +2444,19 @@ limSendAssocReqMgmtFrame(tpAniSirGlobal pMac, } #endif -#ifdef FEATURE_WLAN_CCX - /* CCX Version IE will be included in association request - when CCX is enabled on DUT through ini */ - if (psessionEntry->pLimJoinReq->isCCXFeatureIniEnabled) +#ifdef FEATURE_WLAN_ESE + /* ESE Version IE will be included in association request + when ESE is enabled on DUT through ini */ + if (psessionEntry->pLimJoinReq->isESEFeatureIniEnabled) { - PopulateDot11fCCXVersion(&pFrm->CCXVersion); + PopulateDot11fESEVersion(&pFrm->ESEVersion); } - /* For CCX Associations fill the CCX IEs */ - if (psessionEntry->isCCXconnection && - psessionEntry->pLimJoinReq->isCCXFeatureIniEnabled) + /* For ESE Associations fill the ESE IEs */ + if (psessionEntry->isESEconnection && + psessionEntry->pLimJoinReq->isESEFeatureIniEnabled) { #ifndef FEATURE_DISABLE_RM - PopulateDot11fCCXRadMgmtCap(&pFrm->CCXRadMgmtCap); + PopulateDot11fESERadMgmtCap(&pFrm->ESERadMgmtCap); #endif } #endif @@ -2611,7 +2611,7 @@ limSendAssocReqMgmtFrame(tpAniSirGlobal pMac, } // 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. @@ -2637,7 +2637,7 @@ limSendReassocReqWithFTIEsMgmtFrame(tpAniSirGlobal pMac, 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_U8 txFlag = 0; @@ -2742,7 +2742,7 @@ limSendReassocReqWithFTIEsMgmtFrame(tpAniSirGlobal pMac, // 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 @@ -2778,32 +2778,32 @@ limSendReassocReqWithFTIEsMgmtFrame(tpAniSirGlobal pMac, &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 - /* CCX Version IE will be included in reassociation request - when CCX is enabled on DUT through ini */ - if (psessionEntry->pLimReAssocReq->isCCXFeatureIniEnabled) +#ifdef FEATURE_WLAN_ESE + /* ESE Version IE will be included in reassociation request + when ESE is enabled on DUT through ini */ + if (psessionEntry->pLimReAssocReq->isESEFeatureIniEnabled) { - PopulateDot11fCCXVersion(&frm.CCXVersion); + PopulateDot11fESEVersion(&frm.ESEVersion); } - // For CCX Associations fill the CCX IEs - if (psessionEntry->isCCXconnection && - psessionEntry->pLimReAssocReq->isCCXFeatureIniEnabled) + // For ESE Associations fill the ESE IEs + if (psessionEntry->isESEconnection && + psessionEntry->pLimReAssocReq->isESEFeatureIniEnabled) { #ifndef FEATURE_DISABLE_RM - PopulateDot11fCCXRadMgmtCap(&frm.CCXRadMgmtCap); + PopulateDot11fESERadMgmtCap(&frm.ESERadMgmtCap); #endif } -#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 ) @@ -2822,16 +2822,16 @@ limSendReassocReqWithFTIEsMgmtFrame(tpAniSirGlobal pMac, { 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; @@ -2843,7 +2843,7 @@ limSendReassocReqWithFTIEsMgmtFrame(tpAniSirGlobal pMac, { 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 @@ -2857,8 +2857,8 @@ limSendReassocReqWithFTIEsMgmtFrame(tpAniSirGlobal pMac, #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 ) { @@ -2923,7 +2923,7 @@ limSendReassocReqWithFTIEsMgmtFrame(tpAniSirGlobal pMac, // 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: @@ -3707,7 +3707,7 @@ limSendAuthMgmtFrame(tpAniSirGlobal pMac, 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 @@ -3839,8 +3839,8 @@ eHalStatus limSendDisassocCnf(tpAniSirGlobal pMac) #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 ) || @@ -3858,16 +3858,16 @@ eHalStatus limSendDisassocCnf(tpAniSirGlobal pMac) { 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 3e7aa2ed1d45..579b9eff0a4f 100644 --- a/CORE/MAC/src/pe/lim/limSendSmeRspMessages.c +++ b/CORE/MAC/src/pe/lim/limSendSmeRspMessages.c @@ -274,7 +274,7 @@ limSendSmeJoinReassocRsp(tpAniSirGlobal pMac, tANI_U16 msgType, #ifdef WLAN_FEATURE_VOWIFI_11R psessionEntry->RICDataLen + #endif -#ifdef FEATURE_WLAN_CCX +#ifdef FEATURE_WLAN_ESE psessionEntry->tspecLen + #endif sizeof(tSirSmeJoinRsp) - sizeof(tANI_U8) ; @@ -314,7 +314,7 @@ limSendSmeJoinReassocRsp(tpAniSirGlobal pMac, tANI_U16 msgType, #ifdef WLAN_FEATURE_VOWIFI_11R pSirSmeJoinRsp->parsedRicRspLen = 0; #endif -#ifdef FEATURE_WLAN_CCX +#ifdef FEATURE_WLAN_ESE pSirSmeJoinRsp->tspecIeLen = 0; #endif @@ -366,7 +366,7 @@ limSendSmeJoinReassocRsp(tpAniSirGlobal pMac, tANI_U16 msgType, 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; @@ -376,7 +376,7 @@ limSendSmeJoinReassocRsp(tpAniSirGlobal pMac, tANI_U16 msgType, 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; @@ -2512,7 +2512,7 @@ limSendSmePEStatisticsRsp(tpAniSirGlobal pMac, tANI_U16 msgType, void* stats) } /*** 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() * @@ -2573,9 +2573,9 @@ limSendSmePEGetRoamRssiRsp(tpAniSirGlobal pMac, tANI_U16 msgType, void* stats) #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. @@ -2590,7 +2590,7 @@ limSendSmePEGetRoamRssiRsp(tpAniSirGlobal pMac, tANI_U16 msgType, void* stats) */ void -limSendSmePECcxTsmRsp(tpAniSirGlobal pMac, tAniGetTsmStatsRsp *pStats) +limSendSmePEEseTsmRsp(tpAniSirGlobal pMac, tAniGetTsmStatsRsp *pStats) { tSirMsgQ mmhMsg; tANI_U8 sessionId; @@ -2615,9 +2615,9 @@ limSendSmePECcxTsmRsp(tpAniSirGlobal pMac, tAniGetTsmStatsRsp *pStats) pPeStats->msgType = eWNI_SME_GET_TSM_STATS_RSP; pPeStats->tsmMetrics.RoamingCount - = pPeSessionEntry->ccxContext.tsm.tsmMetrics.RoamingCount; + = pPeSessionEntry->eseContext.tsm.tsmMetrics.RoamingCount; pPeStats->tsmMetrics.RoamingDly - = pPeSessionEntry->ccxContext.tsm.tsmMetrics.RoamingDly; + = pPeSessionEntry->eseContext.tsm.tsmMetrics.RoamingDly; mmhMsg.type = eWNI_SME_GET_TSM_STATS_RSP; mmhMsg.bodyptr = pStats; @@ -2626,9 +2626,9 @@ limSendSmePECcxTsmRsp(tpAniSirGlobal pMac, tAniGetTsmStatsRsp *pStats) 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 limSendSmeIBSSPeerInd( diff --git a/CORE/MAC/src/pe/lim/limSendSmeRspMessages.h b/CORE/MAC/src/pe/lim/limSendSmeRspMessages.h index 7f2f4de0c62f..914cf9417920 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. * @@ -87,11 +87,11 @@ void limSendSmeDeltsInd(tpAniSirGlobal pMac, tpSirDeltsReqInfo delts, tANI_U16 a 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 2ac0f897b3ff..34db4563b0b7 100644 --- a/CORE/MAC/src/pe/lim/limSerDesUtils.c +++ b/CORE/MAC/src/pe/lim/limSerDesUtils.c @@ -229,7 +229,7 @@ limGetBssDescription( tpAniSirGlobal pMac, tSirBssDescription *pBssDescription, #endif #endif -#ifdef FEATURE_WLAN_CCX +#ifdef FEATURE_WLAN_ESE pBssDescription->QBSSLoad_present = limGetU16(pBuf); pBuf += sizeof(tANI_U16); len -= sizeof(tANI_U16); @@ -1001,7 +1001,7 @@ limJoinReqSerDes(tpAniSirGlobal pMac, tpSirSmeJoinReq pJoinReq, tANI_U8 *pBuf) return eSIR_FAILURE; } -#ifdef FEATURE_WLAN_CCX +#ifdef FEATURE_WLAN_ESE // Extract CCKM IE pJoinReq->cckmIE.length = limGetU16(pBuf); pBuf += sizeof(tANI_U16); @@ -1103,33 +1103,33 @@ limJoinReqSerDes(tpAniSirGlobal pMac, tpSirSmeJoinReq pJoinReq, tANI_U8 *pBuf) return eSIR_FAILURE; #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) 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) return eSIR_FAILURE; // 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) return eSIR_FAILURE; #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 de9a9ee9cd81..d006bfe9e006 100644 --- a/CORE/MAC/src/pe/lim/limSession.c +++ b/CORE/MAC/src/pe/lim/limSession.c @@ -43,8 +43,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 #include "pmmApi.h" @@ -176,11 +176,11 @@ tpPESession peCreateSession(tpAniSirGlobal pMac, tANI_U8 *bssid, tANI_U8* sessio 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 @@ -468,7 +468,7 @@ void peDeleteSession(tpAniSirGlobal pMac, tpPESession psessionEntry) 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); @@ -482,8 +482,8 @@ void peDeleteSession(tpAniSirGlobal pMac, tpPESession psessionEntry) 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 /* Initialize PMM Ps Offload Module */ diff --git a/CORE/MAC/src/pe/lim/limTimerUtils.c b/CORE/MAC/src/pe/lim/limTimerUtils.c index f835126832cd..b974f1d6d3c0 100644 --- a/CORE/MAC/src/pe/lim/limTimerUtils.c +++ b/CORE/MAC/src/pe/lim/limTimerUtils.c @@ -661,13 +661,13 @@ limCreateTimers(tpAniSirGlobal pMac) } #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) { @@ -676,7 +676,7 @@ limCreateTimers(tpAniSirGlobal pMac) 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); @@ -747,9 +747,9 @@ limCreateTimers(tpAniSirGlobal pMac) 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) @@ -934,7 +934,7 @@ limAssocFailureTimerHandler(void *pMacGlobal, tANI_U32 param) 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)) { @@ -1657,15 +1657,15 @@ limDeactivateAndChangeTimer(tpAniSirGlobal pMac, tANI_U32 timerId) } 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 90c391307fde..c0eaf51f8f1b 100644 --- a/CORE/MAC/src/pe/lim/limTimerUtils.h +++ b/CORE/MAC/src/pe/lim/limTimerUtils.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011-2013 The Linux Foundation. All rights reserved. + * Copyright (c) 2011-2014 The Linux Foundation. All rights reserved. * * Previously licensed under the ISC license by Qualcomm Atheros, Inc. * @@ -70,7 +70,7 @@ enum #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 721dcf1f31f8..927bfd654361 100644 --- a/CORE/MAC/src/pe/lim/limTrace.c +++ b/CORE/MAC/src/pe/lim/limTrace.c @@ -1,5 +1,5 @@ /* - * 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. * @@ -82,7 +82,7 @@ static tANI_U8* __limTraceGetTimerString( tANI_U16 timerId ) #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 8b06fac3d11f..e33be2991664 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. * @@ -707,7 +707,7 @@ tSirRetStatus limSendLinkReportActionFrame(tpAniSirGlobal, tpSirMacLinkReport, t 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 fe6a944c0675..78f59a9c74fb 100644 --- a/CORE/MAC/src/pe/lim/limUtils.c +++ b/CORE/MAC/src/pe/lim/limUtils.c @@ -550,7 +550,7 @@ char *limMsgStr(tANI_U32 msgType) 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: @@ -669,12 +669,12 @@ char *limMsgStr(tANI_U32 msgType) 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"; } @@ -1071,11 +1071,11 @@ limCleanupMlm(tpAniSirGlobal pMac) 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 f9432b4b6447..b926d720bbae 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. * @@ -54,7 +54,7 @@ typedef enum #define LIM_STA_ID_MASK 0x00FF #define LIM_AID_MASK 0xC000 #define LIM_SPECTRUM_MANAGEMENT_BIT_MASK 0x0100 -#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 @@ -98,7 +98,7 @@ void limPrintMsgName(tpAniSirGlobal pMac, tANI_U16 logLevel, tANI_U32 msgType); 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 ); diff --git a/CORE/MAC/src/pe/sch/schBeaconProcess.c b/CORE/MAC/src/pe/sch/schBeaconProcess.c index 28506e7c4194..57813ed14693 100644 --- a/CORE/MAC/src/pe/sch/schBeaconProcess.c +++ b/CORE/MAC/src/pe/sch/schBeaconProcess.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. * @@ -135,11 +135,11 @@ ap_beacon_process( (pBcnStruct->erpIEInfo.useProtection || pBcnStruct->erpIEInfo.nonErpPresent))) { -#ifdef FEATURE_WLAN_CCX - if( psessionEntry->isCCXconnection ) +#ifdef FEATURE_WLAN_ESE + if( psessionEntry->isESEconnection ) { VOS_TRACE (VOS_MODULE_ID_PE, VOS_TRACE_LEVEL_INFO, - "%s: [INFOLOG]CCX 11g erpPresent=%d useProtection=%d nonErpPresent=%d", __func__, + "%s: [INFOLOG]ESE 11g erpPresent=%d useProtection=%d nonErpPresent=%d", __func__, pBcnStruct->erpPresent, pBcnStruct->erpIEInfo.useProtection, pBcnStruct->erpIEInfo.nonErpPresent); @@ -162,11 +162,11 @@ ap_beacon_process( (pBcnStruct->erpIEInfo.useProtection || pBcnStruct->erpIEInfo.nonErpPresent))) { -#ifdef FEATURE_WLAN_CCX - if( psessionEntry->isCCXconnection ) +#ifdef FEATURE_WLAN_ESE + if( psessionEntry->isESEconnection ) { VOS_TRACE (VOS_MODULE_ID_PE, VOS_TRACE_LEVEL_INFO, - "%s: [INFOLOG]CCX 11g erpPresent=%d useProtection=%d nonErpPresent=%d", __func__, + "%s: [INFOLOG]ESE 11g erpPresent=%d useProtection=%d nonErpPresent=%d", __func__, pBcnStruct->erpPresent, pBcnStruct->erpIEInfo.useProtection, pBcnStruct->erpIEInfo.nonErpPresent); @@ -340,7 +340,7 @@ static void __schBeaconProcessForSession( tpAniSirGlobal pMac, tANI_U8 operMode; tANI_U8 chWidth = 0; #endif -#if defined FEATURE_WLAN_CCX || defined FEATURE_WLAN_VOWIFI +#if defined FEATURE_WLAN_ESE || defined FEATURE_WLAN_VOWIFI tPowerdBm regMax = 0,maxTxPower = 0; #endif @@ -589,7 +589,7 @@ static void __schBeaconProcessForSession( tpAniSirGlobal pMac, } #endif -#if defined (FEATURE_WLAN_CCX) || defined (FEATURE_WLAN_VOWIFI) +#if defined (FEATURE_WLAN_ESE) || defined (FEATURE_WLAN_VOWIFI) /* Obtain the Max Tx power for the current regulatory */ regMax = cfgGetRegulatoryMaxTransmitPower( pMac, psessionEntry->currentOperChannel ); #endif @@ -607,24 +607,24 @@ static void __schBeaconProcessForSession( tpAniSirGlobal pMac, } maxTxPower = VOS_MIN(regMax,(regMax - localRRMConstraint)); } -#elif defined FEATURE_WLAN_CCX +#elif defined FEATURE_WLAN_ESE maxTxPower = regMax; #endif -#if defined FEATURE_WLAN_CCX - if( psessionEntry->isCCXconnection ) +#if defined FEATURE_WLAN_ESE + if( psessionEntry->isESEconnection ) { - tPowerdBm localCCXConstraint = 0; - if (pBeacon->ccxTxPwr.present) + tPowerdBm localESEConstraint = 0; + if (pBeacon->eseTxPwr.present) { - localCCXConstraint = pBeacon->ccxTxPwr.power_limit; - maxTxPower = limGetMaxTxPower(maxTxPower, localCCXConstraint, pMac->roam.configParam.nTxPowerCap); + localESEConstraint = pBeacon->eseTxPwr.power_limit; + maxTxPower = limGetMaxTxPower(maxTxPower, localESEConstraint, pMac->roam.configParam.nTxPowerCap); } - schLog( pMac, LOG1, "RegMax = %d, localCcxCons = %d, MaxTx = %d", regMax, localCCXConstraint, maxTxPower ); + schLog( pMac, LOG1, "RegMax = %d, localEseCons = %d, MaxTx = %d", regMax, localESEConstraint, maxTxPower ); } #endif -#if defined (FEATURE_WLAN_CCX) || defined (FEATURE_WLAN_VOWIFI) +#if defined (FEATURE_WLAN_ESE) || defined (FEATURE_WLAN_VOWIFI) { //If maxTxPower is increased or decreased if( maxTxPower != psessionEntry->maxTxPower ) diff --git a/CORE/SERVICES/COMMON/ieee80211_common.h b/CORE/SERVICES/COMMON/ieee80211_common.h index 4c7a6adb0955..75e9d59acc48 100644 --- a/CORE/SERVICES/COMMON/ieee80211_common.h +++ b/CORE/SERVICES/COMMON/ieee80211_common.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011 The Linux Foundation. All rights reserved. + * Copyright (c) 2011,2014 The Linux Foundation. All rights reserved. * * Previously licensed under the ISC license by Qualcomm Atheros, Inc. * @@ -1480,7 +1480,7 @@ struct ieee80211_tpc_ie { /* * MHDRIE included in TKIP MFP protected management frames */ -struct ieee80211_ccx_mhdr_ie { +struct ieee80211_ese_mhdr_ie { u_int8_t mhdr_id; u_int8_t mhdr_len; u_int8_t mhdr_oui[3]; diff --git a/CORE/SERVICES/WMA/wma.c b/CORE/SERVICES/WMA/wma.c index d413ff62ab1b..2b719c830e47 100644 --- a/CORE/SERVICES/WMA/wma.c +++ b/CORE/SERVICES/WMA/wma.c @@ -4754,7 +4754,7 @@ A_UINT32 eCsrAuthType_to_rsn_authmode (eCsrAuthType authtype, eCsrEncryptionType case eCSR_AUTH_TYPE_WAPI_WAI_PSK: return(WMI_AUTH_WAPI_PSK); #endif -#ifdef FEATURE_WLAN_CCX +#ifdef FEATURE_WLAN_ESE case eCSR_AUTH_TYPE_CCKM_WPA: case eCSR_AUTH_TYPE_CCKM_RSN: return (WMI_AUTH_CCKM); @@ -11469,7 +11469,7 @@ static void wma_config_pno(tp_wma_handle wma, tpSirPNOScanReq pno) vos_mem_free(pno); } -#if defined(FEATURE_WLAN_CCX) && defined(FEATURE_WLAN_CCX_UPLOAD) +#if defined(FEATURE_WLAN_ESE) && defined(FEATURE_WLAN_ESE_UPLOAD) static VOS_STATUS wma_plm_start(tp_wma_handle wma, const tpSirPlmReq plm) { wmi_vdev_plmreq_start_cmd_fixed_param *cmd; @@ -13197,7 +13197,7 @@ out: } #endif /* FEATURE_OEM_DATA_SUPPORT */ -#ifdef FEATURE_WLAN_CCX +#ifdef FEATURE_WLAN_ESE #define TSM_DELAY_HISTROGRAM_BINS 4 /* @@ -13217,7 +13217,7 @@ VOS_STATUS wma_process_tsm_stats_req(tp_wma_handle wma_handler, u_int16_t packet_count = 0; u_int16_t packet_loss_count = 0; tpAniTrafStrmMetrics pTsmMetric = NULL; -#ifdef FEATURE_WLAN_CCX_UPLOAD +#ifdef FEATURE_WLAN_ESE_UPLOAD tpAniGetTsmStatsReq pStats = (tpAniGetTsmStatsReq)pTsmStatsMsg; tpAniGetTsmStatsRsp pTsmRspParams = NULL; #else @@ -13244,7 +13244,7 @@ VOS_STATUS wma_process_tsm_stats_req(tp_wma_handle wma_handler, ol_tx_delay_hist(pdev, bin_values, tid); ol_tx_packet_count(pdev, &packet_count, &packet_loss_count, tid ); -#ifdef FEATURE_WLAN_CCX_UPLOAD +#ifdef FEATURE_WLAN_ESE_UPLOAD pTsmRspParams = (tpAniGetTsmStatsRsp)vos_mem_malloc(sizeof(tAniGetTsmStatsRsp)); if(NULL == pTsmRspParams) @@ -13278,7 +13278,7 @@ VOS_STATUS wma_process_tsm_stats_req(tp_wma_handle wma_handler, * being populated just before sending IAPP frame out */ /* post this message to LIM/PE */ -#ifdef FEATURE_WLAN_CCX_UPLOAD +#ifdef FEATURE_WLAN_ESE_UPLOAD wma_send_msg(wma_handler, WDA_TSM_STATS_RSP, (void *)pTsmRspParams , 0) ; #else wma_send_msg(wma_handler, WDA_TSM_STATS_RSP, (void *)pTsmStatsMsg , 0) ; @@ -13286,7 +13286,7 @@ VOS_STATUS wma_process_tsm_stats_req(tp_wma_handle wma_handler, return VOS_STATUS_SUCCESS; } -#endif /* FEATURE_WLAN_CCX */ +#endif /* FEATURE_WLAN_ESE */ static void wma_del_ts_req(tp_wma_handle wma, tDelTsParams *msg) { @@ -13380,7 +13380,7 @@ static void wma_add_ts_req(tp_wma_handle wma, tAddTsParams *msg) wmi_buf_t buf; int32_t len = sizeof(*cmd); -#ifdef FEATURE_WLAN_CCX +#ifdef FEATURE_WLAN_ESE /* * msmt_interval is in unit called TU (1 TU = 1024 us) * max value of msmt_interval cannot make resulting @@ -15257,7 +15257,7 @@ VOS_STATUS wma_mc_process_msg(v_VOID_t *vos_context, vos_msg_t *msg) } switch (msg->type) { -#ifdef FEATURE_WLAN_CCX +#ifdef FEATURE_WLAN_ESE case WDA_TSM_STATS_REQ: WMA_LOGA("McThread: WDA_TSM_STATS_REQ"); wma_process_tsm_stats_req(wma_handle, (void*)msg->bodyptr); @@ -15399,7 +15399,7 @@ VOS_STATUS wma_mc_process_msg(v_VOID_t *vos_context, vos_msg_t *msg) wma_scan_cache_updated_ind(wma_handle); break; #endif -#if defined(FEATURE_WLAN_CCX) && defined(FEATURE_WLAN_CCX_UPLOAD) +#if defined(FEATURE_WLAN_ESE) && defined(FEATURE_WLAN_ESE_UPLOAD) case WDA_SET_PLM_REQ: wma_config_plm(wma_handle, (tpSirPlmReq)msg->bodyptr); diff --git a/CORE/SERVICES/WMA/wma.h b/CORE/SERVICES/WMA/wma.h index 7f7edd21d52e..670ffb0fbad2 100644 --- a/CORE/SERVICES/WMA/wma.h +++ b/CORE/SERVICES/WMA/wma.h @@ -425,7 +425,7 @@ struct wma_txrx_node { v_BOOL_t nlo_match_evt_received; v_BOOL_t pno_in_progress; #endif -#if defined(FEATURE_WLAN_CCX) && defined(FEATURE_WLAN_CCX_UPLOAD) +#if defined(FEATURE_WLAN_ESE) && defined(FEATURE_WLAN_ESE_UPLOAD) v_BOOL_t plm_in_progress; #endif v_BOOL_t ptrn_match_enable; diff --git a/CORE/SERVICES/WMI/wmi_unified.c b/CORE/SERVICES/WMI/wmi_unified.c index 6ea5fe36cb21..bf1a2c4d42da 100644 --- a/CORE/SERVICES/WMI/wmi_unified.c +++ b/CORE/SERVICES/WMI/wmi_unified.c @@ -51,6 +51,36 @@ #define WMI_EMPTY_HTC_QUEUE_MAX_RETRY 40 #define WMI_SLEEP_TO_FLUSH_HTC_QUEUE 40 +#ifdef WMI_INTERFACE_EVENT_LOGGING + +u_int32_t g_wmi_command_buf_idx = 0; +struct wmi_command_debug wmi_command_log_buffer[WMI_EVENT_DEBUG_MAX_ENTRY]; + + +u_int32_t g_wmi_event_buf_idx = 0; +struct wmi_event_debug wmi_event_log_buffer[WMI_EVENT_DEBUG_MAX_ENTRY]; + +#define WMI_COMMAND_RECORD(a) { \ + if (WMI_EVENT_DEBUG_MAX_ENTRY <= g_wmi_command_buf_idx) \ + g_wmi_command_buf_idx = 0; \ + wmi_command_log_buffer[g_wmi_command_buf_idx].command = a; \ + wmi_command_log_buffer[g_wmi_command_buf_idx].time = \ + adf_os_ticks(); \ + g_wmi_command_buf_idx++; \ +} + +#define WMI_EVENT_RECORD(a) { \ + if (WMI_EVENT_DEBUG_MAX_ENTRY <= g_wmi_event_buf_idx) \ + g_wmi_event_buf_idx = 0; \ + wmi_event_log_buffer[g_wmi_event_buf_idx].event = a; \ + wmi_event_log_buffer[g_wmi_event_buf_idx].time = \ + adf_os_ticks(); \ + g_wmi_event_buf_idx++; \ +} + +#endif /*WMI_INTERFACE_EVENT_LOGGING*/ + + static void __wmi_control_rx(struct wmi_unified *wmi_handle, wmi_buf_t evt_buf); int wmi_get_host_credits(wmi_unified_t wmi_handle); /* WMI buffer APIs */ @@ -561,6 +591,13 @@ int wmi_unified_cmd_send(wmi_unified_t wmi_handle, wmi_buf_t buf, int len, WMA_LOGD("Send WMI command:%s command_id:%d", get_wmi_cmd_string(cmd_id), cmd_id); + +#ifdef WMI_INTERFACE_EVENT_LOGGING + adf_os_spin_lock_bh(&wmi_handle->wmi_cmd_record_lock); + WMI_COMMAND_RECORD(cmd_id); + adf_os_spin_unlock_bh(&wmi_handle->wmi_cmd_record_lock); +#endif + status = HTCSendPkt(wmi_handle->htc_handle, pkt); if (A_OK != status) { @@ -727,6 +764,11 @@ void __wmi_control_rx(struct wmi_unified *wmi_handle, wmi_buf_t evt_buf) goto end; } +#ifdef WMI_INTERFACE_EVENT_LOGGING + adf_os_spin_lock_bh(&wmi_handle->wmi_event_record_lock); + WMI_EVENT_RECORD(id); + adf_os_spin_unlock_bh(&wmi_handle->wmi_event_record_lock); +#endif /* Call the WMI registered event handler */ wmi_handle->event_handler[idx](wmi_handle->scn_handle, wmi_cmd_struct_ptr, len); @@ -790,6 +832,10 @@ wmi_unified_attach(ol_scn_t scn_handle) adf_nbuf_queue_init(&wmi_handle->event_queue); INIT_WORK(&wmi_handle->rx_event_work, wmi_rx_event_work); #endif +#ifdef WMI_INTERFACE_EVENT_LOGGING + adf_os_spinlock_init(&wmi_handle->wmi_cmd_record_lock); + adf_os_spinlock_init(&wmi_handle->wmi_event_record_lock); +#endif return wmi_handle; } diff --git a/CORE/SERVICES/WMI/wmi_unified_priv.h b/CORE/SERVICES/WMI/wmi_unified_priv.h index 17ad918ced43..9880519a6b9d 100644 --- a/CORE/SERVICES/WMI/wmi_unified_priv.h +++ b/CORE/SERVICES/WMI/wmi_unified_priv.h @@ -42,6 +42,23 @@ typedef adf_nbuf_t wmi_buf_t; +#ifdef WMI_INTERFACE_EVENT_LOGGING + +#define WMI_EVENT_DEBUG_MAX_ENTRY (1024) + +struct wmi_command_debug{ + u_int32_t command; + unsigned long time; +}; + +struct wmi_event_debug{ + u_int32_t event; + unsigned long time; +}; + +#endif /*WMI_INTERFACE_EVENT_LOGGING*/ + + #ifdef WLAN_OPEN_SOURCE struct fwdebug { struct sk_buff_head fwlog_queue; @@ -67,5 +84,11 @@ struct wmi_unified { struct fwdebug dbglog; struct dentry *debugfs_phy; #endif /* WLAN_OPEN_SOURCE */ + +#ifdef WMI_INTERFACE_EVENT_LOGGING + adf_os_spinlock_t wmi_cmd_record_lock; + adf_os_spinlock_t wmi_event_record_lock; +#endif /*WMI_INTERFACE_EVENT_LOGGING*/ + }; #endif diff --git a/CORE/SME/inc/csrApi.h b/CORE/SME/inc/csrApi.h index 41947da0221b..1bee832bed03 100644 --- a/CORE/SME/inc/csrApi.h +++ b/CORE/SME/inc/csrApi.h @@ -63,10 +63,10 @@ typedef enum 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 @@ typedef enum #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, @@ -206,7 +206,7 @@ typedef enum #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 @@ -320,23 +320,23 @@ typedef struct tagCsrMobilityDomainInfo } 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 { @@ -462,12 +462,12 @@ typedef enum eCSR_ROAM_UNPROT_MGMT_FRAME_IND, #endif -#if defined(FEATURE_WLAN_CCX) && defined(FEATURE_WLAN_CCX_UPLOAD) +#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 */ // Radar indication from lower layers eCSR_ROAM_DFS_RADAR_IND, @@ -942,9 +942,9 @@ typedef struct tagCsrRoamConnectedProfile 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; tANI_U8 proxyARPService; @@ -1064,15 +1064,15 @@ typedef struct tagCsrConfigParam #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; @@ -1125,7 +1125,7 @@ typedef struct tagCsrConfigParam */ 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; @@ -1203,14 +1203,14 @@ typedef struct tagCsrRoamInfo 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; @@ -1435,21 +1435,21 @@ typedef struct tagCsrHandoffRequest }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 @@ -1592,7 +1592,7 @@ typedef void ( *tCsrStatsCallback) (void * stats, void *pContext); 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 @@ -1603,7 +1603,7 @@ typedef void ( *tCsrRssiCallback) (v_S7_t rssi, tANI_U32 staId, void *pContext); 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 diff --git a/CORE/SME/inc/csrInternal.h b/CORE/SME/inc/csrInternal.h index 33fa9ff11cca..f0ef3836c054 100644 --- a/CORE/SME/inc/csrInternal.h +++ b/CORE/SME/inc/csrInternal.h @@ -88,7 +88,7 @@ (((pMac)->roam.configParam.nSelect5GHzMargin)?eANI_BOOLEAN_TRUE:eANI_BOOLEAN_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) #define CSR_IS_ROAM_PREFER_5GHZ( pMac ) \ ( \ (((pMac)->roam.configParam.nRoamPrefer5GHz)?eANI_BOOLEAN_TRUE:eANI_BOOLEAN_FALSE) \ @@ -111,7 +111,7 @@ ) #endif -//Support for "Fast roaming" (i.e., CCX, LFR, or 802.11r.) +//Support for "Fast roaming" (i.e., ESE, LFR, or 802.11r.) #define CSR_BG_SCAN_OCCUPIED_CHANNEL_LIST_LEN 15 typedef enum @@ -619,11 +619,11 @@ typedef struct tagCsrConfig #endif #endif -#ifdef FEATURE_WLAN_CCX - tANI_U8 isCcxIniFeatureEnabled; +#ifdef FEATURE_WLAN_ESE + tANI_U8 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) tANI_U8 isFastTransitionEnabled; tANI_U8 RoamRssiDiff; tANI_U8 nImmediateRoamRssiDiff; @@ -818,7 +818,7 @@ typedef struct tagRoamCsrConnectedInfo #ifdef WLAN_FEATURE_VOWIFI_11R tANI_U32 nRICRspLength; //Length of the parsed RIC response IEs received in reassoc response #endif -#ifdef FEATURE_WLAN_CCX +#ifdef FEATURE_WLAN_ESE tANI_U32 nTspecIeLength; #endif tANI_U8 *pbFrames; //Point to a buffer contain the beacon, assoc req, assoc rsp frame, in that order @@ -939,16 +939,16 @@ typedef struct tagCsrRoamSession tCsrTimerInfo joinRetryTimerInfo; tANI_U32 maxRetryCount; #endif -#ifdef FEATURE_WLAN_CCX - tCsrCcxCckmInfo ccxCckmInfo; +#ifdef FEATURE_WLAN_ESE + tCsrEseCckmInfo eseCckmInfo; tANI_BOOLEAN isPrevApInfoValid; tSirMacSSid prevApSSID; tCsrBssid prevApBssid; tANI_U8 prevOpChannel; tANI_U16 clientDissSecs; tANI_U32 roamTS1; -#if defined(FEATURE_WLAN_CCX_UPLOAD) - tCsrCcxCckmIe suppCckmIeInfo; +#if defined(FEATURE_WLAN_ESE_UPLOAD) + tCsrEseCckmIe suppCckmIeInfo; #endif #endif tANI_U8 bRefAssocStartCnt; //Tracking assoc start indication @@ -1008,10 +1008,10 @@ typedef struct tagCsrRoamStruct #ifdef FEATURE_WLAN_LFR tANI_U8 isFastRoamIniFeatureEnabled; #endif -#ifdef FEATURE_WLAN_CCX - tANI_U8 isCcxIniFeatureEnabled; +#ifdef FEATURE_WLAN_ESE + tANI_U8 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) tANI_U8 RoamRssiDiff; tANI_BOOLEAN isWESModeEnabled; #endif @@ -1260,7 +1260,7 @@ eHalStatus csrGetRssi(tpAniSirGlobal pMac,tCsrRssiCallback callback,tANI_U8 staI eHalStatus csrGetSnr(tpAniSirGlobal pMac, tCsrSnrCallback callback, tANI_U8 staId, tCsrBssid bssId, void *pContext); -#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) eHalStatus csrGetRoamRssi(tpAniSirGlobal pMac, tCsrRssiCallback callback, tANI_U8 staId, @@ -1269,7 +1269,7 @@ eHalStatus csrGetRoamRssi(tpAniSirGlobal pMac, void * pVosContext); #endif -#if defined(FEATURE_WLAN_CCX) && defined(FEATURE_WLAN_CCX_UPLOAD) +#if defined(FEATURE_WLAN_ESE) && defined(FEATURE_WLAN_ESE_UPLOAD) eHalStatus csrGetTsmStats(tpAniSirGlobal pMac, tCsrTsmStatsCallback callback, tANI_U8 staId, @@ -1277,7 +1277,7 @@ eHalStatus csrGetTsmStats(tpAniSirGlobal pMac, void *pContext, void* pVosContext, tANI_U8 tid); -#endif /* FEATURE_WLAN_CCX && FEATURE_WLAN_CCX_UPLOAD */ +#endif /* FEATURE_WLAN_ESE && FEATURE_WLAN_ESE_UPLOAD */ eHalStatus csrRoamRegisterCallback(tpAniSirGlobal pMac, csrRoamCompleteCallback callback, @@ -1405,11 +1405,11 @@ eHalStatus csrScanSavePreferredNetworkFound(tpAniSirGlobal pMac, tANI_BOOLEAN csrRoamIs11rAssoc(tpAniSirGlobal pMac); #endif -#ifdef FEATURE_WLAN_CCX -//Returns whether the current association is a CCX assoc or not -tANI_BOOLEAN csrRoamIsCCXAssoc(tpAniSirGlobal pMac); -tANI_BOOLEAN csrRoamIsCcxIniFeatureEnabled(tpAniSirGlobal pMac); -tANI_BOOLEAN csrNeighborRoamIsCCXAssoc(tpAniSirGlobal pMac); +#ifdef FEATURE_WLAN_ESE +//Returns whether the current association is a ESE assoc or not +tANI_BOOLEAN csrRoamIsESEAssoc(tpAniSirGlobal pMac); +tANI_BOOLEAN csrRoamIsEseIniFeatureEnabled(tpAniSirGlobal pMac); +tANI_BOOLEAN csrNeighborRoamIsESEAssoc(tpAniSirGlobal pMac); #endif //Remove this code once SLM_Sessionization is supported diff --git a/CORE/SME/inc/csrNeighborRoam.h b/CORE/SME/inc/csrNeighborRoam.h index 2bb1f5ce1e8c..cc603fe84470 100644 --- a/CORE/SME/inc/csrNeighborRoam.h +++ b/CORE/SME/inc/csrNeighborRoam.h @@ -185,8 +185,8 @@ typedef struct sCsrNeighborRoamControlInfo tANI_BOOLEAN is11rAssoc; tCsr11rAssocNeighborInfo FTRoamInfo; #endif /* WLAN_FEATURE_VOWIFI_11R */ -#ifdef FEATURE_WLAN_CCX - tANI_BOOLEAN isCCXAssoc; +#ifdef FEATURE_WLAN_ESE + tANI_BOOLEAN isESEAssoc; tANI_BOOLEAN isVOAdmitted; tANI_U32 MinQBssLoadRequired; #endif @@ -252,7 +252,7 @@ VOS_STATUS csrNeighborRoamSetRoamBeaconRssiWeight(tpAniSirGlobal pMac, v_U8_t nRoamBeaconRssiWeight); VOS_STATUS csrNeighborRoamUpdateFastRoamingEnabled(tpAniSirGlobal pMac, const v_BOOL_t fastRoamEnabled); -VOS_STATUS csrNeighborRoamUpdateCcxModeEnabled(tpAniSirGlobal pMac, const v_BOOL_t ccxMode); +VOS_STATUS csrNeighborRoamUpdateEseModeEnabled(tpAniSirGlobal pMac, const v_BOOL_t eseMode); VOS_STATUS csrNeighborRoamChannelsFilterByCurrentBand( tpAniSirGlobal pMac, tANI_U8* pInputChannelList, @@ -281,7 +281,7 @@ VOS_STATUS csrNeighborRoamMergeChannelLists(tpAniSirGlobal pMac, #define REASON_LOOKUP_THRESH_CHANGED 3 #define REASON_DISCONNECTED 4 #define REASON_RSSI_DIFF_CHANGED 5 -#define REASON_CCX_INI_CFG_CHANGED 6 +#define REASON_ESE_INI_CFG_CHANGED 6 #define REASON_NEIGHBOR_SCAN_REFRESH_PERIOD_CHANGED 7 #define REASON_VALID_CHANNEL_LIST_CHANGED 8 #define REASON_FLUSH_CHANNEL_LIST 9 @@ -306,12 +306,12 @@ eHalStatus csrNeighborRoamSssidScanDone(tpAniSirGlobal pMac, eHalStatus status); eHalStatus csrNeighborRoamStartLfrScan(tpAniSirGlobal pMac); #endif -#if defined(FEATURE_WLAN_CCX) && defined(FEATURE_WLAN_CCX_UPLOAD) +#if defined(FEATURE_WLAN_ESE) && defined(FEATURE_WLAN_ESE_UPLOAD) VOS_STATUS csrSetCCKMIe(tpAniSirGlobal pMac, const tANI_U8 sessionId, const tANI_U8 *pCckmIe, const tANI_U8 ccKmIeLen); VOS_STATUS csrRoamReadTSF(tpAniSirGlobal pMac, tANI_U8 *pTimestamp); -#endif /*FEATURE_WLAN_CCX && FEATURE_WLAN_CCX_UPLOAD */ +#endif /*FEATURE_WLAN_ESE && FEATURE_WLAN_ESE_UPLOAD */ #endif /* WLAN_FEATURE_NEIGHBOR_ROAMING */ diff --git a/CORE/SME/inc/csrSupport.h b/CORE/SME/inc/csrSupport.h index bf63b4a373e4..3ce3ba455363 100644 --- a/CORE/SME/inc/csrSupport.h +++ b/CORE/SME/inc/csrSupport.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011-2013 The Linux Foundation. All rights reserved. + * Copyright (c) 2011-2014 The Linux Foundation. All rights reserved. * * Previously licensed under the ISC license by Qualcomm Atheros, Inc. * @@ -821,9 +821,9 @@ tANI_BOOLEAN csrIsProfile11r( tCsrRoamProfile *pProfile ); tANI_BOOLEAN csrIsAuthType11r( eCsrAuthType AuthType, tANI_U8 mdiePresent); #endif -#ifdef FEATURE_WLAN_CCX -tANI_BOOLEAN csrIsAuthTypeCCX( eCsrAuthType AuthType ); -tANI_BOOLEAN csrIsProfileCCX( tCsrRoamProfile *pProfile ); +#ifdef FEATURE_WLAN_ESE +tANI_BOOLEAN csrIsAuthTypeESE( eCsrAuthType AuthType ); +tANI_BOOLEAN csrIsProfileESE( tCsrRoamProfile *pProfile ); #endif #endif diff --git a/CORE/SME/inc/smeInside.h b/CORE/SME/inc/smeInside.h index 7f29e9ffc6c4..8d53ab8ddf74 100644 --- a/CORE/SME/inc/smeInside.h +++ b/CORE/SME/inc/smeInside.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. * @@ -315,7 +315,7 @@ eHalStatus csrTdlsTeardownReq(tHalHandle hHal, tANI_U8 sessionId, #endif #endif /* FEATURE_WLAN_TDLS */ -#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) eHalStatus csrFlushCfgBgScanRoamChannelList(tpAniSirGlobal pMac); eHalStatus csrCreateBgScanRoamChannelList(tpAniSirGlobal pMac, const tANI_U8 *pChannelList, @@ -323,7 +323,7 @@ eHalStatus csrCreateBgScanRoamChannelList(tpAniSirGlobal pMac, eHalStatus csrUpdateBgScanConfigIniChannelList(tpAniSirGlobal pMac, eCsrBand eBand); #endif -#if defined(FEATURE_WLAN_CCX) && defined(FEATURE_WLAN_CCX_UPLOAD) +#if defined(FEATURE_WLAN_ESE) && defined(FEATURE_WLAN_ESE_UPLOAD) eHalStatus csrCreateRoamScanChannelList(tpAniSirGlobal pMac, tANI_U8 *pChannelList, tANI_U8 numChannels, @@ -337,7 +337,7 @@ eHalStatus csrPsOffloadIsFullPowerNeeded(tpAniSirGlobal pMac, tRequestFullPowerReason *pReason, tANI_BOOLEAN *pfNeedPower); -#if defined(FEATURE_WLAN_CCX) && defined(FEATURE_WLAN_CCX_UPLOAD) +#if defined(FEATURE_WLAN_ESE) && defined(FEATURE_WLAN_ESE_UPLOAD) eHalStatus csrCreateRoamScanChannelList(tpAniSirGlobal pMac, tANI_U8 *pChannelList, tANI_U8 numChannels, diff --git a/CORE/SME/inc/smeQosInternal.h b/CORE/SME/inc/smeQosInternal.h index 9ebf0a1e3d3d..2f45a6e5bf60 100644 --- a/CORE/SME/inc/smeQosInternal.h +++ b/CORE/SME/inc/smeQosInternal.h @@ -243,8 +243,8 @@ v_U8_t sme_QosGetACMMask(tpAniSirGlobal pMac, tSirBssDescription *pSirBssDesc, t */ sme_QosStatusType sme_QosTriggerUapsdChange( tpAniSirGlobal pMac ); -#ifdef FEATURE_WLAN_CCX -v_U8_t sme_QosCCxRetrieveTspecInfo(tpAniSirGlobal pMac, v_U8_t sessionId, tTspecInfo *pTspecInfo); +#ifdef FEATURE_WLAN_ESE +v_U8_t sme_QosEseRetrieveTspecInfo(tpAniSirGlobal pMac, v_U8_t sessionId, tTspecInfo *pTspecInfo); #endif diff --git a/CORE/SME/inc/smeRrmInternal.h b/CORE/SME/inc/smeRrmInternal.h index 8ca8c71e8d00..215653278936 100644 --- a/CORE/SME/inc/smeRrmInternal.h +++ b/CORE/SME/inc/smeRrmInternal.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011-2012 The Linux Foundation. All rights reserved. + * Copyright (c) 2011-2012,2014 The Linux Foundation. All rights reserved. * * Previously licensed under the ISC license by Qualcomm Atheros, Inc. * @@ -92,16 +92,16 @@ typedef struct sRrmSMEContext tAniSSID ssId; //SSID used in the measuring beacon report. tSirMacAddr bssId; //bssid used for beacon report measurement. tANI_U16 randnIntvl; //Randomization interval to be used in subsequent measurements. - tANI_U16 duration[SIR_CCX_MAX_MEAS_IE_REQS]; - tANI_U8 measMode[SIR_CCX_MAX_MEAS_IE_REQS]; + tANI_U16 duration[SIR_ESE_MAX_MEAS_IE_REQS]; + tANI_U8 measMode[SIR_ESE_MAX_MEAS_IE_REQS]; tRrmConfigParam rrmConfig; vos_timer_t IterMeasTimer; tDblLinkList neighborReportCache; tRrmNeighborRequestControlInfo neighborReqControlInfo; -#if defined(FEATURE_WLAN_CCX) && defined(FEATURE_WLAN_CCX_UPLOAD) - tCsrCcxBeaconReq ccxBcnReqInfo; -#endif /* FEATURE_WLAN_CCX && FEATURE_WLAN_CCX_UPLOAD */ +#if defined(FEATURE_WLAN_ESE) && defined(FEATURE_WLAN_ESE_UPLOAD) + tCsrEseBeaconReq eseBcnReqInfo; +#endif /* FEATURE_WLAN_ESE && FEATURE_WLAN_ESE_UPLOAD */ tRrmMsgReqSource msgSource; }tRrmSMEContext, *tpRrmSMEContext; diff --git a/CORE/SME/inc/sme_Api.h b/CORE/SME/inc/sme_Api.h index 2c8e0bacc5f9..5f13ec6e47d6 100644 --- a/CORE/SME/inc/sme_Api.h +++ b/CORE/SME/inc/sme_Api.h @@ -114,13 +114,13 @@ typedef struct _smeConfigParams tANI_U8 isFastRoamIniFeatureEnabled; tANI_U8 MAWCEnabled; #endif -#if defined FEATURE_WLAN_CCX - tANI_U8 isCcxIniFeatureEnabled; +#if defined FEATURE_WLAN_ESE + tANI_U8 isEseIniFeatureEnabled; #endif #if defined WLAN_FEATURE_P2P_INTERNAL tP2PConfigParam p2pConfig; #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_BOOLEAN isWESModeEnabled; @@ -401,7 +401,7 @@ eHalStatus sme_UpdateChannelConfig(tHalHandle hHal); #endif // FEATURE_WLAN_SCAN_PNLO -#if defined(FEATURE_WLAN_CCX) && defined(FEATURE_WLAN_CCX_UPLOAD) +#if defined(FEATURE_WLAN_ESE) && defined(FEATURE_WLAN_ESE_UPLOAD) /*-------------------------------------------------------------------------- \brief sme_SetPlmRequest() - send PLM request to firmware @@ -927,7 +927,7 @@ eHalStatus sme_GetSnr(tHalHandle hHal, tCsrSnrCallback callback, tANI_U8 staId, tCsrBssid bssId, void *pContext); -#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) eHalStatus sme_GetRoamRssi(tHalHandle hHal, tCsrRssiCallback callback, tANI_U8 staId, @@ -936,7 +936,7 @@ eHalStatus sme_GetRoamRssi(tHalHandle hHal, void* pVosContext); #endif -#if defined(FEATURE_WLAN_CCX) && defined(FEATURE_WLAN_CCX_UPLOAD) +#if defined(FEATURE_WLAN_ESE) && defined(FEATURE_WLAN_ESE_UPLOAD) /* --------------------------------------------------------------------------- \fn sme_GetTsmStats \brief a wrapper function that client calls to register a callback to get @@ -965,16 +965,16 @@ eHalStatus sme_SetCCKMIe(tHalHandle hHal, tANI_U8 *pCckmIe, tANI_U8 cckmIeLen); /* --------------------------------------------------------------------------- - \fn sme_SetCcxBeaconRequest - \brief function to set CCX beacon request parameters + \fn sme_SetEseBeaconRequest + \brief function to set ESE beacon request parameters \param hHal - HAL handle for device - \param pCcxBcnReq - pointer to CCX beacon request + \param pEseBcnReq - pointer to ESE beacon request \- return Success or failure -------------------------------------------------------------------------*/ -eHalStatus sme_SetCcxBeaconRequest(tHalHandle hHal, const tANI_U8 sessionId, - const tCsrCcxBeaconReq* pCcxBcnReq); +eHalStatus sme_SetEseBeaconRequest(tHalHandle hHal, const tANI_U8 sessionId, + const tCsrEseBeaconReq* pEseBcnReq); -#endif /*FEATURE_WLAN_CCX && FEATURE_WLAN_CCX_UPLOAD */ +#endif /*FEATURE_WLAN_ESE && FEATURE_WLAN_ESE_UPLOAD */ /* --------------------------------------------------------------------------- \fn sme_CfgSetInt @@ -2514,7 +2514,7 @@ void sme_transportDebug(tHalHandle hHal, v_BOOL_t displaySnapshot, v_BOOL_t togg -------------------------------------------------------------------------*/ void sme_ResetPowerValuesFor5G (tHalHandle hHal); -#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) /* --------------------------------------------------------------------------- \fn sme_UpdateRoamPrefer5GHz \brief enable/disable Roam prefer 5G runtime option @@ -2649,7 +2649,7 @@ eHalStatus sme_UpdateWESMode(tHalHandle hHal, v_BOOL_t isWESModeEnabled); Other status means SME failure to update -------------------------------------------------------------------------*/ eHalStatus sme_SetRoamScanControl(tHalHandle hHal, v_BOOL_t roamScanControl); -#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 /*-------------------------------------------------------------------------- @@ -2695,22 +2695,22 @@ eHalStatus sme_UpdateEnableFastRoamInConcurrency(tHalHandle hHal, #endif #endif /* FEATURE_WLAN_LFR */ -#ifdef FEATURE_WLAN_CCX +#ifdef FEATURE_WLAN_ESE /*-------------------------------------------------------------------------- - \brief sme_UpdateIsCcxFeatureEnabled() - enable/disable CCX support at runtime + \brief sme_UpdateIsEseFeatureEnabled() - enable/disable ESE support at runtime It is used at in the REG_DYNAMIC_VARIABLE macro definition of - isCcxIniFeatureEnabled. + isEseIniFeatureEnabled. This is a synchronuous call \param hHal - The handle returned by macOpen. - \return eHAL_STATUS_SUCCESS - SME update isCcxIniFeatureEnabled config successfully. - Other status means SME is failed to update isCcxIniFeatureEnabled. + \return eHAL_STATUS_SUCCESS - SME update isEseIniFeatureEnabled config successfully. + Other status means SME is failed to update isEseIniFeatureEnabled. \sa --------------------------------------------------------------------------*/ -eHalStatus sme_UpdateIsCcxFeatureEnabled(tHalHandle hHal, - const v_BOOL_t isCcxIniFeatureEnabled); +eHalStatus sme_UpdateIsEseFeatureEnabled(tHalHandle hHal, + const v_BOOL_t isEseIniFeatureEnabled); -#endif /* FEATURE_WLAN_CCX */ +#endif /* FEATURE_WLAN_ESE */ /*-------------------------------------------------------------------------- \brief sme_UpdateConfigFwRssiMonitoring() - enable/disable firmware RSSI Monitornig at runtime @@ -2989,7 +2989,7 @@ eHalStatus sme_SetRoamBeaconRssiWeight(tHalHandle hHal, v_U8_t sme_GetRoamBeaconRssiWeight(tHalHandle hHal); #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) /*-------------------------------------------------------------------------- \brief sme_getRoamRssiDiff() - get Roam rssi diff This is a synchronuous call @@ -3011,16 +3011,16 @@ v_U8_t sme_getRoamRssiDiff(tHalHandle hHal); eHalStatus sme_ChangeRoamScanChannelList(tHalHandle hHal, tANI_U8 *pChannelList, tANI_U8 numChannels); -#ifdef FEATURE_WLAN_CCX_UPLOAD +#ifdef FEATURE_WLAN_ESE_UPLOAD /*-------------------------------------------------------------------------- - \brief sme_SetCcxRoamScanChannelList() - set ccx roam scan channel list + \brief sme_SetEseRoamScanChannelList() - set ese roam scan channel list This is a synchronuous call \param hHal - The handle returned by macOpen. \return eHAL_STATUS_SUCCESS - SME update config successful. Other status means SME is failed to update \sa --------------------------------------------------------------------------*/ -eHalStatus sme_SetCcxRoamScanChannelList(tHalHandle hHal, +eHalStatus sme_SetEseRoamScanChannelList(tHalHandle hHal, tANI_U8 *pChannelList, tANI_U8 numChannels); #endif @@ -3037,14 +3037,14 @@ eHalStatus sme_getRoamScanChannelList(tHalHandle hHal, tANI_U8 *pChannelList, tANI_U8 *pNumChannels); /*-------------------------------------------------------------------------- - \brief sme_getIsCcxFeatureEnabled() - get CCX feature enabled or not + \brief sme_getIsEseFeatureEnabled() - get ESE feature enabled or not This is a synchronuous call \param hHal - The handle returned by macOpen. - \return TRUE (1) - if the CCX feature is enabled + \return TRUE (1) - if the ESE feature is enabled FALSE (0) - if feature is disabled (compile or runtime) \sa --------------------------------------------------------------------------*/ -tANI_BOOLEAN sme_getIsCcxFeatureEnabled(tHalHandle hHal); +tANI_BOOLEAN sme_getIsEseFeatureEnabled(tHalHandle hHal); /*-------------------------------------------------------------------------- \brief sme_getWESMode() - getWES Mode diff --git a/CORE/SME/src/QoS/sme_Qos.c b/CORE/SME/src/QoS/sme_Qos.c index 82bf97aac2eb..42524402d342 100644 --- a/CORE/SME/src/QoS/sme_Qos.c +++ b/CORE/SME/src/QoS/sme_Qos.c @@ -48,8 +48,8 @@ #include "smsDebug.h" #include "utilsParser.h" #endif -#if defined(FEATURE_WLAN_CCX) && !defined(FEATURE_WLAN_CCX_UPLOAD) -#include <csrCcx.h> +#if defined(FEATURE_WLAN_ESE) && !defined(FEATURE_WLAN_ESE_UPLOAD) +#include <csrEse.h> #endif #ifndef WLAN_MDM_CODE_REDUCTION_OPT @@ -1173,7 +1173,7 @@ eHalStatus sme_QosCsrEventInd(tpAniSirGlobal pMac, case SME_QOS_CSR_PREAUTH_SUCCESS_IND: status = sme_QosProcessPreauthSuccessInd(pMac, sessionId, pEvent_info); break; -#if defined(FEATURE_WLAN_CCX) || defined(FEATURE_WLAN_LFR) +#if defined(FEATURE_WLAN_ESE) || defined(FEATURE_WLAN_LFR) case SME_QOS_CSR_SET_KEY_SUCCESS_IND: status = sme_QosProcessSetKeySuccessInd(pMac, sessionId, pEvent_info); break; @@ -2579,7 +2579,7 @@ sme_QosStatusType sme_QosInternalReleaseReq(tpAniSirGlobal pMac, { // this is the only flow aggregated in this TSPEC status = SME_QOS_STATUS_RELEASE_SUCCESS_RSP; -#if defined(FEATURE_WLAN_CCX) && !defined(FEATURE_WLAN_CCX_UPLOAD) +#if defined(FEATURE_WLAN_ESE) && !defined(FEATURE_WLAN_ESE_UPLOAD) if (ac == SME_QOS_EDCA_AC_VO) { // Indicate to neighbor roam logic of the new required VO @@ -3116,7 +3116,7 @@ sme_QosStatusType sme_QosSetup(tpAniSirGlobal pMac, return status; } -#if defined(FEATURE_WLAN_CCX) || defined(FEATURE_WLAN_LFR) +#if defined(FEATURE_WLAN_ESE) || defined(FEATURE_WLAN_LFR) /* This is a dummy function now. But the purpose of me adding this was to * delay the TSPEC processing till SET_KEY completes. This function can be * used to do any SME_QOS processing after the SET_KEY. As of now, it is @@ -3132,9 +3132,9 @@ eHalStatus sme_QosProcessSetKeySuccessInd(tpAniSirGlobal pMac, v_U8_t sessionId, } #endif -#ifdef FEATURE_WLAN_CCX +#ifdef FEATURE_WLAN_ESE /*-------------------------------------------------------------------------- - \brief sme_QosCCXSaveTspecResponse() - This function saves the TSPEC + \brief sme_QosESESaveTspecResponse() - This function saves the TSPEC parameters that came along in the TSPEC IE in the reassoc response \param pMac - Pointer to the global MAC parameter structure. @@ -3145,7 +3145,7 @@ eHalStatus sme_QosProcessSetKeySuccessInd(tpAniSirGlobal pMac, v_U8_t sessionId, \return eHAL_STATUS_SUCCESS - Release is successful. --------------------------------------------------------------------------*/ -eHalStatus sme_QosCCXSaveTspecResponse(tpAniSirGlobal pMac, v_U8_t sessionId, tDot11fIEWMMTSPEC *pTspec, v_U8_t ac, v_U8_t tspecIndex) +eHalStatus sme_QosESESaveTspecResponse(tpAniSirGlobal pMac, v_U8_t sessionId, tDot11fIEWMMTSPEC *pTspec, v_U8_t ac, v_U8_t tspecIndex) { tpSirAddtsRsp pAddtsRsp = &sme_QosCb.sessionInfo[sessionId].ac_info[ac].addTsRsp[tspecIndex]; @@ -3174,9 +3174,9 @@ eHalStatus sme_QosCCXSaveTspecResponse(tpAniSirGlobal pMac, v_U8_t sessionId, tD } /*-------------------------------------------------------------------------- - \brief sme_QosCCXProcessReassocTspecRsp() - This function processes the + \brief sme_QosESEProcessReassocTspecRsp() - This function processes the WMM TSPEC IE in the reassoc response. Reassoc triggered as part of - CCX roaming to another CCX capable AP. If the TSPEC was added before + ESE roaming to another ESE capable AP. If the TSPEC was added before reassoc, as part of Call Admission Control, the reasso req from the STA would carry the TSPEC parameters which were already negotiated with the older AP. @@ -3187,7 +3187,7 @@ eHalStatus sme_QosCCXSaveTspecResponse(tpAniSirGlobal pMac, v_U8_t sessionId, tD \return eHAL_STATUS_SUCCESS - Release is successful. --------------------------------------------------------------------------*/ -eHalStatus sme_QosCCXProcessReassocTspecRsp(tpAniSirGlobal pMac, v_U8_t sessionId, void* pEvent_info) +eHalStatus sme_QosESEProcessReassocTspecRsp(tpAniSirGlobal pMac, v_U8_t sessionId, void* pEvent_info) { sme_QosSessionInfo *pSession; sme_QosACInfo *pACInfo; @@ -3211,7 +3211,7 @@ eHalStatus sme_QosCCXProcessReassocTspecRsp(tpAniSirGlobal pMac, v_U8_t sessionI tspecIeLen = pCsrConnectedInfo->nTspecIeLength; if (tspecIeLen < sizeof(tDot11fIEWMMTSPEC)) { VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR, - FL("CCX Tspec IE len %d less than min %d"), + FL("ESE Tspec IE len %d less than min %d"), tspecIeLen, sizeof(tDot11fIEWMMTSPEC)); return eHAL_STATUS_FAILURE; } @@ -3233,7 +3233,7 @@ eHalStatus sme_QosCCXProcessReassocTspecRsp(tpAniSirGlobal pMac, v_U8_t sessionI if (tspec_mask_status & (1 << tspec_flow_index)) { VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_WARN, FL("Found Tspec entry flow = %d AC = %d"),tspec_flow_index, ac); - sme_QosCCXSaveTspecResponse(pMac, sessionId, pTspecIE, ac, tspec_flow_index); + sme_QosESESaveTspecResponse(pMac, sessionId, pTspecIE, ac, tspec_flow_index); } else { VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_WARN, FL("Not found Tspec entry flow = %d AC = %d"),tspec_flow_index, ac); @@ -3304,7 +3304,7 @@ static void sme_QosCopyTspecInfo(tpAniSirGlobal pMac, sme_QosWmmTspecInfo *pTspe } /*-------------------------------------------------------------------------- - \brief sme_QosCCxRetrieveTspecInfo() - This function is called by CSR + \brief sme_QosEseRetrieveTspecInfo() - This function is called by CSR when try to create reassoc request message to PE - csrSendSmeReassocReqMsg This functions get the existing tspec parameters to be included in the reassoc request. @@ -3315,7 +3315,7 @@ static void sme_QosCopyTspecInfo(tpAniSirGlobal pMac, sme_QosWmmTspecInfo *pTspe \return v_U8_t - number of existing negotiated TSPECs --------------------------------------------------------------------------*/ -v_U8_t sme_QosCCxRetrieveTspecInfo(tpAniSirGlobal pMac, v_U8_t sessionId, tTspecInfo *pTspecInfo) +v_U8_t sme_QosEseRetrieveTspecInfo(tpAniSirGlobal pMac, v_U8_t sessionId, tTspecInfo *pTspecInfo) { sme_QosSessionInfo *pSession; sme_QosACInfo *pACInfo; @@ -3881,7 +3881,7 @@ eHalStatus sme_QosAddTsReq(tpAniSirGlobal pMac, tSirAddtsReq *pMsg = NULL; sme_QosSessionInfo *pSession; eHalStatus status = eHAL_STATUS_FAILURE; -#ifdef FEATURE_WLAN_CCX +#ifdef FEATURE_WLAN_ESE tCsrRoamSession *pCsrSession = CSR_GET_SESSION( pMac, sessionId ); #endif #ifdef FEATURE_WLAN_DIAG_SUPPORT @@ -3972,8 +3972,8 @@ eHalStatus sme_QosAddTsReq(tpAniSirGlobal pMac, __func__, __LINE__, pTspec_Info->ts_info.up, pTspec_Info->ts_info.tid); -#ifdef FEATURE_WLAN_CCX - if(pCsrSession->connectedProfile.isCCXAssoc) +#ifdef FEATURE_WLAN_ESE + if(pCsrSession->connectedProfile.isESEAssoc) { pMsg->req.tsrsIE.tsid = pTspec_Info->ts_info.up; pMsg->req.tsrsPresent = 1; @@ -4588,13 +4588,13 @@ eHalStatus sme_QosProcessReassocSuccessEv(tpAniSirGlobal pMac, v_U8_t sessionId, status = sme_QosProcessFTReassocRspEv(pMac, sessionId, pEvent_info); } } -#ifdef FEATURE_WLAN_CCX - // If CCX association check for TSPEC IEs in the reassoc rsp frame - if (csrRoamIsCCXAssoc(pMac)) +#ifdef FEATURE_WLAN_ESE + // If ESE association check for TSPEC IEs in the reassoc rsp frame + if (csrRoamIsESEAssoc(pMac)) { if (pCsrRoamSession && pCsrRoamSession->connectedInfo.nTspecIeLength) { - status = sme_QosCCXProcessReassocTspecRsp(pMac, sessionId, pEvent_info); + status = sme_QosESEProcessReassocTspecRsp(pMac, sessionId, pEvent_info); } } #endif @@ -5626,7 +5626,7 @@ eHalStatus sme_QosProcessAddTsSuccessRsp(tpAniSirGlobal pMac, } WLAN_VOS_DIAG_LOG_REPORT(log_ptr); #endif //FEATURE_WLAN_DIAG_SUPPORT -#if defined(FEATURE_WLAN_CCX) && !defined(FEATURE_WLAN_CCX_UPLOAD) +#if defined(FEATURE_WLAN_ESE) && !defined(FEATURE_WLAN_ESE_UPLOAD) if (ac == SME_QOS_EDCA_AC_VO) { // Indicate to neighbor roam logic of the new required VO @@ -5785,7 +5785,7 @@ eHalStatus sme_QosAggregateParams( spec it is less than or equal to inactivity interval This is not provided by app since we currently don't support the HCCA mode of operation - Currently set it to 0 to avoid confusion: Cisco CCX needs ~0; spec + Currently set it to 0 to avoid confusion: Cisco ESE needs ~0; spec requires inactivity interval to be > suspension interval: this could be tricky! -------------------------------------------------------------------------*/ diff --git a/CORE/SME/src/csr/csrApiRoam.c b/CORE/SME/src/csr/csrApiRoam.c index 5d3e757b3d7d..964bf9982f3d 100644 --- a/CORE/SME/src/csr/csrApiRoam.c +++ b/CORE/SME/src/csr/csrApiRoam.c @@ -65,9 +65,9 @@ #ifdef WLAN_FEATURE_NEIGHBOR_ROAMING #include "csrNeighborRoam.h" #endif /* WLAN_FEATURE_NEIGHBOR_ROAMING */ -#if defined(FEATURE_WLAN_CCX) && !defined(FEATURE_WLAN_CCX_UPLOAD) -#include "csrCcx.h" -#endif /* FEATURE_WLAN_CCX && !FEATURE_WLAN_CCX_UPLOAD */ +#if defined(FEATURE_WLAN_ESE) && !defined(FEATURE_WLAN_ESE_UPLOAD) +#include "csrEse.h" +#endif /* FEATURE_WLAN_ESE && !FEATURE_WLAN_ESE_UPLOAD */ #define CSR_NUM_IBSS_START_CHANNELS_50 4 #define CSR_NUM_IBSS_START_CHANNELS_24 3 #define CSR_DEF_IBSS_START_CHANNEL_50 36 @@ -814,17 +814,17 @@ eHalStatus csrRoamCopyConnectProfile(tpAniSirGlobal pMac, tANI_U32 sessionId, tC pProfile->MDID.mobilityDomain = 0; } #endif -#ifdef FEATURE_WLAN_CCX - pProfile->isCCXAssoc = pSession->connectedProfile.isCCXAssoc; - if (csrIsAuthTypeCCX(pSession->connectedProfile.AuthType)) +#ifdef FEATURE_WLAN_ESE + pProfile->isESEAssoc = pSession->connectedProfile.isESEAssoc; + if (csrIsAuthTypeESE(pSession->connectedProfile.AuthType)) { - vos_mem_copy (pProfile->ccxCckmInfo.krk, - pSession->connectedProfile.ccxCckmInfo.krk, + vos_mem_copy (pProfile->eseCckmInfo.krk, + pSession->connectedProfile.eseCckmInfo.krk, CSR_KRK_KEY_LEN); - pProfile->ccxCckmInfo.reassoc_req_num= - pSession->connectedProfile.ccxCckmInfo.reassoc_req_num; - pProfile->ccxCckmInfo.krk_plumbed = - pSession->connectedProfile.ccxCckmInfo.krk_plumbed; + pProfile->eseCckmInfo.reassoc_req_num= + pSession->connectedProfile.eseCckmInfo.reassoc_req_num; + pProfile->eseCckmInfo.krk_plumbed = + pSession->connectedProfile.eseCckmInfo.krk_plumbed; } #endif }while(0); @@ -882,7 +882,7 @@ static eHalStatus csrRoamFreeConnectedInfo( tpAniSirGlobal pMac, tCsrRoamConnect #ifdef WLAN_FEATURE_VOWIFI_11R pConnectedInfo->nRICRspLength = 0; #endif -#ifdef FEATURE_WLAN_CCX +#ifdef FEATURE_WLAN_ESE pConnectedInfo->nTspecIeLength = 0; #endif return ( status ); @@ -1121,7 +1121,7 @@ eCsrBand csrGetCurrentBand(tHalHandle hHal) return pMac->roam.configParam.bandCapability; } -#if defined(FEATURE_WLAN_CCX) && defined(FEATURE_WLAN_CCX_UPLOAD) +#if defined(FEATURE_WLAN_ESE) && defined(FEATURE_WLAN_ESE_UPLOAD) /* This function flushes the roam scan cache */ @@ -1144,9 +1144,9 @@ eHalStatus csrFlushRoamScanRoamChannelList(tpAniSirGlobal pMac) } return status; } -#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) /* This function flushes the roam scan cache */ @@ -1277,7 +1277,7 @@ eHalStatus csrUpdateBgScanConfigIniChannelList(tpAniSirGlobal pMac, } #endif -#if defined(FEATURE_WLAN_CCX) && defined(FEATURE_WLAN_CCX_UPLOAD) +#if defined(FEATURE_WLAN_ESE) && defined(FEATURE_WLAN_ESE_UPLOAD) /* * This function modifies the roam scan channel list as per AP neighbor * report; AP neighbor report may be empty or may include only other AP @@ -1403,7 +1403,7 @@ eHalStatus csrCreateRoamScanChannelList(tpAniSirGlobal pMac, } return status; } -#endif /* FEATURE_WLAN_CCX && FEATURE_WLAN_CCX_UPLOAD */ +#endif /* FEATURE_WLAN_ESE && FEATURE_WLAN_ESE_UPLOAD */ eHalStatus csrSetBand(tHalHandle hHal, eCsrBand eBand) { @@ -1435,7 +1435,7 @@ eHalStatus csrSetBand(tHalHandle hHal, eCsrBand eBand) pMac->roam.configParam.eBand = eBand; pMac->roam.configParam.bandCapability = eBand; csrScanGetSupportedChannels( pMac ); -#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 (!csrRoamIsRoamOffloadScanEnabled(pMac)) csrUpdateBgScanConfigIniChannelList( pMac, eBand ); #endif @@ -1737,7 +1737,7 @@ eHalStatus csrChangeDefaultConfigParam(tpAniSirGlobal pMac, tCsrConfigParam *pPa &pParam->csr11rConfig, sizeof(tCsr11rConfigParams)); smsLog( pMac, LOG1, "IsFTResourceReqSupp = %d", pMac->roam.configParam.csr11rConfig.IsFTResourceReqSupported); #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->roam.configParam.isFastTransitionEnabled = pParam->isFastTransitionEnabled; pMac->roam.configParam.RoamRssiDiff = pParam->RoamRssiDiff; pMac->roam.configParam.nImmediateRoamRssiDiff = pParam->nImmediateRoamRssiDiff; @@ -1758,8 +1758,8 @@ eHalStatus csrChangeDefaultConfigParam(tpAniSirGlobal pMac, tCsrConfigParam *pPa pMac->roam.configParam.MAWCEnabled = pParam->MAWCEnabled; #endif -#ifdef FEATURE_WLAN_CCX - pMac->roam.configParam.isCcxIniFeatureEnabled = pParam->isCcxIniFeatureEnabled; +#ifdef FEATURE_WLAN_ESE + pMac->roam.configParam.isEseIniFeatureEnabled = pParam->isEseIniFeatureEnabled; #endif #ifdef WLAN_FEATURE_NEIGHBOR_ROAMING vos_mem_copy(&pMac->roam.configParam.neighborRoamConfig, @@ -1916,7 +1916,7 @@ eHalStatus csrGetConfigParam(tpAniSirGlobal pMac, tCsrConfigParam *pParam) vos_mem_copy(&pMac->roam.configParam.csr11rConfig, &pParam->csr11rConfig, sizeof(tCsr11rConfigParams)); #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) pParam->isFastTransitionEnabled = pMac->roam.configParam.isFastTransitionEnabled; pParam->RoamRssiDiff = pMac->roam.configParam.RoamRssiDiff; pParam->nImmediateRoamRssiDiff = pMac->roam.configParam.nImmediateRoamRssiDiff; @@ -1934,8 +1934,8 @@ eHalStatus csrGetConfigParam(tpAniSirGlobal pMac, tCsrConfigParam *pParam) pParam->isFastRoamIniFeatureEnabled = pMac->roam.configParam.isFastRoamIniFeatureEnabled; #endif -#ifdef FEATURE_WLAN_CCX - pParam->isCcxIniFeatureEnabled = pMac->roam.configParam.isCcxIniFeatureEnabled; +#ifdef FEATURE_WLAN_ESE + pParam->isEseIniFeatureEnabled = pMac->roam.configParam.isEseIniFeatureEnabled; #endif #ifdef WLAN_FEATURE_NEIGHBOR_ROAMING vos_mem_copy(&pParam->neighborRoamConfig, @@ -5147,12 +5147,12 @@ tANI_BOOLEAN csrRoamIs11rAssoc(tpAniSirGlobal pMac) #endif } #endif -#ifdef FEATURE_WLAN_CCX -//Returns whether the current association is a CCX assoc or not -tANI_BOOLEAN csrRoamIsCCXAssoc(tpAniSirGlobal pMac) +#ifdef FEATURE_WLAN_ESE +//Returns whether the current association is a ESE assoc or not +tANI_BOOLEAN csrRoamIsESEAssoc(tpAniSirGlobal pMac) { #ifdef WLAN_FEATURE_NEIGHBOR_ROAMING - return csrNeighborRoamIsCCXAssoc(pMac); + return csrNeighborRoamIsESEAssoc(pMac); #else return eANI_BOOLEAN_FALSE; #endif @@ -5189,23 +5189,23 @@ tANI_BOOLEAN csrRoamIsFastRoamEnabled(tpAniSirGlobal pMac, tANI_U32 sessionId) } } -#ifdef FEATURE_WLAN_CCX +#ifdef FEATURE_WLAN_ESE /* --------------------------------------------------------------------------- - \fn csrNeighborRoamIsCCXAssoc + \fn csrNeighborRoamIsESEAssoc \brief This function returns whether the current association - is a CCX assoc or not + is a ESE assoc or not \param pMac - The handle returned by macOpen. - \return eANI_BOOLEAN_TRUE if current assoc is CCX, eANI_BOOLEAN_FALSE + \return eANI_BOOLEAN_TRUE if current assoc is ESE, eANI_BOOLEAN_FALSE otherwise ---------------------------------------------------------------------------*/ -tANI_BOOLEAN csrNeighborRoamIsCCXAssoc(tpAniSirGlobal pMac) +tANI_BOOLEAN csrNeighborRoamIsESEAssoc(tpAniSirGlobal pMac) { - return pMac->roam.neighborRoamInfo.isCCXAssoc; + return pMac->roam.neighborRoamInfo.isESEAssoc; } -#endif /* FEATURE_WLAN_CCX */ +#endif /* FEATURE_WLAN_ESE */ #ifdef WLAN_FEATURE_ROAM_SCAN_OFFLOAD //Returns whether "FW based BG scan" is currently enabled...or not @@ -5216,12 +5216,12 @@ tANI_BOOLEAN csrRoamIsRoamOffloadScanEnabled(tpAniSirGlobal pMac) #endif #endif -#if defined(FEATURE_WLAN_CCX) -tANI_BOOLEAN csrRoamIsCcxIniFeatureEnabled(tpAniSirGlobal pMac) +#if defined(FEATURE_WLAN_ESE) +tANI_BOOLEAN csrRoamIsEseIniFeatureEnabled(tpAniSirGlobal pMac) { - return pMac->roam.configParam.isCcxIniFeatureEnabled; + return pMac->roam.configParam.isEseIniFeatureEnabled; } -#endif /*FEATURE_WLAN_CCX*/ +#endif /*FEATURE_WLAN_ESE*/ //Return true means the command can be release, else not static tANI_BOOLEAN csrRoamProcessResults( tpAniSirGlobal pMac, tSmeCmd *pCommand, @@ -5338,8 +5338,8 @@ static tANI_BOOLEAN csrRoamProcessResults( tpAniSirGlobal pMac, tSmeCmd *pComman csrRoamSaveConnectedInfomation(pMac, sessionId, pProfile, pSirBssDesc, pIes); //Save WPA/RSN IE csrRoamSaveSecurityRspIE(pMac, sessionId, pProfile->negotiatedAuthType, pSirBssDesc, pIes); -#ifdef FEATURE_WLAN_CCX - roamInfo.isCCXAssoc = pSession->connectedProfile.isCCXAssoc; +#ifdef FEATURE_WLAN_ESE + roamInfo.isESEAssoc = pSession->connectedProfile.isESEAssoc; #endif // csrRoamStateChange also affects sub-state. Hence, csrRoamStateChange happens first and then @@ -5412,7 +5412,7 @@ static tANI_BOOLEAN csrRoamProcessResults( tpAniSirGlobal pMac, tSmeCmd *pComman #ifdef WLAN_FEATURE_VOWIFI_11R len += pJoinRsp->parsedRicRspLen; #endif /* WLAN_FEATURE_VOWIFI_11R */ -#ifdef FEATURE_WLAN_CCX +#ifdef FEATURE_WLAN_ESE len += pJoinRsp->tspecIeLen; #endif if(len) @@ -5428,7 +5428,7 @@ static tANI_BOOLEAN csrRoamProcessResults( tpAniSirGlobal pMac, tSmeCmd *pComman #ifdef WLAN_FEATURE_VOWIFI_11R pSession->connectedInfo.nRICRspLength = pJoinRsp->parsedRicRspLen; #endif /* WLAN_FEATURE_VOWIFI_11R */ -#ifdef FEATURE_WLAN_CCX +#ifdef FEATURE_WLAN_ESE pSession->connectedInfo.nTspecIeLength = pJoinRsp->tspecIeLen; #endif roamInfo.nAssocReqLength = pJoinRsp->assocReqLength; @@ -7182,9 +7182,9 @@ eHalStatus csrRoamSaveConnectedInfomation(tpAniSirGlobal pMac, tANI_U32 sessionI { status = csrGetParsedBssDescriptionIEs(pMac, pSirBssDesc, &pIesTemp); } -#ifdef FEATURE_WLAN_CCX - if ((csrIsProfileCCX(pProfile) || - ((pIesTemp->CCXVersion.present) +#ifdef FEATURE_WLAN_ESE + if ((csrIsProfileESE(pProfile) || + ((pIesTemp->ESEVersion.present) && ((pProfile->negotiatedAuthType == eCSR_AUTH_TYPE_OPEN_SYSTEM) || (pProfile->negotiatedAuthType == eCSR_AUTH_TYPE_WPA) || (pProfile->negotiatedAuthType == eCSR_AUTH_TYPE_WPA_PSK) @@ -7193,9 +7193,9 @@ eHalStatus csrRoamSaveConnectedInfomation(tpAniSirGlobal pMac, tANI_U32 sessionI || (pProfile->negotiatedAuthType == eCSR_AUTH_TYPE_RSN_PSK_SHA256) #endif || (pProfile->negotiatedAuthType == eCSR_AUTH_TYPE_RSN_PSK)))) - && (pMac->roam.configParam.isCcxIniFeatureEnabled)) + && (pMac->roam.configParam.isEseIniFeatureEnabled)) { - pConnectProfile->isCCXAssoc = 1; + pConnectProfile->isESEAssoc = 1; } #endif //save ssid @@ -7685,7 +7685,7 @@ static void csrRoamingStateConfigCnfProcessor( tpAniSirGlobal pMac, tANI_U32 res /* We need to come with other way to figure out that this is because of HO in BMP The below API will be only available for Android as it uses a different HO algorithm */ - /* Reassoc request will be used only for CCX and 11r handoff whereas other legacy roaming should + /* Reassoc request will be used only for ESE and 11r handoff whereas other legacy roaming should * use join request */ #ifdef WLAN_FEATURE_VOWIFI_11R if (csrRoamIsHandoffInProgress(pMac) && @@ -7696,9 +7696,9 @@ static void csrRoamingStateConfigCnfProcessor( tpAniSirGlobal pMac, tANI_U32 res } else #endif -#ifdef FEATURE_WLAN_CCX +#ifdef FEATURE_WLAN_ESE if (csrRoamIsHandoffInProgress(pMac) && - csrRoamIsCCXAssoc(pMac)) + csrRoamIsESEAssoc(pMac)) { // Now serialize the reassoc command. status = csrRoamIssueReassociateCmd(pMac, sessionId); @@ -8382,9 +8382,9 @@ static eHalStatus csrRoamIssueSetKeyCommand( tpAniSirGlobal pMac, tANI_U32 sessi { eHalStatus status = eHAL_STATUS_INVALID_PARAMETER; tSmeCmd *pCommand = NULL; -#ifdef FEATURE_WLAN_CCX +#ifdef FEATURE_WLAN_ESE tCsrRoamSession *pSession = CSR_GET_SESSION( pMac, sessionId ); -#endif /* FEATURE_WLAN_CCX */ +#endif /* FEATURE_WLAN_ESE */ do { @@ -8468,7 +8468,7 @@ static eHalStatus csrRoamIssueSetKeyCommand( tpAniSirGlobal pMac, tANI_U32 sessi CSR_WAPI_KEY_LEN); } #endif /* FEATURE_WLAN_WAPI */ -#ifdef FEATURE_WLAN_CCX +#ifdef FEATURE_WLAN_ESE else if ( eCSR_ENCRYPT_TYPE_KRK == pSetKey->encType ) { if ( pSetKey->keyLength < CSR_KRK_KEY_LEN ) @@ -8476,14 +8476,14 @@ static eHalStatus csrRoamIssueSetKeyCommand( tpAniSirGlobal pMac, tANI_U32 sessi smsLog( pMac, LOGW, "Invalid KRK keylength [= %d] in SetContext call", pSetKey->keyLength ); break; } - vos_mem_copy(pSession->ccxCckmInfo.krk, pSetKey->Key, + vos_mem_copy(pSession->eseCckmInfo.krk, pSetKey->Key, CSR_KRK_KEY_LEN); - pSession->ccxCckmInfo.reassoc_req_num=1; - pSession->ccxCckmInfo.krk_plumbed = eANI_BOOLEAN_TRUE; + pSession->eseCckmInfo.reassoc_req_num=1; + pSession->eseCckmInfo.krk_plumbed = eANI_BOOLEAN_TRUE; status = eHAL_STATUS_SUCCESS; break; } -#endif /* FEATURE_WLAN_CCX */ +#endif /* FEATURE_WLAN_ESE */ #ifdef WLAN_FEATURE_11W //Check for 11w BIP @@ -8516,12 +8516,12 @@ static eHalStatus csrRoamIssueSetKeyCommand( tpAniSirGlobal pMac, tANI_U32 sessi } } while (0); // Free the command if there has been a failure, or it is a - // "local" operation like the set CCX CCKM KRK key. + // "local" operation like the set ESE CCKM KRK key. if ( ( NULL != pCommand ) && ( (!HAL_STATUS_SUCCESS( status ) ) -#ifdef FEATURE_WLAN_CCX +#ifdef FEATURE_WLAN_ESE || ( eCSR_ENCRYPT_TYPE_KRK == pSetKey->encType ) -#endif /* FEATURE_WLAN_CCX */ +#endif /* FEATURE_WLAN_ESE */ ) ) { csrReleaseCommandSetKey( pMac, pCommand ); @@ -9040,7 +9040,7 @@ static void csrUpdateSnr(tpAniSirGlobal pMac, void* pMsg) } return; } -#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 csrRoamRssiRspProcessor(tpAniSirGlobal pMac, void* pMsg) { tAniGetRoamRssiRsp* pRoamRssiRsp = (tAniGetRoamRssiRsp*)pMsg; @@ -9077,7 +9077,7 @@ void csrRoamRssiRspProcessor(tpAniSirGlobal pMac, void* pMsg) } #endif -#if defined(FEATURE_WLAN_CCX) && defined(FEATURE_WLAN_CCX_UPLOAD) +#if defined(FEATURE_WLAN_ESE) && defined(FEATURE_WLAN_ESE_UPLOAD) void csrTsmStatsRspProcessor(tpAniSirGlobal pMac, void* pMsg) { tAniGetTsmStatsRsp* pTsmStatsRsp = (tAniGetTsmStatsRsp*)pMsg; @@ -9120,7 +9120,7 @@ void csrTsmStatsRspProcessor(tpAniSirGlobal pMac, void* pMsg) return; } -void csrSendCcxAdjacentApRepInd(tpAniSirGlobal pMac, tCsrRoamSession *pSession) +void csrSendEseAdjacentApRepInd(tpAniSirGlobal pMac, tCsrRoamSession *pSession) { tANI_U32 roamTS2 = 0; tCsrRoamInfo roamInfo; @@ -9148,13 +9148,13 @@ void csrSendCcxAdjacentApRepInd(tpAniSirGlobal pMac, tCsrRoamSession *pSession) return; } - pSessionEntry->ccxContext.tsm.tsmMetrics.RoamingDly + pSessionEntry->eseContext.tsm.tsmMetrics.RoamingDly = roamInfo.tsmRoamDelay; csrRoamCallCallback(pMac, pSession->sessionId, &roamInfo, - 0, eCSR_ROAM_CCX_ADJ_AP_REPORT_IND, 0); + 0, eCSR_ROAM_ESE_ADJ_AP_REPORT_IND, 0); } -#endif /* FEATURE_WLAN_CCX && FEATURE_WLAN_CCX_UPLOAD */ +#endif /* FEATURE_WLAN_ESE && FEATURE_WLAN_ESE_UPLOAD */ static void csrRoamRssiIndHdlr(tpAniSirGlobal pMac, void* pMsg) { @@ -9329,15 +9329,15 @@ void csrRoamCheckForLinkStatusChange( tpAniSirGlobal pMac, tSirSmeRsp *pSirMsg ) // If we are in neighbor preauth done state then on receiving // disassoc or deauth we dont roam instead we just disassoc // from current ap and then go to disconnected state - // This happens for CCX and 11r FT connections ONLY. + // This happens for ESE and 11r FT connections ONLY. #ifdef WLAN_FEATURE_VOWIFI_11R if (csrRoamIs11rAssoc(pMac) && (csrNeighborRoamStatePreauthDone(pMac))) { csrNeighborRoamTranistionPreauthDoneToDisconnected(pMac); } #endif -#ifdef FEATURE_WLAN_CCX - if (csrRoamIsCCXAssoc(pMac) && (csrNeighborRoamStatePreauthDone(pMac))) +#ifdef FEATURE_WLAN_ESE + if (csrRoamIsESEAssoc(pMac) && (csrNeighborRoamStatePreauthDone(pMac))) { csrNeighborRoamTranistionPreauthDoneToDisconnected(pMac); } @@ -9410,15 +9410,15 @@ void csrRoamCheckForLinkStatusChange( tpAniSirGlobal pMac, tSirSmeRsp *pSirMsg ) // If we are in neighbor preauth done state then on receiving // disassoc or deauth we dont roam instead we just disassoc // from current ap and then go to disconnected state - // This happens for CCX and 11r FT connections ONLY. + // This happens for ESE and 11r FT connections ONLY. #ifdef WLAN_FEATURE_VOWIFI_11R if (csrRoamIs11rAssoc(pMac) && (csrNeighborRoamStatePreauthDone(pMac))) { csrNeighborRoamTranistionPreauthDoneToDisconnected(pMac); } #endif -#ifdef FEATURE_WLAN_CCX - if (csrRoamIsCCXAssoc(pMac) && (csrNeighborRoamStatePreauthDone(pMac))) +#ifdef FEATURE_WLAN_ESE + if (csrRoamIsESEAssoc(pMac) && (csrNeighborRoamStatePreauthDone(pMac))) { csrNeighborRoamTranistionPreauthDoneToDisconnected(pMac); } @@ -9997,16 +9997,16 @@ void csrRoamCheckForLinkStatusChange( tpAniSirGlobal pMac, tSirSmeRsp *pSirMsg ) // Indicate SME_QOS that the SET_KEY is completed, so that SME_QOS // can go ahead and initiate the TSPEC if any are pending sme_QosCsrEventInd(pMac, (v_U8_t)sessionId, SME_QOS_CSR_SET_KEY_SUCCESS_IND, NULL); -#ifdef FEATURE_WLAN_CCX +#ifdef FEATURE_WLAN_ESE //Send Adjacent AP repot to new AP. if (result == eCSR_ROAM_RESULT_AUTHENTICATED && pSession->isPrevApInfoValid && - pSession->connectedProfile.isCCXAssoc) + pSession->connectedProfile.isESEAssoc) { -#ifdef FEATURE_WLAN_CCX_UPLOAD - csrSendCcxAdjacentApRepInd(pMac, pSession); +#ifdef FEATURE_WLAN_ESE_UPLOAD + csrSendEseAdjacentApRepInd(pMac, pSession); #else - csrCcxSendAdjacentApRepMsg(pMac, pSession); + csrEseSendAdjacentApRepMsg(pMac, pSession); #endif pSession->isPrevApInfoValid = FALSE; } @@ -10103,18 +10103,18 @@ void csrRoamCheckForLinkStatusChange( tpAniSirGlobal pMac, tSirSmeRsp *pSirMsg ) smsLog( pMac, LOG2, FL("Stats rsp from PE")); csrRoamStatsRspProcessor( pMac, pSirMsg ); 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_RSP: smsLog( pMac, LOG2, FL("Stats rsp from PE")); csrRoamRssiRspProcessor( pMac, pSirMsg ); 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_RSP: smsLog( pMac, LOG2, FL("TSM Stats rsp from PE")); csrTsmStatsRspProcessor( pMac, pSirMsg ); break; -#endif /* FEATURE_WLAN_CCX && FEATURE_WLAN_CCX_UPLOAD */ +#endif /* FEATURE_WLAN_ESE && FEATURE_WLAN_ESE_UPLOAD */ case eWNI_SME_GET_RSSI_REQ: smsLog( pMac, LOG2, FL("GetRssiReq from self")); csrUpdateRssi( pMac, pSirMsg ); @@ -12716,7 +12716,7 @@ eHalStatus csrSendJoinReqMsg( tpAniSirGlobal pMac, tANI_U32 sessionId, tSirBssDe *(pBuf + 1) = 0; pBuf += 2; } -#ifdef FEATURE_WLAN_CCX +#ifdef FEATURE_WLAN_ESE if( eWNI_SME_JOIN_REQ == messageType ) { // Never include the cckmIE in an Join Request @@ -12728,22 +12728,22 @@ eHalStatus csrSendJoinReqMsg( tpAniSirGlobal pMac, tANI_U32 sessionId, tSirBssDe else if(eWNI_SME_REASSOC_REQ == messageType ) { // cckmIE - if( csrIsProfileCCX( pProfile ) ) + if( csrIsProfileESE( pProfile ) ) { // Insert the CCKM IE into the join request -#ifdef FEATURE_WLAN_CCX_UPLOAD +#ifdef FEATURE_WLAN_ESE_UPLOAD ieLen = pSession->suppCckmIeInfo.cckmIeLen; vos_mem_copy((void *) (wpaRsnIE), pSession->suppCckmIeInfo.cckmIe, ieLen); #else - ieLen = csrConstructCcxCckmIe( pMac, + ieLen = csrConstructEseCckmIe( pMac, pSession, pProfile, pBssDescription, pSession->pWpaRsnReqIE, pSession->nWpaRsnReqIeLength, (void *)( wpaRsnIE ) ); -#endif /* FEATURE_WLAN_CCX_UPLOAD */ +#endif /* FEATURE_WLAN_ESE_UPLOAD */ } else { @@ -12768,7 +12768,7 @@ eHalStatus csrSendJoinReqMsg( tpAniSirGlobal pMac, tANI_U32 sessionId, tSirBssDe pBuf += 2; } } -#endif /* FEATURE_WLAN_CCX */ +#endif /* FEATURE_WLAN_ESE */ // addIEScan if(pProfile->nAddIEScanLength && pProfile->pAddIEScan) { @@ -12887,9 +12887,9 @@ eHalStatus csrSendJoinReqMsg( tpAniSirGlobal pMac, tANI_U32 sessionId, tSirBssDe #ifdef WLAN_FEATURE_VOWIFI_11R pProfile->MDID.mdiePresent = pBssDescription->mdiePresent; if (csrIsProfile11r( pProfile ) -#ifdef FEATURE_WLAN_CCX +#ifdef FEATURE_WLAN_ESE && !((pProfile->negotiatedAuthType == eCSR_AUTH_TYPE_OPEN_SYSTEM) && - (pIes->CCXVersion.present) && (pMac->roam.configParam.isCcxIniFeatureEnabled)) + (pIes->ESEVersion.present) && (pMac->roam.configParam.isEseIniFeatureEnabled)) #endif ) { @@ -12906,10 +12906,10 @@ eHalStatus csrSendJoinReqMsg( tpAniSirGlobal pMac, tANI_U32 sessionId, tSirBssDe pBuf += sizeof(tAniBool); } #endif -#ifdef FEATURE_WLAN_CCX +#ifdef FEATURE_WLAN_ESE - // isCCXFeatureIniEnabled - if (TRUE == pMac->roam.configParam.isCcxIniFeatureEnabled) + // isESEFeatureIniEnabled + if (TRUE == pMac->roam.configParam.isEseIniFeatureEnabled) { dwTmp = pal_cpu_to_be32(TRUE); vos_mem_copy(pBuf, &dwTmp, sizeof(tAniBool)); @@ -12922,14 +12922,14 @@ eHalStatus csrSendJoinReqMsg( tpAniSirGlobal pMac, tANI_U32 sessionId, tSirBssDe pBuf += sizeof(tAniBool); } - /* A profile can not be both CCX and 11R. But an 802.11R AP - * may be advertising support for CCX as well. So if we are - * associating Open or explicitly CCX then we will get CCX. + /* A profile can not be both ESE and 11R. But an 802.11R AP + * may be advertising support for ESE as well. So if we are + * associating Open or explicitly ESE then we will get ESE. * If we are associating explictly 11R only then we will get * 11R. */ - if ((csrIsProfileCCX(pProfile) || - ((pIes->CCXVersion.present) + if ((csrIsProfileESE(pProfile) || + ((pIes->ESEVersion.present) && ((pProfile->negotiatedAuthType == eCSR_AUTH_TYPE_OPEN_SYSTEM) || (pProfile->negotiatedAuthType == eCSR_AUTH_TYPE_WPA) || (pProfile->negotiatedAuthType == eCSR_AUTH_TYPE_WPA_PSK) @@ -12938,16 +12938,16 @@ eHalStatus csrSendJoinReqMsg( tpAniSirGlobal pMac, tANI_U32 sessionId, tSirBssDe || (pProfile->negotiatedAuthType == eCSR_AUTH_TYPE_RSN_PSK_SHA256) #endif || (pProfile->negotiatedAuthType == eCSR_AUTH_TYPE_RSN_PSK)))) - && (pMac->roam.configParam.isCcxIniFeatureEnabled)) + && (pMac->roam.configParam.isEseIniFeatureEnabled)) { - // isCCXconnection; + // isESEconnection; dwTmp = pal_cpu_to_be32(TRUE); vos_mem_copy(pBuf, &dwTmp, sizeof(tAniBool)); pBuf += sizeof(tAniBool); } else { - //isCCXconnection; + //isESEconnection; dwTmp = pal_cpu_to_be32(FALSE); vos_mem_copy(pBuf, &dwTmp, sizeof(tAniBool)); pBuf += sizeof(tAniBool); @@ -12955,17 +12955,17 @@ eHalStatus csrSendJoinReqMsg( tpAniSirGlobal pMac, tANI_U32 sessionId, tSirBssDe if (eWNI_SME_JOIN_REQ == messageType) { - tCCXTspecInfo ccxTspec; - // CCX-Tspec IEs in the ASSOC request is presently not supported + tESETspecInfo eseTspec; + // ESE-Tspec IEs in the ASSOC request is presently not supported // so nullify the TSPEC parameters - vos_mem_set(&ccxTspec, sizeof(tCCXTspecInfo), 0); - vos_mem_copy(pBuf, &ccxTspec, sizeof(tCCXTspecInfo)); - pBuf += sizeof(tCCXTspecInfo); + vos_mem_set(&eseTspec, sizeof(tESETspecInfo), 0); + vos_mem_copy(pBuf, &eseTspec, sizeof(tESETspecInfo)); + pBuf += sizeof(tESETspecInfo); } else if (eWNI_SME_REASSOC_REQ == messageType) { - if ((csrIsProfileCCX(pProfile) || - ((pIes->CCXVersion.present) + if ((csrIsProfileESE(pProfile) || + ((pIes->ESEVersion.present) && ((pProfile->negotiatedAuthType == eCSR_AUTH_TYPE_OPEN_SYSTEM) || (pProfile->negotiatedAuthType == eCSR_AUTH_TYPE_WPA) || (pProfile->negotiatedAuthType == eCSR_AUTH_TYPE_WPA_PSK) @@ -12974,33 +12974,33 @@ eHalStatus csrSendJoinReqMsg( tpAniSirGlobal pMac, tANI_U32 sessionId, tSirBssDe || (pProfile->negotiatedAuthType == eCSR_AUTH_TYPE_RSN_PSK_SHA256) #endif || (pProfile->negotiatedAuthType == eCSR_AUTH_TYPE_RSN_PSK)))) - && (pMac->roam.configParam.isCcxIniFeatureEnabled)) + && (pMac->roam.configParam.isEseIniFeatureEnabled)) { - tCCXTspecInfo ccxTspec; - // CCX Tspec information - vos_mem_set(&ccxTspec, sizeof(tCCXTspecInfo), 0); - ccxTspec.numTspecs = sme_QosCCxRetrieveTspecInfo(pMac, sessionId, (tTspecInfo *) &ccxTspec.tspec[0]); - *pBuf = ccxTspec.numTspecs; + tESETspecInfo eseTspec; + // ESE Tspec information + vos_mem_set(&eseTspec, sizeof(tESETspecInfo), 0); + eseTspec.numTspecs = sme_QosEseRetrieveTspecInfo(pMac, sessionId, (tTspecInfo *) &eseTspec.tspec[0]); + *pBuf = eseTspec.numTspecs; pBuf += sizeof(tANI_U8); // Copy the TSPEC information only if present - if (ccxTspec.numTspecs) { - vos_mem_copy(pBuf, (void*)&ccxTspec.tspec[0], - (ccxTspec.numTspecs*sizeof(tTspecInfo))); + if (eseTspec.numTspecs) { + vos_mem_copy(pBuf, (void*)&eseTspec.tspec[0], + (eseTspec.numTspecs*sizeof(tTspecInfo))); } - pBuf += sizeof(ccxTspec.tspec); + pBuf += sizeof(eseTspec.tspec); } else { - tCCXTspecInfo ccxTspec; - // CCX-Tspec IEs in the ASSOC request is presently not supported + tESETspecInfo eseTspec; + // ESE-Tspec IEs in the ASSOC request is presently not supported // so nullify the TSPEC parameters - vos_mem_set(&ccxTspec, sizeof(tCCXTspecInfo), 0); - vos_mem_copy(pBuf, &ccxTspec, sizeof(tCCXTspecInfo)); - pBuf += sizeof(tCCXTspecInfo); + vos_mem_set(&eseTspec, sizeof(tESETspecInfo), 0); + vos_mem_copy(pBuf, &eseTspec, sizeof(tESETspecInfo)); + pBuf += sizeof(tESETspecInfo); } } -#endif // FEATURE_WLAN_CCX -#if defined WLAN_FEATURE_VOWIFI_11R || defined FEATURE_WLAN_CCX || defined(FEATURE_WLAN_LFR) +#endif // FEATURE_WLAN_ESE +#if defined WLAN_FEATURE_VOWIFI_11R || defined FEATURE_WLAN_ESE || defined(FEATURE_WLAN_LFR) // Fill in isFastTransitionEnabled if (pMac->roam.configParam.isFastTransitionEnabled #ifdef FEATURE_WLAN_LFR @@ -15273,7 +15273,7 @@ eHalStatus csrGetSnr(tpAniSirGlobal pMac, return 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) eHalStatus csrGetRoamRssi(tpAniSirGlobal pMac, tCsrRssiCallback callback, tANI_U8 staId, tCsrBssid bssId, void *pContext, void* pVosContext) @@ -15305,7 +15305,7 @@ eHalStatus csrGetRoamRssi(tpAniSirGlobal pMac, } #endif -#if defined(FEATURE_WLAN_CCX) && defined(FEATURE_WLAN_CCX_UPLOAD) +#if defined(FEATURE_WLAN_ESE) && defined(FEATURE_WLAN_ESE_UPLOAD) eHalStatus csrGetTsmStats(tpAniSirGlobal pMac, tCsrTsmStatsCallback callback, tANI_U8 staId, @@ -15340,7 +15340,7 @@ eHalStatus csrGetTsmStats(tpAniSirGlobal pMac, } return status; } -#endif /* FEATURE_WLAN_CCX && FEATURE_WLAN_CCX_UPLOAD */ +#endif /* FEATURE_WLAN_ESE && FEATURE_WLAN_ESE_UPLOAD */ /* --------------------------------------------------------------------------- \fn csrGetTLSTAState @@ -15880,16 +15880,16 @@ eHalStatus csrRoamOffloadScan(tpAniSirGlobal pMac, tANI_U8 command, tANI_U8 reas /* MAWC feature */ pRequestBuf->MAWCEnabled = pMac->roam.configParam.MAWCEnabled; -#ifdef FEATURE_WLAN_CCX - pRequestBuf->IsCCXEnabled = pMac->roam.configParam.isCcxIniFeatureEnabled; +#ifdef FEATURE_WLAN_ESE + pRequestBuf->IsESEEnabled = pMac->roam.configParam.isEseIniFeatureEnabled; #endif if ( -#ifdef FEATURE_WLAN_CCX - ((pNeighborRoamInfo->isCCXAssoc) && +#ifdef FEATURE_WLAN_ESE + ((pNeighborRoamInfo->isESEAssoc) && (pNeighborRoamInfo->roamChannelInfo.IAPPNeighborListReceived == eANI_BOOLEAN_FALSE)) || - (pNeighborRoamInfo->isCCXAssoc == eANI_BOOLEAN_FALSE) || -#endif // CCX + (pNeighborRoamInfo->isESEAssoc == eANI_BOOLEAN_FALSE) || +#endif // ESE currChannelListInfo->numOfChannels == 0) { @@ -15953,12 +15953,12 @@ eHalStatus csrRoamOffloadScan(tpAniSirGlobal pMac, tANI_U8 command, tANI_U8 reas } } } -#ifdef FEATURE_WLAN_CCX +#ifdef FEATURE_WLAN_ESE else { - /* If CCX is enabled, and a neighbor Report is received,then + /* If ESE is enabled, and a neighbor Report is received,then * Ignore the INI Channels or the Occupied Channel List. Consider - * the channels in the neighbor list sent by the CCX AP.*/ + * the channels in the neighbor list sent by the ESE AP.*/ if (currChannelListInfo->numOfChannels != 0) { ChannelList = currChannelListInfo->ChannelList; @@ -17030,7 +17030,7 @@ void csrRoamFTPreAuthRspProcessor( tHalHandle hHal, tpSirFTPreAuthRsp pFTPreAuth { tpAniSirGlobal pMac = PMAC_STRUCT( hHal ); eHalStatus status = eHAL_STATUS_SUCCESS; -#if defined(FEATURE_WLAN_LFR) || defined(FEATURE_WLAN_CCX) || defined(FEATURE_WLAN_CCX_UPLOAD) +#if defined(FEATURE_WLAN_LFR) || defined(FEATURE_WLAN_ESE) || defined(FEATURE_WLAN_ESE_UPLOAD) tCsrRoamInfo roamInfo; #endif @@ -17075,8 +17075,8 @@ void csrRoamFTPreAuthRspProcessor( tHalHandle hHal, tpSirFTPreAuthRsp pFTPreAuth csrRoamCallCallback(pMac, pFTPreAuthRsp->smeSessionId, NULL, 0, eCSR_ROAM_FT_RESPONSE, eCSR_ROAM_RESULT_NONE); -#if defined(FEATURE_WLAN_CCX) && defined(FEATURE_WLAN_CCX_UPLOAD) - if (csrRoamIsCCXAssoc(pMac)) +#if defined(FEATURE_WLAN_ESE) && defined(FEATURE_WLAN_ESE_UPLOAD) + if (csrRoamIsESEAssoc(pMac)) { /* read TSF */ csrRoamReadTSF(pMac, (tANI_U8 *)roamInfo.timestamp); @@ -17086,7 +17086,7 @@ void csrRoamFTPreAuthRspProcessor( tHalHandle hHal, tpSirFTPreAuthRsp pFTPreAuth csrRoamCallCallback(pMac, pFTPreAuthRsp->smeSessionId, &roamInfo, 0, eCSR_ROAM_CCKM_PREAUTH_NOTIFY, 0); } -#endif /* FEATURE_WLAN_CCX && FEATURE_WLAN_CCX_UPLOAD */ +#endif /* FEATURE_WLAN_ESE && FEATURE_WLAN_ESE_UPLOAD */ #ifdef FEATURE_WLAN_LFR // If Legacy Fast Roaming is enabled, signal the supplicant @@ -17319,7 +17319,7 @@ eHalStatus csrHandoffRequest(tpAniSirGlobal pMac, } #endif /* WLAN_FEATURE_ROAM_SCAN_OFFLOAD */ -#if defined(FEATURE_WLAN_CCX) && defined(FEATURE_WLAN_CCX_UPLOAD) +#if defined(FEATURE_WLAN_ESE) && defined(FEATURE_WLAN_ESE_UPLOAD) /* --------------------------------------------------------------------------- \fn csrSetCCKMIe \brief This function stores the CCKM IE passed by the supplicant @@ -17377,7 +17377,7 @@ VOS_STATUS csrRoamReadTSF(tpAniSirGlobal pMac, tANI_U8 *pTimestamp) sizeof (tANI_U32) * 2); return status; } -#endif /*FEATURE_WLAN_CCX && FEATURE_WLAN_CCX_UPLOAD */ +#endif /*FEATURE_WLAN_ESE && FEATURE_WLAN_ESE_UPLOAD */ /* * Post Channel Change Request to LIM diff --git a/CORE/SME/src/csr/csrApiScan.c b/CORE/SME/src/csr/csrApiScan.c index 51ae60eb9c12..49d70c978e7f 100644 --- a/CORE/SME/src/csr/csrApiScan.c +++ b/CORE/SME/src/csr/csrApiScan.c @@ -1932,7 +1932,7 @@ static tANI_U32 csrGetBssPreferValue(tpAniSirGlobal pMac, int rssi) static tANI_U32 csrGetBssCapValue(tpAniSirGlobal pMac, tSirBssDescription *pBssDesc, tDot11fBeaconIEs *pIes) { tANI_U32 ret = CSR_BSS_CAP_VALUE_NONE; -#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(CSR_IS_ROAM_PREFER_5GHZ(pMac)) { if((pBssDesc) && CSR_IS_CHANNEL_5GHZ(pBssDesc->channelId)) @@ -8315,7 +8315,7 @@ eHalStatus csrScanCreateEntryInScanCache(tpAniSirGlobal pMac, tANI_U32 sessionId return status; } -#ifdef FEATURE_WLAN_CCX +#ifdef FEATURE_WLAN_ESE // Update the TSF with the difference in system time void UpdateCCKMTSF(tANI_U32 *timeStamp0, tANI_U32 *timeStamp1, tANI_U32 *incr) { diff --git a/CORE/SME/src/csr/csrInsideApi.h b/CORE/SME/src/csr/csrInsideApi.h index f325807519f2..4d285cf9bb6c 100644 --- a/CORE/SME/src/csr/csrInsideApi.h +++ b/CORE/SME/src/csr/csrInsideApi.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011-2013 The Linux Foundation. All rights reserved. + * Copyright (c) 2011-2014 The Linux Foundation. All rights reserved. * * Previously licensed under the ISC license by Qualcomm Atheros, Inc. * @@ -99,7 +99,7 @@ #define CSR_BSS_CAP_VALUE_HT 2 #define CSR_BSS_CAP_VALUE_WMM 1 #define CSR_BSS_CAP_VALUE_UAPSD 1 -#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 CSR_BSS_CAP_VALUE_5GHZ 1 #endif #define CSR_DEFAULT_ROAMING_TIME 10 //10 seconds @@ -950,11 +950,11 @@ eHalStatus csrRoamStopJoinRetryTimer(tpAniSirGlobal pMac, tANI_U32 sessionId); void csrRoamFTPreAuthRspProcessor( tHalHandle hHal, tpSirFTPreAuthRsp pFTPreAuthRsp ); #endif -#if defined(FEATURE_WLAN_CCX) && !defined(FEATURE_WLAN_CCX_UPLOAD) -void csrCcxSendAdjacentApRepMsg(tpAniSirGlobal pMac, tCsrRoamSession *pSession); +#if defined(FEATURE_WLAN_ESE) && !defined(FEATURE_WLAN_ESE_UPLOAD) +void csrEseSendAdjacentApRepMsg(tpAniSirGlobal pMac, tCsrRoamSession *pSession); #endif -#if defined(FEATURE_WLAN_CCX) +#if defined(FEATURE_WLAN_ESE) void UpdateCCKMTSF(tANI_U32 *timeStamp0, tANI_U32 *timeStamp1, tANI_U32 *incr); #endif diff --git a/CORE/SME/src/csr/csrNeighborRoam.c b/CORE/SME/src/csr/csrNeighborRoam.c index 2ca85d954572..80885c356686 100644 --- a/CORE/SME/src/csr/csrNeighborRoam.c +++ b/CORE/SME/src/csr/csrNeighborRoam.c @@ -65,8 +65,8 @@ #include "wlan_qct_tl.h" #include "sme_Api.h" #include "csrNeighborRoam.h" -#if defined(FEATURE_WLAN_CCX) && !defined(FEATURE_WLAN_CCX_UPLOAD) -#include "csrCcx.h" +#if defined(FEATURE_WLAN_ESE) && !defined(FEATURE_WLAN_ESE_UPLOAD) +#include "csrEse.h" #endif #define WLAN_FEATURE_NEIGHBOR_ROAMING_DEBUG 1 @@ -277,8 +277,8 @@ static void csrNeighborRoamTriggerHandoff(tpAniSirGlobal pMac, else #endif -#ifdef FEATURE_WLAN_CCX - if ((pNeighborRoamInfo->isCCXAssoc) +#ifdef FEATURE_WLAN_ESE + if ((pNeighborRoamInfo->isESEAssoc) #ifdef WLAN_FEATURE_ROAM_SCAN_OFFLOAD && !csrRoamIsRoamOffloadScanEnabled(pMac) #endif @@ -290,7 +290,7 @@ static void csrNeighborRoamTriggerHandoff(tpAniSirGlobal pMac, } else { - smsLog(pMac, LOGE, FL("CCX Reassoc indication received in unexpected state %d"), pNeighborRoamInfo->neighborRoamState); + smsLog(pMac, LOGE, FL("ESE Reassoc indication received in unexpected state %d"), pNeighborRoamInfo->neighborRoamState); VOS_ASSERT(0); } } @@ -393,15 +393,15 @@ VOS_STATUS csrNeighborRoamUpdateFastRoamingEnabled(tpAniSirGlobal pMac, const v_ return vosStatus; } -#ifdef FEATURE_WLAN_CCX -VOS_STATUS csrNeighborRoamUpdateCcxModeEnabled(tpAniSirGlobal pMac, const v_BOOL_t ccxMode) +#ifdef FEATURE_WLAN_ESE +VOS_STATUS csrNeighborRoamUpdateEseModeEnabled(tpAniSirGlobal pMac, const v_BOOL_t eseMode) { tpCsrNeighborRoamControlInfo pNeighborRoamInfo = &pMac->roam.neighborRoamInfo; VOS_STATUS vosStatus = VOS_STATUS_SUCCESS; if (eCSR_NEIGHBOR_ROAM_STATE_CONNECTED == pNeighborRoamInfo->neighborRoamState) { - if (VOS_TRUE == ccxMode) + if (VOS_TRUE == eseMode) { NEIGHBOR_ROAM_DEBUG(pMac, LOG2, FL("Registering neighbor lookup DOWN event with TL, RSSI = %d"), pNeighborRoamInfo->currentNeighborLookupThreshold); @@ -426,7 +426,7 @@ VOS_STATUS csrNeighborRoamUpdateCcxModeEnabled(tpAniSirGlobal pMac, const v_BOOL } #endif } - else if (VOS_FALSE == ccxMode) + else if (VOS_FALSE == eseMode) { NEIGHBOR_ROAM_DEBUG(pMac, LOG2, FL("Currently in CONNECTED state, so deregister all events")); /* De-register existing lookup UP/DOWN, Rssi indications */ @@ -891,7 +891,7 @@ static void csrNeighborRoamResetPreauthControlInfo(tpAniSirGlobal pMac) { tpCsrNeighborRoamControlInfo pNeighborRoamInfo = &pMac->roam.neighborRoamInfo; -#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) pNeighborRoamInfo->is11rAssoc = eANI_BOOLEAN_FALSE; /* Purge pre-auth fail list */ csrNeighborRoamPurgePreauthFailedList(pMac); @@ -1038,8 +1038,8 @@ void csrNeighborRoamResetReportScanStateControlInfo(tpAniSirGlobal pMac) vos_mem_set(pNeighborRoamInfo->currAPbssid, sizeof(tCsrBssid), 0); pNeighborRoamInfo->neighborScanTimerInfo.pMac = pMac; pNeighborRoamInfo->neighborScanTimerInfo.sessionId = CSR_SESSION_ID_INVALID; -#ifdef FEATURE_WLAN_CCX - pNeighborRoamInfo->isCCXAssoc = eANI_BOOLEAN_FALSE; +#ifdef FEATURE_WLAN_ESE + pNeighborRoamInfo->isESEAssoc = eANI_BOOLEAN_FALSE; pNeighborRoamInfo->isVOAdmitted = eANI_BOOLEAN_FALSE; pNeighborRoamInfo->MinQBssLoadRequired = 0; #endif @@ -1685,7 +1685,7 @@ static tANI_BOOLEAN csrNeighborRoamProcessScanResults(tpAniSirGlobal pMac, tpCsrNeighborRoamBSSInfo pBssInfo; tANI_U32 CurrAPRssi; tANI_U8 RoamRssiDiff = pMac->roam.configParam.RoamRssiDiff; -#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 immediateRoamRssiDiff = pMac->roam.configParam.nImmediateRoamRssiDiff; #endif tANI_BOOLEAN roamNow = eANI_BOOLEAN_FALSE; @@ -1805,12 +1805,12 @@ static tANI_BOOLEAN csrNeighborRoamProcessScanResults(tpAniSirGlobal pMac, } #endif /* WLAN_FEATURE_VOWIFI_11R */ -#ifdef FEATURE_WLAN_CCX +#ifdef FEATURE_WLAN_ESE #ifdef WLAN_FEATURE_ROAM_SCAN_OFFLOAD if (!csrRoamIsRoamOffloadScanEnabled(pMac)) { #endif - if (pNeighborRoamInfo->isCCXAssoc) + if (pNeighborRoamInfo->isESEAssoc) { if (!csrNeighborRoamIsPreauthCandidate(pMac, pScanResult->BssDescriptor.bssId)) { @@ -1848,7 +1848,7 @@ static tANI_BOOLEAN csrNeighborRoamProcessScanResults(tpAniSirGlobal pMac, #ifdef WLAN_FEATURE_ROAM_SCAN_OFFLOAD } #endif -#endif /* FEATURE_WLAN_CCX */ +#endif /* FEATURE_WLAN_ESE */ #ifdef FEATURE_WLAN_LFR // If we are supporting legacy roaming, and @@ -1900,7 +1900,7 @@ static tANI_BOOLEAN csrNeighborRoamProcessScanResults(tpAniSirGlobal pMac, /* Just add to the end of the list as it is already sorted by RSSI */ csrLLInsertTail(&pNeighborRoamInfo->roamableAPList, &pBssInfo->List, LL_ACCESS_LOCK); -#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 ((eSME_ROAM_TRIGGER_SCAN == pNeighborRoamInfo->cfgRoamEn) || (eSME_ROAM_TRIGGER_FAST_ROAM == pNeighborRoamInfo->cfgRoamEn)) { @@ -2163,7 +2163,7 @@ static eHalStatus csrNeighborRoamProcessScanComplete (tpAniSirGlobal pMac) tANI_BOOLEAN roamNow = eANI_BOOLEAN_FALSE; eHalStatus hstatus; -#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 the state is REPORT_SCAN, then this must be the scan after the REPORT_QUERY state. So, we should use the BSSID filter made out of neighbor reports */ if ((eCSR_NEIGHBOR_ROAM_STATE_REPORT_SCAN == pNeighborRoamInfo->neighborRoamState) @@ -2173,14 +2173,14 @@ static eHalStatus csrNeighborRoamProcessScanComplete (tpAniSirGlobal pMac) ) { hstatus = csrNeighborRoamBssIdScanFilter(pMac, &scanFilter); - NEIGHBOR_ROAM_DEBUG(pMac, LOGW, FL("11R or CCX Association: Prepare scan filter status with neighbor AP = %d"), hstatus); + NEIGHBOR_ROAM_DEBUG(pMac, LOGW, FL("11R or ESE Association: Prepare scan filter status with neighbor AP = %d"), hstatus); tempVal = 1; } else #endif { hstatus = csrNeighborRoamPrepareScanProfileFilter(pMac, &scanFilter); - NEIGHBOR_ROAM_DEBUG(pMac, LOGW, FL("11R/CCX/Other Association: Prepare scan to find neighbor AP filter status = %d"), hstatus); + NEIGHBOR_ROAM_DEBUG(pMac, LOGW, FL("11R/ESE/Other Association: Prepare scan to find neighbor AP filter status = %d"), hstatus); } if (eHAL_STATUS_SUCCESS != hstatus) { @@ -2227,10 +2227,10 @@ static eHalStatus csrNeighborRoamProcessScanComplete (tpAniSirGlobal pMac) } else #endif -#ifdef FEATURE_WLAN_CCX +#ifdef FEATURE_WLAN_ESE /* If this is a non-11r association, then we can register the reassoc callback here as we have some APs in the roamable AP list */ - if (pNeighborRoamInfo->isCCXAssoc) + if (pNeighborRoamInfo->isESEAssoc) { /* Valid APs are found after scan. Now we can initiate pre-authentication */ CSR_NEIGHBOR_ROAM_STATE_TRANSITION(eCSR_NEIGHBOR_ROAM_STATE_REPORT_SCAN) @@ -2956,7 +2956,7 @@ void csrNeighborRoamEmptyScanRefreshTimerCallback(void *context) else #endif { - NEIGHBOR_ROAM_DEBUG(pMac, LOGE, FL("Non 11R or CCX Association:empty scan refresh timer expired")); + NEIGHBOR_ROAM_DEBUG(pMac, LOGE, FL("Non 11R or ESE Association:empty scan refresh timer expired")); vosStatus = csrNeighborRoamTransitToCFGChanScan(pMac); if (VOS_STATUS_SUCCESS != vosStatus) { @@ -3022,7 +3022,7 @@ void csrNeighborRoamResultsRefreshTimerCallback(void *context) else #endif { - NEIGHBOR_ROAM_DEBUG(pMac, LOGE, FL("Non 11R or CCX Association:results refresh timer expired")); + NEIGHBOR_ROAM_DEBUG(pMac, LOGE, FL("Non 11R or ESE Association:results refresh timer expired")); vosStatus = csrNeighborRoamTransitToCFGChanScan(pMac); if (VOS_STATUS_SUCCESS != vosStatus) { @@ -3640,11 +3640,11 @@ VOS_STATUS csrNeighborRoamTransitToCFGChanScan(tpAniSirGlobal pMac) currChannelListInfo = &pNeighborRoamInfo->roamChannelInfo.currentChannelListInfo; if ( -#ifdef FEATURE_WLAN_CCX - ((pNeighborRoamInfo->isCCXAssoc) && +#ifdef FEATURE_WLAN_ESE + ((pNeighborRoamInfo->isESEAssoc) && (pNeighborRoamInfo->roamChannelInfo.IAPPNeighborListReceived == eANI_BOOLEAN_FALSE)) || - (pNeighborRoamInfo->isCCXAssoc == eANI_BOOLEAN_FALSE) || -#endif // CCX + (pNeighborRoamInfo->isESEAssoc == eANI_BOOLEAN_FALSE) || +#endif // ESE currChannelListInfo->numOfChannels == 0) { smsLog(pMac, LOGW, FL("Building channel list to scan")); @@ -4022,7 +4022,7 @@ VOS_STATUS csrNeighborRoamNeighborLookupDownEvent(tpAniSirGlobal pMac) else #endif { - NEIGHBOR_ROAM_DEBUG(pMac, LOG2, FL("Non 11R or CCX Association:Neighbor Lookup Down event received in CONNECTED state")); + NEIGHBOR_ROAM_DEBUG(pMac, LOG2, FL("Non 11R or ESE Association:Neighbor Lookup Down event received in CONNECTED state")); vosStatus = csrNeighborRoamTransitToCFGChanScan(pMac); if (VOS_STATUS_SUCCESS != vosStatus) @@ -4193,8 +4193,8 @@ eHalStatus csrNeighborRoamIndicateDisconnect(tpAniSirGlobal pMac, tANI_U8 sessio } } -#ifdef FEATURE_WLAN_CCX - if (pSession->connectedProfile.isCCXAssoc) +#ifdef FEATURE_WLAN_ESE + if (pSession->connectedProfile.isESEAssoc) { vos_mem_copy(&pSession->prevApSSID, &pSession->connectedProfile.SSID, sizeof(tSirMacSSid)); @@ -4331,7 +4331,7 @@ eHalStatus csrNeighborRoamIndicateConnect(tpAniSirGlobal pMac, tANI_U8 sessionId eHalStatus status = eHAL_STATUS_SUCCESS; VOS_STATUS vstatus; -#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 init_ft_flag = FALSE; #endif @@ -4419,7 +4419,7 @@ eHalStatus csrNeighborRoamIndicateConnect(tpAniSirGlobal pMac, tANI_U8 sessionId #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) /* Now we can clear the preauthDone that was saved as we are connected afresh */ csrNeighborRoamFreeRoamableBSSList(pMac, &pMac->roam.neighborRoamInfo.FTRoamInfo.preAuthDoneList); #endif @@ -4438,18 +4438,18 @@ eHalStatus csrNeighborRoamIndicateConnect(tpAniSirGlobal pMac, tANI_U8 sessionId NEIGHBOR_ROAM_DEBUG(pMac, LOG2, FL("11rAssoc is = %d"), pNeighborRoamInfo->is11rAssoc); #endif -#ifdef FEATURE_WLAN_CCX +#ifdef FEATURE_WLAN_ESE // Based on the auth scheme tell if we are 11r - if (pMac->roam.roamSession[sessionId].connectedProfile.isCCXAssoc) + if (pMac->roam.roamSession[sessionId].connectedProfile.isESEAssoc) { if (pMac->roam.configParam.isFastTransitionEnabled) init_ft_flag = TRUE; - pNeighborRoamInfo->isCCXAssoc = eANI_BOOLEAN_TRUE; + pNeighborRoamInfo->isESEAssoc = eANI_BOOLEAN_TRUE; } else - pNeighborRoamInfo->isCCXAssoc = eANI_BOOLEAN_FALSE; - NEIGHBOR_ROAM_DEBUG(pMac, LOG2, FL("isCCXAssoc is = %d ft = %d"), - pNeighborRoamInfo->isCCXAssoc, init_ft_flag); + pNeighborRoamInfo->isESEAssoc = eANI_BOOLEAN_FALSE; + NEIGHBOR_ROAM_DEBUG(pMac, LOG2, FL("isESEAssoc is = %d ft = %d"), + pNeighborRoamInfo->isESEAssoc, init_ft_flag); #endif @@ -4461,7 +4461,7 @@ eHalStatus csrNeighborRoamIndicateConnect(tpAniSirGlobal pMac, tANI_U8 sessionId } #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 ( init_ft_flag == TRUE ) { /* Initialize all the data structures needed for the 11r FT Preauth */ @@ -4961,8 +4961,8 @@ void csrNeighborRoamGetHandoffAPInfo(tpAniSirGlobal pMac, tpCsrNeighborRoamBSSIn } else #endif -#ifdef FEATURE_WLAN_CCX - if (pNeighborRoamInfo->isCCXAssoc) +#ifdef FEATURE_WLAN_ESE + if (pNeighborRoamInfo->isESEAssoc) { /* Always the BSS info in the head is the handoff candidate */ pBssNode = csrNeighborRoamGetRoamableAPListNextEntry(pMac, &pNeighborRoamInfo->FTRoamInfo.preAuthDoneList, NULL); diff --git a/CORE/SME/src/csr/csrUtil.c b/CORE/SME/src/csr/csrUtil.c index 6b6cf2d9c0fb..fbda5afab95a 100644 --- a/CORE/SME/src/csr/csrUtil.c +++ b/CORE/SME/src/csr/csrUtil.c @@ -44,10 +44,10 @@ #include "smeQosInternal.h" #include "wlan_qct_wda.h" -#if defined(FEATURE_WLAN_CCX) && !defined(FEATURE_WLAN_CCX_UPLOAD) +#if defined(FEATURE_WLAN_ESE) && !defined(FEATURE_WLAN_ESE_UPLOAD) #include "vos_utils.h" -#include "csrCcx.h" -#endif /* FEATURE_WLAN_CCX && !FEATURE_WLAN_CCX_UPLOAD*/ +#include "csrEse.h" +#endif /* FEATURE_WLAN_ESE && !FEATURE_WLAN_ESE_UPLOAD*/ tANI_U8 csrWpaOui[][ CSR_WPA_OUI_SIZE ] = { { 0x00, 0x50, 0xf2, 0x00 }, @@ -56,9 +56,9 @@ tANI_U8 csrWpaOui[][ CSR_WPA_OUI_SIZE ] = { { 0x00, 0x50, 0xf2, 0x03 }, { 0x00, 0x50, 0xf2, 0x04 }, { 0x00, 0x50, 0xf2, 0x05 }, -#ifdef FEATURE_WLAN_CCX +#ifdef FEATURE_WLAN_ESE { 0x00, 0x40, 0x96, 0x00 }, // CCKM -#endif /* FEATURE_WLAN_CCX */ +#endif /* FEATURE_WLAN_ESE */ }; tANI_U8 csrRSNOui[][ CSR_RSN_OUI_SIZE ] = { @@ -2653,7 +2653,7 @@ tANI_BOOLEAN csrIsProfileWpa( tCsrRoamProfile *pProfile ) case eCSR_AUTH_TYPE_WPA: case eCSR_AUTH_TYPE_WPA_PSK: case eCSR_AUTH_TYPE_WPA_NONE: -#ifdef FEATURE_WLAN_CCX +#ifdef FEATURE_WLAN_ESE case eCSR_AUTH_TYPE_CCKM_WPA: #endif fWpaProfile = TRUE; @@ -2695,7 +2695,7 @@ tANI_BOOLEAN csrIsProfileRSN( tCsrRoamProfile *pProfile ) case eCSR_AUTH_TYPE_FT_RSN: case eCSR_AUTH_TYPE_FT_RSN_PSK: #endif -#ifdef FEATURE_WLAN_CCX +#ifdef FEATURE_WLAN_ESE case eCSR_AUTH_TYPE_CCKM_RSN: #endif #ifdef WLAN_FEATURE_11W @@ -3147,10 +3147,10 @@ tANI_BOOLEAN csrIsProfile11r( tCsrRoamProfile *pProfile ) #endif -#ifdef FEATURE_WLAN_CCX +#ifdef FEATURE_WLAN_ESE -/* Function to return TRUE if the authtype is CCX */ -tANI_BOOLEAN csrIsAuthTypeCCX( eCsrAuthType AuthType ) +/* Function to return TRUE if the authtype is ESE */ +tANI_BOOLEAN csrIsAuthTypeESE( eCsrAuthType AuthType ) { switch ( AuthType ) { @@ -3164,10 +3164,10 @@ tANI_BOOLEAN csrIsAuthTypeCCX( eCsrAuthType AuthType ) return FALSE; } -/* Function to return TRUE if the profile is CCX */ -tANI_BOOLEAN csrIsProfileCCX( tCsrRoamProfile *pProfile ) +/* Function to return TRUE if the profile is ESE */ +tANI_BOOLEAN csrIsProfileESE( tCsrRoamProfile *pProfile ) { - return (csrIsAuthTypeCCX( pProfile->negotiatedAuthType )); + return (csrIsAuthTypeESE( pProfile->negotiatedAuthType )); } #endif @@ -3391,21 +3391,21 @@ static tANI_BOOLEAN csrIsFTAuthRSNPsk( tpAniSirGlobal pMac, tANI_U8 AllSuites[][ #endif -#ifdef FEATURE_WLAN_CCX +#ifdef FEATURE_WLAN_ESE /* - * Function for CCX CCKM AKM Authentication. We match the CCKM AKM Authentication Key Management suite + * Function for ESE CCKM AKM Authentication. We match the CCKM AKM Authentication Key Management suite * here. This matches for CCKM AKM Auth with the 802.1X exchange. * */ -static tANI_BOOLEAN csrIsCcxCckmAuthRSN( tpAniSirGlobal pMac, tANI_U8 AllSuites[][CSR_RSN_OUI_SIZE], +static tANI_BOOLEAN csrIsEseCckmAuthRSN( tpAniSirGlobal pMac, tANI_U8 AllSuites[][CSR_RSN_OUI_SIZE], tANI_U8 cAllSuites, tANI_U8 Oui[] ) { return( csrIsOuiMatch( pMac, AllSuites, cAllSuites, csrRSNOui[06], Oui ) ); } -static tANI_BOOLEAN csrIsCcxCckmAuthWpa( tpAniSirGlobal pMac, tANI_U8 AllSuites[][CSR_WPA_OUI_SIZE], +static tANI_BOOLEAN csrIsEseCckmAuthWpa( tpAniSirGlobal pMac, tANI_U8 AllSuites[][CSR_WPA_OUI_SIZE], tANI_U8 cAllSuites, tANI_U8 Oui[] ) { @@ -3628,9 +3628,9 @@ tANI_BOOLEAN csrGetRSNInformation( tHalHandle hHal, tCsrAuthList *pAuthType, eCs negAuthType = eCSR_AUTH_TYPE_FT_RSN_PSK; } #endif -#ifdef FEATURE_WLAN_CCX - /* CCX only supports 802.1X. No PSK. */ - if ( (negAuthType == eCSR_AUTH_TYPE_UNKNOWN) && csrIsCcxCckmAuthRSN( pMac, AuthSuites, cAuthSuites, Authentication ) ) +#ifdef FEATURE_WLAN_ESE + /* ESE only supports 802.1X. No PSK. */ + if ( (negAuthType == eCSR_AUTH_TYPE_UNKNOWN) && csrIsEseCckmAuthRSN( pMac, AuthSuites, cAuthSuites, Authentication ) ) { if (eCSR_AUTH_TYPE_CCKM_RSN == pAuthType->authType[i]) negAuthType = eCSR_AUTH_TYPE_CCKM_RSN; @@ -4211,13 +4211,13 @@ tANI_BOOLEAN csrGetWpaCyphers( tpAniSirGlobal pMac, tCsrAuthList *pAuthType, eCs if (eCSR_AUTH_TYPE_WPA_PSK == pAuthType->authType[i]) negAuthType = eCSR_AUTH_TYPE_WPA_PSK; } -#ifdef FEATURE_WLAN_CCX - if ( (negAuthType == eCSR_AUTH_TYPE_UNKNOWN) && csrIsCcxCckmAuthWpa( pMac, pWpaIe->auth_suites, cAuthSuites, Authentication ) ) +#ifdef FEATURE_WLAN_ESE + if ( (negAuthType == eCSR_AUTH_TYPE_UNKNOWN) && csrIsEseCckmAuthWpa( pMac, pWpaIe->auth_suites, cAuthSuites, Authentication ) ) { if (eCSR_AUTH_TYPE_CCKM_WPA == pAuthType->authType[i]) negAuthType = eCSR_AUTH_TYPE_CCKM_WPA; } -#endif /* FEATURE_WLAN_CCX */ +#endif /* FEATURE_WLAN_ESE */ // The 1st auth type in the APs WPA IE, to match stations connecting // profiles auth type will cause us to exit this loop diff --git a/CORE/SME/src/rrm/sme_rrm.c b/CORE/SME/src/rrm/sme_rrm.c index 51a99d69c14c..80a0ec113b14 100644 --- a/CORE/SME/src/rrm/sme_rrm.c +++ b/CORE/SME/src/rrm/sme_rrm.c @@ -55,8 +55,8 @@ #include "rrmGlobal.h" -#if defined(FEATURE_WLAN_CCX) && !defined(FEATURE_WLAN_CCX_UPLOAD) -#include "csrCcx.h" +#if defined(FEATURE_WLAN_ESE) && !defined(FEATURE_WLAN_ESE_UPLOAD) +#include "csrEse.h" #endif /* Roam score for a neighbor AP will be calculated based on the below definitions. @@ -72,7 +72,7 @@ #define RRM_ROAM_SCORE_NEIGHBOR_REPORT_CAPABILITY_IMMEDIATE_BA 3 #define RRM_ROAM_SCORE_NEIGHBOR_REPORT_MOBILITY_DOMAIN 30 -#ifdef FEATURE_WLAN_CCX +#ifdef FEATURE_WLAN_ESE #define RRM_ROAM_SCORE_NEIGHBOR_IAPP_LIST 30 #endif /**--------------------------------------------------------------------------- @@ -142,12 +142,12 @@ void rrmIndicateNeighborReportResult(tpAniSirGlobal pMac, VOS_STATUS vosStatus) /* Call the callback with the status received from caller */ if (callback) callback(callbackContext, vosStatus); -#if defined(FEATURE_WLAN_CCX) && !defined(FEATURE_WLAN_CCX_UPLOAD) +#if defined(FEATURE_WLAN_ESE) && !defined(FEATURE_WLAN_ESE_UPLOAD) // We came here with IAPP AP List // Make sure we inform CSR of the neighbor list - // for CCX Associations. First clear the cache. + // for ESE Associations. First clear the cache. else - if (csrNeighborRoamIsCCXAssoc(pMac)) + if (csrNeighborRoamIsESEAssoc(pMac)) { ProcessIAPPNeighborAPList(pMac); } @@ -279,10 +279,10 @@ static eHalStatus sme_RrmSendBeaconReportXmitInd( tpAniSirGlobal pMac, return status; } -#if defined(FEATURE_WLAN_CCX_UPLOAD) +#if defined(FEATURE_WLAN_ESE_UPLOAD) /**--------------------------------------------------------------------------- - \brief sme_CcxSendBeaconReqScanResults() + \brief sme_EseSendBeaconReqScanResults() This function sends up the scan results received as a part of beacon request scanning. @@ -299,7 +299,7 @@ static eHalStatus sme_RrmSendBeaconReportXmitInd( tpAniSirGlobal pMac, \return - 0 for success, non zero for failure --------------------------------------------------------------------------*/ -static eHalStatus sme_CcxSendBeaconReqScanResults(tpAniSirGlobal pMac, +static eHalStatus sme_EseSendBeaconReqScanResults(tpAniSirGlobal pMac, tANI_U32 sessionId, tANI_U8 channel, tCsrScanResultInfo **pResultArr, @@ -316,9 +316,9 @@ static eHalStatus sme_CcxSendBeaconReqScanResults(tpAniSirGlobal pMac, tANI_U8 msgCounter = 0; tpRrmSMEContext pSmeRrmContext = &pMac->rrm.rrmSmeContext; tCsrRoamInfo roamInfo; - tSirCcxBcnReportRsp bcnReport; - tpSirCcxBcnReportRsp pBcnReport = &bcnReport; - tpCsrCcxBeaconReqParams pCurMeasReqIe = NULL; + tSirEseBcnReportRsp bcnReport; + tpSirEseBcnReportRsp pBcnReport = &bcnReport; + tpCsrEseBeaconReqParams pCurMeasReqIe = NULL; tANI_U8 i = 0; if (NULL == pSmeRrmContext) @@ -336,15 +336,15 @@ static eHalStatus sme_CcxSendBeaconReqScanResults(tpAniSirGlobal pMac, if (pResultArr) pCurResult=pResultArr[bssCounter]; - vos_mem_zero(&bcnReport, sizeof(tSirCcxBcnReportRsp)); + vos_mem_zero(&bcnReport, sizeof(tSirEseBcnReportRsp)); do { pCurMeasReqIe = NULL; - for (i = 0; i < pSmeRrmContext->ccxBcnReqInfo.numBcnReqIe; i++) + for (i = 0; i < pSmeRrmContext->eseBcnReqInfo.numBcnReqIe; i++) { - if(pSmeRrmContext->ccxBcnReqInfo.bcnReq[i].channel == channel) + if(pSmeRrmContext->eseBcnReqInfo.bcnReq[i].channel == channel) { - pCurMeasReqIe = &pSmeRrmContext->ccxBcnReqInfo.bcnReq[i]; + pCurMeasReqIe = &pSmeRrmContext->eseBcnReqInfo.bcnReq[i]; break; } } @@ -373,7 +373,7 @@ static eHalStatus sme_CcxSendBeaconReqScanResults(tpAniSirGlobal pMac, vos_mem_copy(pBcnReport->bcnRepBssInfo[msgCounter].bcnReportFields.Bssid, pBssDesc->bssId, sizeof(tSirMacAddr)); - fillIeStatus = sirFillBeaconMandatoryIEforCcxBcnReport(pMac, + fillIeStatus = sirFillBeaconMandatoryIEforEseBcnReport(pMac, (tANI_U8 *)pBssDesc->ieFields, ie_len, &(pBcnReport->bcnRepBssInfo[msgCounter].pBuf), @@ -422,9 +422,9 @@ static eHalStatus sme_CcxSendBeaconReqScanResults(tpAniSirGlobal pMac, " msgCounter(%d) bssCounter(%d) flag(%d)", pBcnReport->numBss, msgCounter, bssCounter, pBcnReport->flag); - roamInfo.pCcxBcnReportRsp = pBcnReport; + roamInfo.pEseBcnReportRsp = pBcnReport; status = csrRoamCallCallback(pMac, sessionId, &roamInfo, - 0, eCSR_ROAM_CCX_BCN_REPORT_IND, 0); + 0, eCSR_ROAM_ESE_BCN_REPORT_IND, 0); /* Free the memory allocated to IE */ for (i = 0; i < msgCounter; i++) @@ -436,7 +436,7 @@ static eHalStatus sme_CcxSendBeaconReqScanResults(tpAniSirGlobal pMac, return status; } -#endif /* FEATURE_WLAN_CCX_UPLOAD */ +#endif /* FEATURE_WLAN_ESE_UPLOAD */ /**--------------------------------------------------------------------------- @@ -530,10 +530,10 @@ static eHalStatus sme_RrmSendScanResult( tpAniSirGlobal pMac, // so that PE can clean any context allocated. if( measurementDone ) { -#if defined(FEATURE_WLAN_CCX_UPLOAD) - if (eRRM_MSG_SOURCE_CCX_UPLOAD == pSmeRrmContext->msgSource) +#if defined(FEATURE_WLAN_ESE_UPLOAD) + if (eRRM_MSG_SOURCE_ESE_UPLOAD == pSmeRrmContext->msgSource) { - status = sme_CcxSendBeaconReqScanResults(pMac, + status = sme_EseSendBeaconReqScanResults(pMac, sessionId, chanList[0], NULL, @@ -541,7 +541,7 @@ static eHalStatus sme_RrmSendScanResult( tpAniSirGlobal pMac, 0); } else -#endif /*FEATURE_WLAN_CCX_UPLOAD*/ +#endif /*FEATURE_WLAN_ESE_UPLOAD*/ status = sme_RrmSendBeaconReportXmitInd( pMac, NULL, measurementDone, 0); } return status; @@ -551,10 +551,10 @@ static eHalStatus sme_RrmSendScanResult( tpAniSirGlobal pMac, if( NULL == pScanResult && measurementDone ) { -#if defined(FEATURE_WLAN_CCX_UPLOAD) - if (eRRM_MSG_SOURCE_CCX_UPLOAD == pSmeRrmContext->msgSource) +#if defined(FEATURE_WLAN_ESE_UPLOAD) + if (eRRM_MSG_SOURCE_ESE_UPLOAD == pSmeRrmContext->msgSource) { - status = sme_CcxSendBeaconReqScanResults(pMac, + status = sme_EseSendBeaconReqScanResults(pMac, sessionId, chanList[0], NULL, @@ -562,7 +562,7 @@ static eHalStatus sme_RrmSendScanResult( tpAniSirGlobal pMac, 0); } else -#endif /*FEATURE_WLAN_CCX_UPLOAD*/ +#endif /*FEATURE_WLAN_ESE_UPLOAD*/ status = sme_RrmSendBeaconReportXmitInd( pMac, NULL, measurementDone, 0 ); } @@ -579,10 +579,10 @@ static eHalStatus sme_RrmSendScanResult( tpAniSirGlobal pMac, if (counter) { smsLog(pMac, LOG1, " Number of BSS Desc with RRM Scan %d ", counter); -#if defined(FEATURE_WLAN_CCX_UPLOAD) - if (eRRM_MSG_SOURCE_CCX_UPLOAD == pSmeRrmContext->msgSource) +#if defined(FEATURE_WLAN_ESE_UPLOAD) + if (eRRM_MSG_SOURCE_ESE_UPLOAD == pSmeRrmContext->msgSource) { - status = sme_CcxSendBeaconReqScanResults(pMac, + status = sme_EseSendBeaconReqScanResults(pMac, sessionId, chanList[0], pScanResultsArr, @@ -590,7 +590,7 @@ static eHalStatus sme_RrmSendScanResult( tpAniSirGlobal pMac, counter); } else -#endif /*FEATURE_WLAN_CCX_UPLOAD*/ +#endif /*FEATURE_WLAN_ESE_UPLOAD*/ status = sme_RrmSendBeaconReportXmitInd( pMac, pScanResultsArr, measurementDone, @@ -686,8 +686,8 @@ eHalStatus sme_RrmIssueScanReq( tpAniSirGlobal pMac ) if ((pSmeRrmContext->currentIndex) >= pSmeRrmContext->channelList.numOfChannels) return status; - if( eRRM_MSG_SOURCE_CCX_UPLOAD == pSmeRrmContext->msgSource || - eRRM_MSG_SOURCE_LEGACY_CCX == pSmeRrmContext->msgSource ) + if( eRRM_MSG_SOURCE_ESE_UPLOAD == pSmeRrmContext->msgSource || + eRRM_MSG_SOURCE_LEGACY_ESE == pSmeRrmContext->msgSource ) scanType = pSmeRrmContext->measMode[pSmeRrmContext->currentIndex]; else scanType = pSmeRrmContext->measMode[0]; @@ -726,8 +726,8 @@ eHalStatus sme_RrmIssueScanReq( tpAniSirGlobal pMac ) /* set min and max channel time */ scanRequest.minChnTime = 0; //pSmeRrmContext->duration; Dont use min timeout. - if( eRRM_MSG_SOURCE_CCX_UPLOAD == pSmeRrmContext->msgSource || - eRRM_MSG_SOURCE_LEGACY_CCX == pSmeRrmContext->msgSource ) + if( eRRM_MSG_SOURCE_ESE_UPLOAD == pSmeRrmContext->msgSource || + eRRM_MSG_SOURCE_LEGACY_ESE == pSmeRrmContext->msgSource ) scanRequest.maxChnTime = pSmeRrmContext->duration[pSmeRrmContext->currentIndex]; else scanRequest.maxChnTime = pSmeRrmContext->duration[0]; @@ -898,8 +898,8 @@ void sme_RrmProcessBeaconReportReqInd(tpAniSirGlobal pMac, void *pMsgBuf) pSmeRrmContext->randnIntvl = VOS_MAX( pBeaconReq->randomizationInterval, pSmeRrmContext->rrmConfig.maxRandnInterval ); pSmeRrmContext->currentIndex = 0; pSmeRrmContext->msgSource = pBeaconReq->msgSource; - vos_mem_copy((tANI_U8*)&pSmeRrmContext->measMode, (tANI_U8*)&pBeaconReq->fMeasurementtype, SIR_CCX_MAX_MEAS_IE_REQS); - vos_mem_copy((tANI_U8*)&pSmeRrmContext->duration, (tANI_U8*)&pBeaconReq->measurementDuration, SIR_CCX_MAX_MEAS_IE_REQS); + vos_mem_copy((tANI_U8*)&pSmeRrmContext->measMode, (tANI_U8*)&pBeaconReq->fMeasurementtype, SIR_ESE_MAX_MEAS_IE_REQS); + vos_mem_copy((tANI_U8*)&pSmeRrmContext->duration, (tANI_U8*)&pBeaconReq->measurementDuration, SIR_ESE_MAX_MEAS_IE_REQS); sme_RrmIssueScanReq( pMac ); @@ -1041,7 +1041,7 @@ static void rrmCalculateNeighborAPRoamScore(tpAniSirGlobal pMac, tpRrmNeighborRe } } } -#ifdef FEATURE_WLAN_CCX +#ifdef FEATURE_WLAN_ESE // It has come in the report so its the best score if (csrNeighborRoamIs11rAssoc(pMac) == FALSE) { @@ -1135,9 +1135,9 @@ eHalStatus sme_RrmProcessNeighborReport(tpAniSirGlobal pMac, void *pMsgBuf) tANI_U8 i = 0; VOS_STATUS vosStatus = VOS_STATUS_SUCCESS; -#ifdef FEATURE_WLAN_CCX - // Clear the cache for CCX. - if (csrNeighborRoamIsCCXAssoc(pMac)) +#ifdef FEATURE_WLAN_ESE + // Clear the cache for ESE. + if (csrNeighborRoamIsESEAssoc(pMac)) { rrmLLPurgeNeighborCache(pMac, &pMac->rrm.rrmSmeContext.neighborReportCache); @@ -1531,8 +1531,8 @@ tRrmNeighborReportDesc* smeRrmGetNextBssEntryFromNeighborCache( tpAniSirGlobal p return pTempBssEntry; } -#if defined(FEATURE_WLAN_CCX) && !defined(FEATURE_WLAN_CCX_UPLOAD) -void csrCcxSendAdjacentApRepMsg(tpAniSirGlobal pMac, tCsrRoamSession *pSession) +#if defined(FEATURE_WLAN_ESE) && !defined(FEATURE_WLAN_ESE_UPLOAD) +void csrEseSendAdjacentApRepMsg(tpAniSirGlobal pMac, tCsrRoamSession *pSession) { tpSirAdjacentApRepInd pAdjRep; tANI_U16 length; @@ -1550,7 +1550,7 @@ void csrCcxSendAdjacentApRepMsg(tpAniSirGlobal pMac, tCsrRoamSession *pSession) } vos_mem_zero( pAdjRep, length ); - pAdjRep->messageType = eWNI_SME_CCX_ADJACENT_AP_REPORT; + pAdjRep->messageType = eWNI_SME_ESE_ADJACENT_AP_REPORT; pAdjRep->length = length; pAdjRep->channelNum = pSession->prevOpChannel; vos_mem_copy( pAdjRep->bssid, &pSession->connectedProfile.bssid, sizeof(tSirMacAddr) ); @@ -1558,12 +1558,12 @@ void csrCcxSendAdjacentApRepMsg(tpAniSirGlobal pMac, tCsrRoamSession *pSession) vos_mem_copy( &pAdjRep->prevApSSID, &pSession->prevApSSID, sizeof(tSirMacSSid) ); roamTS2 = vos_timer_get_system_time(); pAdjRep->tsmRoamdelay = roamTS2 - pSession->roamTS1; - pAdjRep->roamReason =SIR_CCX_ASSOC_REASON_UNSPECIFIED; + pAdjRep->roamReason =SIR_ESE_ASSOC_REASON_UNSPECIFIED; pAdjRep->clientDissSecs =(pAdjRep->tsmRoamdelay/1000); palSendMBMessage(pMac->hHdd, pAdjRep); return; } -#endif /* FEATURE_WLAN_CCX */ +#endif /* FEATURE_WLAN_ESE */ #endif diff --git a/CORE/SME/src/sme_common/sme_Api.c b/CORE/SME/src/sme_common/sme_Api.c index a3ebea7919c9..a8246000cabe 100644 --- a/CORE/SME/src/sme_common/sme_Api.c +++ b/CORE/SME/src/sme_common/sme_Api.c @@ -111,7 +111,7 @@ eHalStatus sme_HandlePostChannelSwitchInd(tHalHandle hHal); tANI_BOOLEAN csrIsScanAllowed(tpAniSirGlobal pMac); #endif -#if defined(FEATURE_WLAN_CCX) && defined(FEATURE_WLAN_CCX_UPLOAD) +#if defined(FEATURE_WLAN_ESE) && defined(FEATURE_WLAN_ESE_UPLOAD) tANI_BOOLEAN csrIsSupportedChannel(tpAniSirGlobal pMac, tANI_U8 channelId); #endif @@ -1425,7 +1425,7 @@ eHalStatus sme_setRegInfo(tHalHandle hHal, tANI_U8 *apCntryCode) return status; } -#if defined(FEATURE_WLAN_CCX) && defined(FEATURE_WLAN_CCX_UPLOAD) +#if defined(FEATURE_WLAN_ESE) && defined(FEATURE_WLAN_ESE_UPLOAD) eHalStatus sme_SetPlmRequest(tHalHandle hHal, tpSirPlmReq pPlmReq) { eHalStatus status; @@ -2063,7 +2063,7 @@ eHalStatus dfsMsgProcessor(tpAniSirGlobal pMac, v_U16_t msgType, void *pMsgBuf) return status; } -#if defined(FEATURE_WLAN_CCX) && defined(FEATURE_WLAN_CCX_UPLOAD) +#if defined(FEATURE_WLAN_ESE) && defined(FEATURE_WLAN_ESE_UPLOAD) /*------------------------------------------------------------------ * * Handle the tsm ie indication from LIM and forward it to HDD. @@ -2111,32 +2111,32 @@ eHalStatus sme_SetCCKMIe(tHalHandle hHal, tANI_U8 sessionId, } /* --------------------------------------------------------------------------- - \fn sme_SetCcxBeaconRequest - \brief function to set CCX beacon request parameters + \fn sme_SetEseBeaconRequest + \brief function to set ESE beacon request parameters \param hHal - HAL handle for device \param sessionId - Session id - \param pCcxBcnReq - pointer to CCX beacon request + \param pEseBcnReq - pointer to ESE beacon request \- return Success or failure -------------------------------------------------------------------------*/ -eHalStatus sme_SetCcxBeaconRequest(tHalHandle hHal, const tANI_U8 sessionId, - const tCsrCcxBeaconReq* pCcxBcnReq) +eHalStatus sme_SetEseBeaconRequest(tHalHandle hHal, const tANI_U8 sessionId, + const tCsrEseBeaconReq* pEseBcnReq) { eHalStatus status = eSIR_SUCCESS; tpAniSirGlobal pMac = PMAC_STRUCT( hHal ); tpSirBeaconReportReqInd pSmeBcnReportReq = NULL; - tCsrCcxBeaconReqParams *pBeaconReq = NULL; + tCsrEseBeaconReqParams *pBeaconReq = NULL; tANI_U8 counter = 0; tCsrRoamSession *pSession = CSR_GET_SESSION(pMac, sessionId); tpRrmSMEContext pSmeRrmContext = &pMac->rrm.rrmSmeContext; /* Store the info in RRM context */ - vos_mem_copy(&pSmeRrmContext->ccxBcnReqInfo, pCcxBcnReq, sizeof(tCsrCcxBeaconReq)); + vos_mem_copy(&pSmeRrmContext->eseBcnReqInfo, pEseBcnReq, sizeof(tCsrEseBeaconReq)); //Prepare the request to send to SME. pSmeBcnReportReq = vos_mem_malloc(sizeof( tSirBeaconReportReqInd )); if(NULL == pSmeBcnReportReq) { - smsLog(pMac, LOGP, "Memory Allocation Failure!!! CCX BcnReq Ind to SME"); + smsLog(pMac, LOGP, "Memory Allocation Failure!!! ESE BcnReq Ind to SME"); return eSIR_FAILURE; } @@ -2147,12 +2147,12 @@ eHalStatus sme_SetCcxBeaconRequest(tHalHandle hHal, const tANI_U8 sessionId, pSmeBcnReportReq->length = sizeof( tSirBeaconReportReqInd ); vos_mem_copy( pSmeBcnReportReq->bssId, pSession->connectedProfile.bssid, sizeof(tSirMacAddr) ); pSmeBcnReportReq->channelInfo.channelNum = 255; - pSmeBcnReportReq->channelList.numChannels = pCcxBcnReq->numBcnReqIe; - pSmeBcnReportReq->msgSource = eRRM_MSG_SOURCE_CCX_UPLOAD; + pSmeBcnReportReq->channelList.numChannels = pEseBcnReq->numBcnReqIe; + pSmeBcnReportReq->msgSource = eRRM_MSG_SOURCE_ESE_UPLOAD; - for (counter = 0; counter < pCcxBcnReq->numBcnReqIe; counter++) + for (counter = 0; counter < pEseBcnReq->numBcnReqIe; counter++) { - pBeaconReq = (tCsrCcxBeaconReqParams *)&pCcxBcnReq->bcnReq[counter]; + pBeaconReq = (tCsrEseBeaconReqParams *)&pEseBcnReq->bcnReq[counter]; pSmeBcnReportReq->fMeasurementtype[counter] = pBeaconReq->scanMode; pSmeBcnReportReq->measurementDuration[counter] = SYS_TU_TO_MS(pBeaconReq->measurementDuration); pSmeBcnReportReq->channelList.channelNumber[counter] = pBeaconReq->channel; @@ -2162,7 +2162,7 @@ eHalStatus sme_SetCcxBeaconRequest(tHalHandle hHal, const tANI_U8 sessionId, return status; } -#endif /* FEATURE_WLAN_CCX && FEATURE_WLAN_CCX_UPLOAD */ +#endif /* FEATURE_WLAN_ESE && FEATURE_WLAN_ESE_UPLOAD */ /*-------------------------------------------------------------------------- @@ -2516,7 +2516,7 @@ eHalStatus sme_ProcessMsg(tHalHandle hHal, vos_msg_t* pMsg) } 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_TSM_IE_IND: { if (pMsg->bodyptr) @@ -2531,7 +2531,7 @@ eHalStatus sme_ProcessMsg(tHalHandle hHal, vos_msg_t* pMsg) } break; } -#endif /* FEATURE_WLAN_CCX && FEATURE_WLAN_CCX_UPLOAD */ +#endif /* FEATURE_WLAN_ESE && FEATURE_WLAN_ESE_UPLOAD */ #ifdef WLAN_FEATURE_ROAM_SCAN_OFFLOAD case eWNI_SME_ROAM_SCAN_OFFLOAD_RSP: status = csrRoamOffloadScanRspHdlr((void *)pMac, pMsg->bodyval); @@ -4915,7 +4915,7 @@ eHalStatus sme_GetSnr(tHalHandle hHal, } return 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) /* --------------------------------------------------------------------------- \fn sme_GetRoamRssi \brief a wrapper function that client calls to register a callback to get Roam RSSI @@ -4945,7 +4945,7 @@ eHalStatus sme_GetRoamRssi(tHalHandle hHal, } #endif -#if defined(FEATURE_WLAN_CCX) && defined(FEATURE_WLAN_CCX_UPLOAD) +#if defined(FEATURE_WLAN_ESE) && defined(FEATURE_WLAN_ESE_UPLOAD) /* --------------------------------------------------------------------------- \fn sme_GetTsmStats \brief a wrapper function that client calls to register a callback to @@ -8804,7 +8804,7 @@ void sme_ResetPowerValuesFor5G (tHalHandle hHal) csrApplyPower2Current(pMac); // Store the channel+power info in the global place: Cfg } -#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) /* --------------------------------------------------------------------------- \fn sme_UpdateRoamPrefer5GHz \brief enable/disable Roam prefer 5G runtime option @@ -9155,7 +9155,7 @@ eHalStatus sme_SetRoamScanControl(tHalHandle hHal, v_BOOL_t roamScanControl) } return status ; } -#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 /*-------------------------------------------------------------------------- @@ -9257,40 +9257,40 @@ eHalStatus sme_UpdateEnableFastRoamInConcurrency(tHalHandle hHal, #endif #endif /* FEATURE_WLAN_LFR */ -#ifdef FEATURE_WLAN_CCX +#ifdef FEATURE_WLAN_ESE /*-------------------------------------------------------------------------- - \brief sme_UpdateIsCcxFeatureEnabled() - enable/disable CCX support at runtime + \brief sme_UpdateIsEseFeatureEnabled() - enable/disable ESE support at runtime It is used at in the REG_DYNAMIC_VARIABLE macro definition of - isCcxIniFeatureEnabled. + isEseIniFeatureEnabled. This is a synchronous call \param hHal - The handle returned by macOpen. - \return eHAL_STATUS_SUCCESS - SME update isCcxIniFeatureEnabled config successfully. - Other status means SME is failed to update isCcxIniFeatureEnabled. + \return eHAL_STATUS_SUCCESS - SME update isEseIniFeatureEnabled config successfully. + Other status means SME is failed to update isEseIniFeatureEnabled. \sa --------------------------------------------------------------------------*/ -eHalStatus sme_UpdateIsCcxFeatureEnabled(tHalHandle hHal, - const v_BOOL_t isCcxIniFeatureEnabled) +eHalStatus sme_UpdateIsEseFeatureEnabled(tHalHandle hHal, + const v_BOOL_t isEseIniFeatureEnabled) { tpAniSirGlobal pMac = PMAC_STRUCT( hHal ); - if (pMac->roam.configParam.isCcxIniFeatureEnabled == isCcxIniFeatureEnabled) + if (pMac->roam.configParam.isEseIniFeatureEnabled == isEseIniFeatureEnabled) { VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO, - "%s: CCX Mode is already enabled or disabled, nothing to do (returning) old(%d) new(%d)", __func__, - pMac->roam.configParam.isCcxIniFeatureEnabled, - isCcxIniFeatureEnabled); + "%s: ESE Mode is already enabled or disabled, nothing to do (returning) old(%d) new(%d)", __func__, + pMac->roam.configParam.isEseIniFeatureEnabled, + isEseIniFeatureEnabled); return eHAL_STATUS_SUCCESS; } VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO, - "%s: CcxEnabled is changed from %d to %d", __func__, - pMac->roam.configParam.isCcxIniFeatureEnabled, - isCcxIniFeatureEnabled); - pMac->roam.configParam.isCcxIniFeatureEnabled = isCcxIniFeatureEnabled; - csrNeighborRoamUpdateCcxModeEnabled(pMac, isCcxIniFeatureEnabled); + "%s: EseEnabled is changed from %d to %d", __func__, + pMac->roam.configParam.isEseIniFeatureEnabled, + isEseIniFeatureEnabled); + pMac->roam.configParam.isEseIniFeatureEnabled = isEseIniFeatureEnabled; + csrNeighborRoamUpdateEseModeEnabled(pMac, isEseIniFeatureEnabled); - if(TRUE == isCcxIniFeatureEnabled) + if(TRUE == isEseIniFeatureEnabled) { sme_UpdateFastTransitionEnabled(hHal, TRUE); } @@ -9298,12 +9298,12 @@ eHalStatus sme_UpdateIsCcxFeatureEnabled(tHalHandle hHal, #ifdef WLAN_FEATURE_ROAM_SCAN_OFFLOAD if (pMac->roam.configParam.isRoamOffloadScanEnabled) { - csrRoamOffloadScan(pMac, ROAM_SCAN_OFFLOAD_UPDATE_CFG, REASON_CCX_INI_CFG_CHANGED); + csrRoamOffloadScan(pMac, ROAM_SCAN_OFFLOAD_UPDATE_CFG, REASON_ESE_INI_CFG_CHANGED); } #endif return eHAL_STATUS_SUCCESS; } -#endif /* FEATURE_WLAN_CCX */ +#endif /* FEATURE_WLAN_ESE */ /*-------------------------------------------------------------------------- \brief sme_UpdateConfigFwRssiMonitoring() - enable/disable firmware RSSI Monitoring at runtime @@ -9955,7 +9955,7 @@ v_U16_t sme_getNeighborScanPeriod(tHalHandle hHal) #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) /*-------------------------------------------------------------------------- \brief sme_getRoamRssiDiff() - get Roam rssi diff @@ -10041,16 +10041,16 @@ eHalStatus sme_ChangeRoamScanChannelList(tHalHandle hHal, tANI_U8 *pChannelList, return status ; } -#ifdef FEATURE_WLAN_CCX_UPLOAD +#ifdef FEATURE_WLAN_ESE_UPLOAD /*-------------------------------------------------------------------------- - \brief sme_SetCcxRoamScanChannelList() - set ccx roam scan channel list + \brief sme_SetEseRoamScanChannelList() - set ese roam scan channel list This is a synchronuous call \param hHal - The handle returned by macOpen. \return eHAL_STATUS_SUCCESS - SME update config successful. Other status means SME is failed to update \sa --------------------------------------------------------------------------*/ -eHalStatus sme_SetCcxRoamScanChannelList(tHalHandle hHal, +eHalStatus sme_SetEseRoamScanChannelList(tHalHandle hHal, tANI_U8 *pChannelList, tANI_U8 numChannels) { @@ -10092,7 +10092,7 @@ eHalStatus sme_SetCcxRoamScanChannelList(tHalHandle hHal, } } VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_DEBUG, -"CCX roam scan channel list successfully set to \ +"ESE roam scan channel list successfully set to \ %s - old value is %s - roam state is %d", newChannelList, oldChannelList, pMac->roam.neighborRoamInfo.neighborRoamState); @@ -10151,18 +10151,18 @@ eHalStatus sme_getRoamScanChannelList(tHalHandle hHal, tANI_U8 *pChannelList, } /*-------------------------------------------------------------------------- - \brief sme_getIsCcxFeatureEnabled() - get CCX feature enabled or not + \brief sme_getIsEseFeatureEnabled() - get ESE feature enabled or not This is a synchronuous call \param hHal - The handle returned by macOpen. - \return TRUE (1) - if the CCX feature is enabled + \return TRUE (1) - if the ESE feature is enabled FALSE (0) - if feature is disabled (compile or runtime) \sa --------------------------------------------------------------------------*/ -tANI_BOOLEAN sme_getIsCcxFeatureEnabled(tHalHandle hHal) +tANI_BOOLEAN sme_getIsEseFeatureEnabled(tHalHandle hHal) { -#ifdef FEATURE_WLAN_CCX +#ifdef FEATURE_WLAN_ESE tpAniSirGlobal pMac = PMAC_STRUCT( hHal ); - return csrRoamIsCcxIniFeatureEnabled(pMac); + return csrRoamIsEseIniFeatureEnabled(pMac); #else return eANI_BOOLEAN_FALSE; #endif diff --git a/CORE/SYS/legacy/src/system/src/sysEntryFunc.c b/CORE/SYS/legacy/src/system/src/sysEntryFunc.c index 0feaf49fd5dc..7c7ccc981e83 100644 --- a/CORE/SYS/legacy/src/system/src/sysEntryFunc.c +++ b/CORE/SYS/legacy/src/system/src/sysEntryFunc.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. * @@ -199,7 +199,7 @@ sysBbtProcessMessageCore(tpAniSirGlobal pMac, tpSirMsgQ pMsg, tANI_U32 type, } /* fall through if ethType != TDLS, which is error case */ #endif -#ifdef FEATURE_WLAN_CCX +#ifdef FEATURE_WLAN_ESE PELOGW(sysLog(pMac, LOGW, FL("IAPP Frame...\n"));); //Post the message to PE Queue ret = (tSirRetStatus) limPostMsgApi(pMac, pMsg); diff --git a/CORE/SYS/legacy/src/utils/src/dot11f.c b/CORE/SYS/legacy/src/utils/src/dot11f.c index 86b0fb071fa5..d86e6cf4ef9e 100644 --- a/CORE/SYS/legacy/src/utils/src/dot11f.c +++ b/CORE/SYS/legacy/src/utils/src/dot11f.c @@ -36,7 +36,7 @@ * * * This file was automatically generated by 'framesc' - * Tue Jan 7 20:37:51 2014 from the following file(s): + * Fri Mar 21 17:49:18 2014 from the following file(s): * * dot11f.frms * @@ -2809,120 +2809,6 @@ tANI_U32 dot11fUnpackIeAirgo(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U8 ielen, #define SigIeAirgo ( 0x002e ) -tANI_U32 dot11fUnpackIeCCXCckmOpaque(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U8 ielen, tDot11fIECCXCckmOpaque *pDst) -{ - tANI_U32 status = DOT11F_PARSE_SUCCESS; - (void) pBuf; (void)ielen; /* Shutup the compiler */ - if (pDst->present) status = DOT11F_DUPLICATE_IE; - pDst->present = 1; - pDst->num_data = (tANI_U8)( ielen ); - if (ielen > 20){ - pDst->present = 0; - return DOT11F_SKIPPED_BAD_IE; - } - - DOT11F_MEMCPY(pCtx, pDst->data, pBuf, ( ielen ) ); - (void)pCtx; - return status; -} /* End dot11fUnpackIeCCXCckmOpaque. */ - -#define SigIeCCXCckmOpaque ( 0x002f ) - - -tANI_U32 dot11fUnpackIeCCXRadMgmtCap(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U8 ielen, tDot11fIECCXRadMgmtCap *pDst) -{ - tANI_U32 status = DOT11F_PARSE_SUCCESS; - tANI_U8 tmp32__; - (void) pBuf; (void)ielen; /* Shutup the compiler */ - if (pDst->present) status = DOT11F_DUPLICATE_IE; - pDst->present = 1; - pDst->mgmt_state = *pBuf; - pBuf += 1; - ielen -= (tANI_U8)1; - tmp32__ = *pBuf; - pDst->mbssid_mask = tmp32__ >> 0 & 0x7; - pDst->reserved = tmp32__ >> 3 & 0x1f; - (void)pCtx; - return status; -} /* End dot11fUnpackIeCCXRadMgmtCap. */ - -#define SigIeCCXRadMgmtCap ( 0x0030 ) - - -tANI_U32 dot11fUnpackIeCCXTrafStrmMet(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U8 ielen, tDot11fIECCXTrafStrmMet *pDst) -{ - tANI_U32 status = DOT11F_PARSE_SUCCESS; - (void) pBuf; (void)ielen; /* Shutup the compiler */ - if (pDst->present) status = DOT11F_DUPLICATE_IE; - pDst->present = 1; - pDst->tsid = *pBuf; - pBuf += 1; - ielen -= (tANI_U8)1; - pDst->state = *pBuf; - pBuf += 1; - ielen -= (tANI_U8)1; - framesntohs(pCtx, &pDst->msmt_interval, pBuf, 0); - (void)pCtx; - return status; -} /* End dot11fUnpackIeCCXTrafStrmMet. */ - -#define SigIeCCXTrafStrmMet ( 0x0031 ) - - -tANI_U32 dot11fUnpackIeCCXTrafStrmRateSet(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U8 ielen, tDot11fIECCXTrafStrmRateSet *pDst) -{ - tANI_U32 status = DOT11F_PARSE_SUCCESS; - (void) pBuf; (void)ielen; /* Shutup the compiler */ - if (pDst->present) status = DOT11F_DUPLICATE_IE; - pDst->present = 1; - pDst->tsid = *pBuf; - pBuf += 1; - ielen -= (tANI_U8)1; - pDst->num_tsrates = (tANI_U8)( ielen ); - if (ielen > 8){ - pDst->present = 0; - return DOT11F_SKIPPED_BAD_IE; - } - - DOT11F_MEMCPY(pCtx, pDst->tsrates, pBuf, ( ielen ) ); - (void)pCtx; - return status; -} /* End dot11fUnpackIeCCXTrafStrmRateSet. */ - -#define SigIeCCXTrafStrmRateSet ( 0x0032 ) - - -tANI_U32 dot11fUnpackIeCCXTxmitPower(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U8 ielen, tDot11fIECCXTxmitPower *pDst) -{ - tANI_U32 status = DOT11F_PARSE_SUCCESS; - (void) pBuf; (void)ielen; /* Shutup the compiler */ - if (pDst->present) status = DOT11F_DUPLICATE_IE; - pDst->present = 1; - pDst->power_limit = *pBuf; - pBuf += 1; - ielen -= (tANI_U8)1; - pDst->reserved = *pBuf; - (void)pCtx; - return status; -} /* End dot11fUnpackIeCCXTxmitPower. */ - -#define SigIeCCXTxmitPower ( 0x0033 ) - - -tANI_U32 dot11fUnpackIeCCXVersion(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U8 ielen, tDot11fIECCXVersion *pDst) -{ - tANI_U32 status = DOT11F_PARSE_SUCCESS; - (void) pBuf; (void)ielen; /* Shutup the compiler */ - if (pDst->present) status = DOT11F_DUPLICATE_IE; - pDst->present = 1; - pDst->version = *pBuf; - (void)pCtx; - return status; -} /* End dot11fUnpackIeCCXVersion. */ - -#define SigIeCCXVersion ( 0x0034 ) - - tANI_U32 dot11fUnpackIeCFParams(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U8 ielen, tDot11fIECFParams *pDst) { tANI_U32 status = DOT11F_PARSE_SUCCESS; @@ -2943,7 +2829,7 @@ tANI_U32 dot11fUnpackIeCFParams(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U8 iele return status; } /* End dot11fUnpackIeCFParams. */ -#define SigIeCFParams ( 0x0035 ) +#define SigIeCFParams ( 0x002f ) tANI_U32 dot11fUnpackIeChallengeText(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U8 ielen, tDot11fIEChallengeText *pDst) @@ -2963,7 +2849,7 @@ tANI_U32 dot11fUnpackIeChallengeText(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U8 return status; } /* End dot11fUnpackIeChallengeText. */ -#define SigIeChallengeText ( 0x0036 ) +#define SigIeChallengeText ( 0x0030 ) tANI_U32 dot11fUnpackIeChanSwitchAnn(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U8 ielen, tDot11fIEChanSwitchAnn *pDst) @@ -2983,7 +2869,7 @@ tANI_U32 dot11fUnpackIeChanSwitchAnn(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U8 return status; } /* End dot11fUnpackIeChanSwitchAnn. */ -#define SigIeChanSwitchAnn ( 0x0037 ) +#define SigIeChanSwitchAnn ( 0x0031 ) tANI_U32 dot11fUnpackIeCountry(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U8 ielen, tDot11fIECountry *pDst) @@ -3014,15 +2900,16 @@ tANI_U32 dot11fUnpackIeCountry(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U8 ielen return status; } /* End dot11fUnpackIeCountry. */ -#define SigIeCountry ( 0x0038 ) +#define SigIeCountry ( 0x0032 ) -#define SigIeDSParams ( 0x0039 ) +#define SigIeDSParams ( 0x0033 ) tANI_U32 dot11fUnpackIeEDCAParamSet(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U8 ielen, tDot11fIEEDCAParamSet *pDst) { tANI_U32 status = DOT11F_PARSE_SUCCESS; + tANI_U8 tmp32__; tANI_U8 tmp33__; tANI_U8 tmp34__; tANI_U8 tmp35__; @@ -3030,7 +2917,6 @@ tANI_U32 dot11fUnpackIeEDCAParamSet(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U8 tANI_U8 tmp37__; tANI_U8 tmp38__; tANI_U8 tmp39__; - tANI_U8 tmp40__; (void) pBuf; (void)ielen; /* Shutup the compiler */ if (pDst->present) status = DOT11F_DUPLICATE_IE; pDst->present = 1; @@ -3040,88 +2926,202 @@ tANI_U32 dot11fUnpackIeEDCAParamSet(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U8 pDst->reserved = *pBuf; pBuf += 1; ielen -= (tANI_U8)1; - tmp33__ = *pBuf; + tmp32__ = *pBuf; pBuf += 1; ielen -= 1; - pDst->acbe_aifsn = tmp33__ >> 0 & 0xf; - pDst->acbe_acm = tmp33__ >> 4 & 0x1; - pDst->acbe_aci = tmp33__ >> 5 & 0x3; - pDst->unused1 = tmp33__ >> 7 & 0x1; - tmp34__ = *pBuf; + pDst->acbe_aifsn = tmp32__ >> 0 & 0xf; + pDst->acbe_acm = tmp32__ >> 4 & 0x1; + pDst->acbe_aci = tmp32__ >> 5 & 0x3; + pDst->unused1 = tmp32__ >> 7 & 0x1; + tmp33__ = *pBuf; pBuf += 1; ielen -= 1; - pDst->acbe_acwmin = tmp34__ >> 0 & 0xf; - pDst->acbe_acwmax = tmp34__ >> 4 & 0xf; + pDst->acbe_acwmin = tmp33__ >> 0 & 0xf; + pDst->acbe_acwmax = tmp33__ >> 4 & 0xf; framesntohs(pCtx, &pDst->acbe_txoplimit, pBuf, 0); pBuf += 2; ielen -= (tANI_U8)2; - tmp35__ = *pBuf; + tmp34__ = *pBuf; pBuf += 1; ielen -= 1; - pDst->acbk_aifsn = tmp35__ >> 0 & 0xf; - pDst->acbk_acm = tmp35__ >> 4 & 0x1; - pDst->acbk_aci = tmp35__ >> 5 & 0x3; - pDst->unused2 = tmp35__ >> 7 & 0x1; - tmp36__ = *pBuf; + pDst->acbk_aifsn = tmp34__ >> 0 & 0xf; + pDst->acbk_acm = tmp34__ >> 4 & 0x1; + pDst->acbk_aci = tmp34__ >> 5 & 0x3; + pDst->unused2 = tmp34__ >> 7 & 0x1; + tmp35__ = *pBuf; pBuf += 1; ielen -= 1; - pDst->acbk_acwmin = tmp36__ >> 0 & 0xf; - pDst->acbk_acwmax = tmp36__ >> 4 & 0xf; + pDst->acbk_acwmin = tmp35__ >> 0 & 0xf; + pDst->acbk_acwmax = tmp35__ >> 4 & 0xf; framesntohs(pCtx, &pDst->acbk_txoplimit, pBuf, 0); pBuf += 2; ielen -= (tANI_U8)2; - tmp37__ = *pBuf; + tmp36__ = *pBuf; pBuf += 1; ielen -= 1; - pDst->acvi_aifsn = tmp37__ >> 0 & 0xf; - pDst->acvi_acm = tmp37__ >> 4 & 0x1; - pDst->acvi_aci = tmp37__ >> 5 & 0x3; - pDst->unused3 = tmp37__ >> 7 & 0x1; - tmp38__ = *pBuf; + pDst->acvi_aifsn = tmp36__ >> 0 & 0xf; + pDst->acvi_acm = tmp36__ >> 4 & 0x1; + pDst->acvi_aci = tmp36__ >> 5 & 0x3; + pDst->unused3 = tmp36__ >> 7 & 0x1; + tmp37__ = *pBuf; pBuf += 1; ielen -= 1; - pDst->acvi_acwmin = tmp38__ >> 0 & 0xf; - pDst->acvi_acwmax = tmp38__ >> 4 & 0xf; + pDst->acvi_acwmin = tmp37__ >> 0 & 0xf; + pDst->acvi_acwmax = tmp37__ >> 4 & 0xf; framesntohs(pCtx, &pDst->acvi_txoplimit, pBuf, 0); pBuf += 2; ielen -= (tANI_U8)2; - tmp39__ = *pBuf; + tmp38__ = *pBuf; pBuf += 1; ielen -= 1; - pDst->acvo_aifsn = tmp39__ >> 0 & 0xf; - pDst->acvo_acm = tmp39__ >> 4 & 0x1; - pDst->acvo_aci = tmp39__ >> 5 & 0x3; - pDst->unused4 = tmp39__ >> 7 & 0x1; - tmp40__ = *pBuf; + pDst->acvo_aifsn = tmp38__ >> 0 & 0xf; + pDst->acvo_acm = tmp38__ >> 4 & 0x1; + pDst->acvo_aci = tmp38__ >> 5 & 0x3; + pDst->unused4 = tmp38__ >> 7 & 0x1; + tmp39__ = *pBuf; pBuf += 1; ielen -= 1; - pDst->acvo_acwmin = tmp40__ >> 0 & 0xf; - pDst->acvo_acwmax = tmp40__ >> 4 & 0xf; + pDst->acvo_acwmin = tmp39__ >> 0 & 0xf; + pDst->acvo_acwmax = tmp39__ >> 4 & 0xf; framesntohs(pCtx, &pDst->acvo_txoplimit, pBuf, 0); (void)pCtx; return status; } /* End dot11fUnpackIeEDCAParamSet. */ -#define SigIeEDCAParamSet ( 0x003a ) +#define SigIeEDCAParamSet ( 0x0034 ) tANI_U32 dot11fUnpackIeERPInfo(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U8 ielen, tDot11fIEERPInfo *pDst) { tANI_U32 status = DOT11F_PARSE_SUCCESS; + tANI_U8 tmp40__; + (void) pBuf; (void)ielen; /* Shutup the compiler */ + if (pDst->present) status = DOT11F_DUPLICATE_IE; + pDst->present = 1; + tmp40__ = *pBuf; + pDst->non_erp_present = tmp40__ >> 0 & 0x1; + pDst->use_prot = tmp40__ >> 1 & 0x1; + pDst->barker_preamble = tmp40__ >> 2 & 0x1; + pDst->unused = tmp40__ >> 3 & 0x1f; + (void)pCtx; + return status; +} /* End dot11fUnpackIeERPInfo. */ + +#define SigIeERPInfo ( 0x0035 ) + + +tANI_U32 dot11fUnpackIeESECckmOpaque(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U8 ielen, tDot11fIEESECckmOpaque *pDst) +{ + tANI_U32 status = DOT11F_PARSE_SUCCESS; + (void) pBuf; (void)ielen; /* Shutup the compiler */ + if (pDst->present) status = DOT11F_DUPLICATE_IE; + pDst->present = 1; + pDst->num_data = (tANI_U8)( ielen ); + if (ielen > 20){ + pDst->present = 0; + return DOT11F_SKIPPED_BAD_IE; + } + + DOT11F_MEMCPY(pCtx, pDst->data, pBuf, ( ielen ) ); + (void)pCtx; + return status; +} /* End dot11fUnpackIeESECckmOpaque. */ + +#define SigIeESECckmOpaque ( 0x0036 ) + + +tANI_U32 dot11fUnpackIeESERadMgmtCap(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U8 ielen, tDot11fIEESERadMgmtCap *pDst) +{ + tANI_U32 status = DOT11F_PARSE_SUCCESS; tANI_U8 tmp41__; (void) pBuf; (void)ielen; /* Shutup the compiler */ if (pDst->present) status = DOT11F_DUPLICATE_IE; pDst->present = 1; + pDst->mgmt_state = *pBuf; + pBuf += 1; + ielen -= (tANI_U8)1; tmp41__ = *pBuf; - pDst->non_erp_present = tmp41__ >> 0 & 0x1; - pDst->use_prot = tmp41__ >> 1 & 0x1; - pDst->barker_preamble = tmp41__ >> 2 & 0x1; - pDst->unused = tmp41__ >> 3 & 0x1f; + pDst->mbssid_mask = tmp41__ >> 0 & 0x7; + pDst->reserved = tmp41__ >> 3 & 0x1f; (void)pCtx; return status; -} /* End dot11fUnpackIeERPInfo. */ +} /* End dot11fUnpackIeESERadMgmtCap. */ -#define SigIeERPInfo ( 0x003b ) +#define SigIeESERadMgmtCap ( 0x0037 ) + + +tANI_U32 dot11fUnpackIeESETrafStrmMet(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U8 ielen, tDot11fIEESETrafStrmMet *pDst) +{ + tANI_U32 status = DOT11F_PARSE_SUCCESS; + (void) pBuf; (void)ielen; /* Shutup the compiler */ + if (pDst->present) status = DOT11F_DUPLICATE_IE; + pDst->present = 1; + pDst->tsid = *pBuf; + pBuf += 1; + ielen -= (tANI_U8)1; + pDst->state = *pBuf; + pBuf += 1; + ielen -= (tANI_U8)1; + framesntohs(pCtx, &pDst->msmt_interval, pBuf, 0); + (void)pCtx; + return status; +} /* End dot11fUnpackIeESETrafStrmMet. */ + +#define SigIeESETrafStrmMet ( 0x0038 ) + + +tANI_U32 dot11fUnpackIeESETrafStrmRateSet(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U8 ielen, tDot11fIEESETrafStrmRateSet *pDst) +{ + tANI_U32 status = DOT11F_PARSE_SUCCESS; + (void) pBuf; (void)ielen; /* Shutup the compiler */ + if (pDst->present) status = DOT11F_DUPLICATE_IE; + pDst->present = 1; + pDst->tsid = *pBuf; + pBuf += 1; + ielen -= (tANI_U8)1; + pDst->num_tsrates = (tANI_U8)( ielen ); + if (ielen > 8){ + pDst->present = 0; + return DOT11F_SKIPPED_BAD_IE; + } + + DOT11F_MEMCPY(pCtx, pDst->tsrates, pBuf, ( ielen ) ); + (void)pCtx; + return status; +} /* End dot11fUnpackIeESETrafStrmRateSet. */ + +#define SigIeESETrafStrmRateSet ( 0x0039 ) + + +tANI_U32 dot11fUnpackIeESETxmitPower(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U8 ielen, tDot11fIEESETxmitPower *pDst) +{ + tANI_U32 status = DOT11F_PARSE_SUCCESS; + (void) pBuf; (void)ielen; /* Shutup the compiler */ + if (pDst->present) status = DOT11F_DUPLICATE_IE; + pDst->present = 1; + pDst->power_limit = *pBuf; + pBuf += 1; + ielen -= (tANI_U8)1; + pDst->reserved = *pBuf; + (void)pCtx; + return status; +} /* End dot11fUnpackIeESETxmitPower. */ + +#define SigIeESETxmitPower ( 0x003a ) + + +tANI_U32 dot11fUnpackIeESEVersion(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U8 ielen, tDot11fIEESEVersion *pDst) +{ + tANI_U32 status = DOT11F_PARSE_SUCCESS; + (void) pBuf; (void)ielen; /* Shutup the compiler */ + if (pDst->present) status = DOT11F_DUPLICATE_IE; + pDst->present = 1; + pDst->version = *pBuf; + (void)pCtx; + return status; +} /* End dot11fUnpackIeESEVersion. */ + +#define SigIeESEVersion ( 0x003b ) tANI_U32 dot11fUnpackIeExtCap(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U8 ielen, tDot11fIEExtCap *pDst) @@ -3348,23 +3348,6 @@ tANI_U32 dot11fUnpackIeFTInfo(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U8 ielen, #define SigIeFTInfo ( 0x0042 ) -tANI_U32 dot11fUnpackIeFTTimeoutInterval(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U8 ielen, tDot11fIEFTTimeoutInterval *pDst) -{ - tANI_U32 status = DOT11F_PARSE_SUCCESS; - (void) pBuf; (void)ielen; /* Shutup the compiler */ - if (pDst->present) status = DOT11F_DUPLICATE_IE; - pDst->present = 1; - pDst->timeoutType = *pBuf; - pBuf += 1; - ielen -= (tANI_U8)1; - framesntohl(pCtx, &pDst->timeoutValue, pBuf, 0); - (void)pCtx; - return status; -} /* End dot11fUnpackIeFTTimeoutInterval. */ - -#define SigIeFTTimeoutInterval ( 0x0043 ) - - tANI_U32 dot11fUnpackIeHTCaps(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U8 ielen, tDot11fIEHTCaps *pDst) { tANI_U32 status = DOT11F_PARSE_SUCCESS; @@ -3451,7 +3434,7 @@ tANI_U32 dot11fUnpackIeHTCaps(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U8 ielen, return status; } /* End dot11fUnpackIeHTCaps. */ -#define SigIeHTCaps ( 0x0044 ) +#define SigIeHTCaps ( 0x0043 ) tANI_U32 dot11fUnpackIeHTInfo(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U8 ielen, tDot11fIEHTInfo *pDst) @@ -3506,7 +3489,7 @@ tANI_U32 dot11fUnpackIeHTInfo(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U8 ielen, return status; } /* End dot11fUnpackIeHTInfo. */ -#define SigIeHTInfo ( 0x0045 ) +#define SigIeHTInfo ( 0x0044 ) tANI_U32 dot11fUnpackIeIBSSParams(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U8 ielen, tDot11fIEIBSSParams *pDst) @@ -3520,7 +3503,7 @@ tANI_U32 dot11fUnpackIeIBSSParams(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U8 ie return status; } /* End dot11fUnpackIeIBSSParams. */ -#define SigIeIBSSParams ( 0x0046 ) +#define SigIeIBSSParams ( 0x0045 ) tANI_U32 dot11fUnpackIeLinkIdentifier(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U8 ielen, tDot11fIELinkIdentifier *pDst) @@ -3540,7 +3523,7 @@ tANI_U32 dot11fUnpackIeLinkIdentifier(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U return status; } /* End dot11fUnpackIeLinkIdentifier. */ -#define SigIeLinkIdentifier ( 0x0047 ) +#define SigIeLinkIdentifier ( 0x0046 ) static const tFFDefn FFS_reportBeacon[ ] = { @@ -3698,7 +3681,7 @@ tANI_U32 dot11fUnpackIeMeasurementReport(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tAN return status; } /* End dot11fUnpackIeMeasurementReport. */ -#define SigIeMeasurementReport ( 0x0048 ) +#define SigIeMeasurementReport ( 0x0047 ) static const tFFDefn FFS_measurement_requestBeacon[ ] = { @@ -3803,7 +3786,7 @@ tANI_U32 dot11fUnpackIeMeasurementRequest(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tA return status; } /* End dot11fUnpackIeMeasurementRequest. */ -#define SigIeMeasurementRequest ( 0x0049 ) +#define SigIeMeasurementRequest ( 0x0048 ) tANI_U32 dot11fUnpackIeMobilityDomain(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U8 ielen, tDot11fIEMobilityDomain *pDst) @@ -3824,7 +3807,7 @@ tANI_U32 dot11fUnpackIeMobilityDomain(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U return status; } /* End dot11fUnpackIeMobilityDomain. */ -#define SigIeMobilityDomain ( 0x004a ) +#define SigIeMobilityDomain ( 0x0049 ) static const tFFDefn FFS_NeighborReport[ ] = { @@ -3891,7 +3874,39 @@ tANI_U32 dot11fUnpackIeNeighborReport(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U return status; } /* End dot11fUnpackIeNeighborReport. */ -#define SigIeNeighborReport ( 0x004b ) +#define SigIeNeighborReport ( 0x004a ) + + +tANI_U32 dot11fUnpackIeOBSSScanParameters(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U8 ielen, tDot11fIEOBSSScanParameters *pDst) +{ + tANI_U32 status = DOT11F_PARSE_SUCCESS; + (void) pBuf; (void)ielen; /* Shutup the compiler */ + if (pDst->present) status = DOT11F_DUPLICATE_IE; + pDst->present = 1; + framesntohs(pCtx, &pDst->obssScanPassiveDwell, pBuf, 0); + pBuf += 2; + ielen -= (tANI_U8)2; + framesntohs(pCtx, &pDst->obssScanActiveDwell, pBuf, 0); + pBuf += 2; + ielen -= (tANI_U8)2; + framesntohs(pCtx, &pDst->bssChannelWidthTriggerScanInterval, pBuf, 0); + pBuf += 2; + ielen -= (tANI_U8)2; + framesntohs(pCtx, &pDst->obssScanPassiveTotalPerChannel, pBuf, 0); + pBuf += 2; + ielen -= (tANI_U8)2; + framesntohs(pCtx, &pDst->obssScanActiveTotalPerChannel, pBuf, 0); + pBuf += 2; + ielen -= (tANI_U8)2; + framesntohs(pCtx, &pDst->bssWidthChannelTransitionDelayFactor, pBuf, 0); + pBuf += 2; + ielen -= (tANI_U8)2; + framesntohs(pCtx, &pDst->obssScanActivityThreshold, pBuf, 0); + (void)pCtx; + return status; +} /* End dot11fUnpackIeOBSSScanParameters. */ + +#define SigIeOBSSScanParameters ( 0x004b ) tANI_U32 dot11fUnpackIeOperatingMode(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U8 ielen, tDot11fIEOperatingMode *pDst) @@ -4456,6 +4471,26 @@ tANI_U32 dot11fUnpackIeQOSCapsStation(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U #define SigIeQOSCapsStation ( 0x0068 ) +tANI_U32 dot11fUnpackIeQosMapSet(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U8 ielen, tDot11fIEQosMapSet *pDst) +{ + tANI_U32 status = DOT11F_PARSE_SUCCESS; + (void) pBuf; (void)ielen; /* Shutup the compiler */ + if (pDst->present) status = DOT11F_DUPLICATE_IE; + pDst->present = 1; + pDst->num_dscp_exceptions = (tANI_U8)( ielen ); + if (ielen > 60){ + pDst->present = 0; + return DOT11F_SKIPPED_BAD_IE; + } + + DOT11F_MEMCPY(pCtx, pDst->dscp_exceptions, pBuf, ( ielen ) ); + (void)pCtx; + return status; +} /* End dot11fUnpackIeQosMapSet. */ + +#define SigIeQosMapSet ( 0x0069 ) + + tANI_U32 dot11fUnpackIeQuiet(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U8 ielen, tDot11fIEQuiet *pDst) { tANI_U32 status = DOT11F_PARSE_SUCCESS; @@ -4476,7 +4511,7 @@ tANI_U32 dot11fUnpackIeQuiet(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U8 ielen, return status; } /* End dot11fUnpackIeQuiet. */ -#define SigIeQuiet ( 0x0069 ) +#define SigIeQuiet ( 0x006a ) tANI_U32 dot11fUnpackIeRCPIIE(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U8 ielen, tDot11fIERCPIIE *pDst) @@ -4490,7 +4525,7 @@ tANI_U32 dot11fUnpackIeRCPIIE(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U8 ielen, return status; } /* End dot11fUnpackIeRCPIIE. */ -#define SigIeRCPIIE ( 0x006a ) +#define SigIeRCPIIE ( 0x006b ) static const tFFDefn FFS_RICDataDesc[ ] = { @@ -4530,7 +4565,7 @@ tANI_U32 dot11fUnpackIeRICDataDesc(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U8 i return status; } /* End dot11fUnpackIeRICDataDesc. */ -#define SigIeRICDataDesc ( 0x006b ) +#define SigIeRICDataDesc ( 0x006c ) tANI_U32 dot11fUnpackIeRSN(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U8 ielen, tDot11fIERSN *pDst) @@ -4633,7 +4668,7 @@ tANI_U32 dot11fUnpackIeRSN(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U8 ielen, tD return status; } /* End dot11fUnpackIeRSN. */ -#define SigIeRSN ( 0x006c ) +#define SigIeRSN ( 0x006d ) tANI_U32 dot11fUnpackIeRSNIIE(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U8 ielen, tDot11fIERSNIIE *pDst) @@ -4647,7 +4682,7 @@ tANI_U32 dot11fUnpackIeRSNIIE(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U8 ielen, return status; } /* End dot11fUnpackIeRSNIIE. */ -#define SigIeRSNIIE ( 0x006d ) +#define SigIeRSNIIE ( 0x006e ) tANI_U32 dot11fUnpackIeRSNOpaque(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U8 ielen, tDot11fIERSNOpaque *pDst) @@ -4667,7 +4702,7 @@ tANI_U32 dot11fUnpackIeRSNOpaque(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U8 iel return status; } /* End dot11fUnpackIeRSNOpaque. */ -#define SigIeRSNOpaque ( 0x006e ) +#define SigIeRSNOpaque ( 0x006f ) tANI_U32 dot11fUnpackIeSuppChannels(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U8 ielen, tDot11fIESuppChannels *pDst) @@ -4687,7 +4722,27 @@ tANI_U32 dot11fUnpackIeSuppChannels(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U8 return status; } /* End dot11fUnpackIeSuppChannels. */ -#define SigIeSuppChannels ( 0x006f ) +#define SigIeSuppChannels ( 0x0070 ) + + +tANI_U32 dot11fUnpackIeSuppOperatingClasses(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U8 ielen, tDot11fIESuppOperatingClasses *pDst) +{ + tANI_U32 status = DOT11F_PARSE_SUCCESS; + (void) pBuf; (void)ielen; /* Shutup the compiler */ + if (pDst->present) status = DOT11F_DUPLICATE_IE; + pDst->present = 1; + pDst->num_classes = (tANI_U8)( ielen ); + if (ielen > 32){ + pDst->present = 0; + return DOT11F_SKIPPED_BAD_IE; + } + + DOT11F_MEMCPY(pCtx, pDst->classes, pBuf, ( ielen ) ); + (void)pCtx; + return status; +} /* End dot11fUnpackIeSuppOperatingClasses. */ + +#define SigIeSuppOperatingClasses ( 0x0071 ) tANI_U32 dot11fUnpackIeSuppRates(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U8 ielen, tDot11fIESuppRates *pDst) @@ -4715,7 +4770,7 @@ tANI_U32 dot11fUnpackIeSuppRates(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U8 iel return status; } /* End dot11fUnpackIeSuppRates. */ -#define SigIeSuppRates ( 0x0070 ) +#define SigIeSuppRates ( 0x0072 ) tANI_U32 dot11fUnpackIeTIM(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U8 ielen, tDot11fIETIM *pDst) @@ -4744,7 +4799,7 @@ tANI_U32 dot11fUnpackIeTIM(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U8 ielen, tD return status; } /* End dot11fUnpackIeTIM. */ -#define SigIeTIM ( 0x0071 ) +#define SigIeTIM ( 0x0073 ) tANI_U32 dot11fUnpackIeTPCReport(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U8 ielen, tDot11fIETPCReport *pDst) @@ -4761,7 +4816,7 @@ tANI_U32 dot11fUnpackIeTPCReport(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U8 iel return status; } /* End dot11fUnpackIeTPCReport. */ -#define SigIeTPCReport ( 0x0072 ) +#define SigIeTPCReport ( 0x0074 ) tANI_U32 dot11fUnpackIeTPCRequest(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U8 ielen, tDot11fIETPCRequest *pDst) @@ -4774,7 +4829,24 @@ tANI_U32 dot11fUnpackIeTPCRequest(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U8 ie return status; } /* End dot11fUnpackIeTPCRequest. */ -#define SigIeTPCRequest ( 0x0073 ) +#define SigIeTPCRequest ( 0x0075 ) + + +tANI_U32 dot11fUnpackIeTimeoutInterval(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U8 ielen, tDot11fIETimeoutInterval *pDst) +{ + tANI_U32 status = DOT11F_PARSE_SUCCESS; + (void) pBuf; (void)ielen; /* Shutup the compiler */ + if (pDst->present) status = DOT11F_DUPLICATE_IE; + pDst->present = 1; + pDst->timeoutType = *pBuf; + pBuf += 1; + ielen -= (tANI_U8)1; + framesntohl(pCtx, &pDst->timeoutValue, pBuf, 0); + (void)pCtx; + return status; +} /* End dot11fUnpackIeTimeoutInterval. */ + +#define SigIeTimeoutInterval ( 0x0076 ) tANI_U32 dot11fUnpackIeVHTCaps(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U8 ielen, tDot11fIEVHTCaps *pDst) @@ -4827,7 +4899,7 @@ tANI_U32 dot11fUnpackIeVHTCaps(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U8 ielen return status; } /* End dot11fUnpackIeVHTCaps. */ -#define SigIeVHTCaps ( 0x0074 ) +#define SigIeVHTCaps ( 0x0077 ) tANI_U32 dot11fUnpackIeVHTExtBssLoad(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U8 ielen, tDot11fIEVHTExtBssLoad *pDst) @@ -4853,7 +4925,7 @@ tANI_U32 dot11fUnpackIeVHTExtBssLoad(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U8 return status; } /* End dot11fUnpackIeVHTExtBssLoad. */ -#define SigIeVHTExtBssLoad ( 0x0075 ) +#define SigIeVHTExtBssLoad ( 0x0078 ) tANI_U32 dot11fUnpackIeVHTOperation(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U8 ielen, tDot11fIEVHTOperation *pDst) @@ -4876,7 +4948,7 @@ tANI_U32 dot11fUnpackIeVHTOperation(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U8 return status; } /* End dot11fUnpackIeVHTOperation. */ -#define SigIeVHTOperation ( 0x0076 ) +#define SigIeVHTOperation ( 0x0079 ) tANI_U32 dot11fUnpackIeWAPI(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U8 ielen, tDot11fIEWAPI *pDst) @@ -4945,7 +5017,7 @@ tANI_U32 dot11fUnpackIeWAPI(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U8 ielen, t return status; } /* End dot11fUnpackIeWAPI. */ -#define SigIeWAPI ( 0x0077 ) +#define SigIeWAPI ( 0x007a ) tANI_U32 dot11fUnpackIeWAPIOpaque(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U8 ielen, tDot11fIEWAPIOpaque *pDst) @@ -4965,7 +5037,7 @@ tANI_U32 dot11fUnpackIeWAPIOpaque(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U8 ie return status; } /* End dot11fUnpackIeWAPIOpaque. */ -#define SigIeWAPIOpaque ( 0x0078 ) +#define SigIeWAPIOpaque ( 0x007b ) tANI_U32 dot11fUnpackIeWFATPC(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U8 ielen, tDot11fIEWFATPC *pDst) @@ -4982,7 +5054,7 @@ tANI_U32 dot11fUnpackIeWFATPC(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U8 ielen, return status; } /* End dot11fUnpackIeWFATPC. */ -#define SigIeWFATPC ( 0x0079 ) +#define SigIeWFATPC ( 0x007c ) tANI_U32 dot11fUnpackIeWFDIEOpaque(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U8 ielen, tDot11fIEWFDIEOpaque *pDst) @@ -5002,7 +5074,7 @@ tANI_U32 dot11fUnpackIeWFDIEOpaque(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U8 i return status; } /* End dot11fUnpackIeWFDIEOpaque. */ -#define SigIeWFDIEOpaque ( 0x007a ) +#define SigIeWFDIEOpaque ( 0x007d ) tANI_U32 dot11fUnpackIeWMMCaps(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U8 ielen, tDot11fIEWMMCaps *pDst) @@ -5030,7 +5102,7 @@ tANI_U32 dot11fUnpackIeWMMCaps(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U8 ielen return status; } /* End dot11fUnpackIeWMMCaps. */ -#define SigIeWMMCaps ( 0x007b ) +#define SigIeWMMCaps ( 0x007e ) tANI_U32 dot11fUnpackIeWMMInfoAp(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U8 ielen, tDot11fIEWMMInfoAp *pDst) @@ -5051,7 +5123,7 @@ tANI_U32 dot11fUnpackIeWMMInfoAp(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U8 iel return status; } /* End dot11fUnpackIeWMMInfoAp. */ -#define SigIeWMMInfoAp ( 0x007c ) +#define SigIeWMMInfoAp ( 0x007f ) tANI_U32 dot11fUnpackIeWMMInfoStation(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U8 ielen, tDot11fIEWMMInfoStation *pDst) @@ -5076,7 +5148,7 @@ tANI_U32 dot11fUnpackIeWMMInfoStation(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U return status; } /* End dot11fUnpackIeWMMInfoStation. */ -#define SigIeWMMInfoStation ( 0x007d ) +#define SigIeWMMInfoStation ( 0x0080 ) tANI_U32 dot11fUnpackIeWMMParams(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U8 ielen, tDot11fIEWMMParams *pDst) @@ -5169,7 +5241,7 @@ tANI_U32 dot11fUnpackIeWMMParams(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U8 iel return status; } /* End dot11fUnpackIeWMMParams. */ -#define SigIeWMMParams ( 0x007e ) +#define SigIeWMMParams ( 0x0081 ) tANI_U32 dot11fUnpackIeWPA(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U8 ielen, tDot11fIEWPA *pDst) @@ -5251,7 +5323,7 @@ tANI_U32 dot11fUnpackIeWPA(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U8 ielen, tD return status; } /* End dot11fUnpackIeWPA. */ -#define SigIeWPA ( 0x007f ) +#define SigIeWPA ( 0x0082 ) tANI_U32 dot11fUnpackIeWPAOpaque(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U8 ielen, tDot11fIEWPAOpaque *pDst) @@ -5271,7 +5343,7 @@ tANI_U32 dot11fUnpackIeWPAOpaque(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U8 iel return status; } /* End dot11fUnpackIeWPAOpaque. */ -#define SigIeWPAOpaque ( 0x0080 ) +#define SigIeWPAOpaque ( 0x0083 ) static const tTLVDefn TLVS_WSC[ ] = { @@ -5309,7 +5381,7 @@ tANI_U32 dot11fUnpackIeWSC(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U8 ielen, tD return status; } /* End dot11fUnpackIeWSC. */ -#define SigIeWSC ( 0x0081 ) +#define SigIeWSC ( 0x0084 ) tANI_U32 dot11fUnpackIeWiderBWChanSwitchAnn(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U8 ielen, tDot11fIEWiderBWChanSwitchAnn *pDst) @@ -5329,7 +5401,7 @@ tANI_U32 dot11fUnpackIeWiderBWChanSwitchAnn(tpAniSirGlobal pCtx, tANI_U8 *pBuf, return status; } /* End dot11fUnpackIeWiderBWChanSwitchAnn. */ -#define SigIeWiderBWChanSwitchAnn ( 0x0082 ) +#define SigIeWiderBWChanSwitchAnn ( 0x0085 ) static const tTLVDefn TLVS_WscAssocReq[ ] = { @@ -5348,7 +5420,7 @@ tANI_U32 dot11fUnpackIeWscAssocReq(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U8 i return status; } /* End dot11fUnpackIeWscAssocReq. */ -#define SigIeWscAssocReq ( 0x0083 ) +#define SigIeWscAssocReq ( 0x0086 ) static const tTLVDefn TLVS_WscAssocRes[ ] = { @@ -5367,7 +5439,7 @@ tANI_U32 dot11fUnpackIeWscAssocRes(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U8 i return status; } /* End dot11fUnpackIeWscAssocRes. */ -#define SigIeWscAssocRes ( 0x0084 ) +#define SigIeWscAssocRes ( 0x0087 ) static const tTLVDefn TLVS_WscBeacon[ ] = { @@ -5392,7 +5464,7 @@ tANI_U32 dot11fUnpackIeWscBeacon(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U8 iel return status; } /* End dot11fUnpackIeWscBeacon. */ -#define SigIeWscBeacon ( 0x0085 ) +#define SigIeWscBeacon ( 0x0088 ) static const tTLVDefn TLVS_WscBeaconProbeRes[ ] = { @@ -5425,7 +5497,7 @@ tANI_U32 dot11fUnpackIeWscBeaconProbeRes(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tAN return status; } /* End dot11fUnpackIeWscBeaconProbeRes. */ -#define SigIeWscBeaconProbeRes ( 0x0086 ) +#define SigIeWscBeaconProbeRes ( 0x0089 ) tANI_U32 dot11fUnpackIeWscIEOpaque(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U8 ielen, tDot11fIEWscIEOpaque *pDst) @@ -5445,7 +5517,7 @@ tANI_U32 dot11fUnpackIeWscIEOpaque(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U8 i return status; } /* End dot11fUnpackIeWscIEOpaque. */ -#define SigIeWscIEOpaque ( 0x0087 ) +#define SigIeWscIEOpaque ( 0x008a ) static const tTLVDefn TLVS_WscProbeReq[ ] = { @@ -5476,7 +5548,7 @@ tANI_U32 dot11fUnpackIeWscProbeReq(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U8 i return status; } /* End dot11fUnpackIeWscProbeReq. */ -#define SigIeWscProbeReq ( 0x0088 ) +#define SigIeWscProbeReq ( 0x008b ) static const tTLVDefn TLVS_WscProbeRes[ ] = { @@ -5509,7 +5581,7 @@ tANI_U32 dot11fUnpackIeWscProbeRes(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U8 i return status; } /* End dot11fUnpackIeWscProbeRes. */ -#define SigIeWscProbeRes ( 0x0089 ) +#define SigIeWscProbeRes ( 0x008c ) static const tTLVDefn TLVS_WscReassocRes[ ] = { @@ -5528,7 +5600,7 @@ tANI_U32 dot11fUnpackIeWscReassocRes(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U8 return status; } /* End dot11fUnpackIeWscReassocRes. */ -#define SigIeWscReassocRes ( 0x008a ) +#define SigIeWscReassocRes ( 0x008d ) static const tFFDefn FFS_AddBAReq[] = { @@ -5640,7 +5712,7 @@ tANI_U32 dot11fUnpackAddBARsp(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U32 nBuf, {offsetof(tDot11fAddTSRequest, WMMTSPEC), offsetof(tDot11fIEWMMTSPEC, present), 0, "WMMTSPEC" , 0, 63, 63, SigIeWMMTSPEC, {0, 80, 242, 2, 2}, 5, DOT11F_EID_WMMTSPEC, 0, }, {offsetof(tDot11fAddTSRequest, WMMTCLAS), offsetof(tDot11fIEWMMTCLAS, present), offsetof(tDot11fAddTSRequest, num_WMMTCLAS), "WMMTCLAS" , 2, 13, 51, SigIeWMMTCLAS, {0, 80, 242, 2, 6}, 5, DOT11F_EID_WMMTCLAS, 0, }, {offsetof(tDot11fAddTSRequest, WMMTCLASPROC), offsetof(tDot11fIEWMMTCLASPROC, present), 0, "WMMTCLASPROC" , 0, 9, 9, SigIeWMMTCLASPROC, {0, 80, 242, 2, 7}, 5, DOT11F_EID_WMMTCLASPROC, 0, }, - {offsetof(tDot11fAddTSRequest, CCXTrafStrmRateSet), offsetof(tDot11fIECCXTrafStrmRateSet, present), 0, "CCXTrafStrmRateSet" , 0, 7, 15, SigIeCCXTrafStrmRateSet, {0, 64, 150, 8, 0}, 4, DOT11F_EID_CCXTRAFSTRMRATESET, 0, }, + {offsetof(tDot11fAddTSRequest, ESETrafStrmRateSet), offsetof(tDot11fIEESETrafStrmRateSet, present), 0, "ESETrafStrmRateSet" , 0, 7, 15, SigIeESETrafStrmRateSet, {0, 64, 150, 8, 0}, 4, DOT11F_EID_ESETRAFSTRMRATESET, 0, }, {0, 0, 0, NULL, 0, 0, 0, 0, {0, 0, 0, 0, 0}, 0, 0xff, 0, }, }; tANI_U32 dot11fUnpackAddTSRequest(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U32 nBuf, tDot11fAddTSRequest *pFrm) @@ -5845,16 +5917,16 @@ tANI_U32 dot11fUnpackAddTSRequest(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U32 n FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ADDTSREQUEST), ( tANI_U8* )&pFrm->WMMTCLASPROC.version, 1); FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ADDTSREQUEST), ( tANI_U8* )&pFrm->WMMTCLASPROC.processing, 1); } - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ADDTSREQUEST), FRFL("CCXTrafStrmRateSet:\n")); - if (!pFrm->CCXTrafStrmRateSet.present) + FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ADDTSREQUEST), FRFL("ESETrafStrmRateSet:\n")); + if (!pFrm->ESETrafStrmRateSet.present) { FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ADDTSREQUEST), FRFL("Not present.\n")); } else { - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ADDTSREQUEST), ( tANI_U8* )&pFrm->CCXTrafStrmRateSet.tsid, 1); - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ADDTSREQUEST), FRFL("num_tsrates: %d.\n"), pFrm->CCXTrafStrmRateSet.num_tsrates); - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ADDTSREQUEST), ( tANI_U8* ) pFrm->CCXTrafStrmRateSet.tsrates, pFrm->CCXTrafStrmRateSet.num_tsrates); + FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ADDTSREQUEST), ( tANI_U8* )&pFrm->ESETrafStrmRateSet.tsid, 1); + FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ADDTSREQUEST), FRFL("num_tsrates: %d.\n"), pFrm->ESETrafStrmRateSet.num_tsrates); + FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ADDTSREQUEST), ( tANI_U8* ) pFrm->ESETrafStrmRateSet.tsrates, pFrm->ESETrafStrmRateSet.num_tsrates); } } # endif // DOT11F_DUMP_FRAMES @@ -5881,7 +5953,7 @@ tANI_U32 dot11fUnpackAddTSRequest(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U32 n {offsetof(tDot11fAddTSResponse, WMMTSPEC), offsetof(tDot11fIEWMMTSPEC, present), 0, "WMMTSPEC" , 0, 63, 63, SigIeWMMTSPEC, {0, 80, 242, 2, 2}, 5, DOT11F_EID_WMMTSPEC, 0, }, {offsetof(tDot11fAddTSResponse, WMMTCLAS), offsetof(tDot11fIEWMMTCLAS, present), offsetof(tDot11fAddTSResponse, num_WMMTCLAS), "WMMTCLAS" , 2, 13, 51, SigIeWMMTCLAS, {0, 80, 242, 2, 6}, 5, DOT11F_EID_WMMTCLAS, 0, }, {offsetof(tDot11fAddTSResponse, WMMTCLASPROC), offsetof(tDot11fIEWMMTCLASPROC, present), 0, "WMMTCLASPROC" , 0, 9, 9, SigIeWMMTCLASPROC, {0, 80, 242, 2, 7}, 5, DOT11F_EID_WMMTCLASPROC, 0, }, - {offsetof(tDot11fAddTSResponse, CCXTrafStrmMet), offsetof(tDot11fIECCXTrafStrmMet, present), 0, "CCXTrafStrmMet" , 0, 10, 10, SigIeCCXTrafStrmMet, {0, 64, 150, 7, 0}, 4, DOT11F_EID_CCXTRAFSTRMMET, 0, }, + {offsetof(tDot11fAddTSResponse, ESETrafStrmMet), offsetof(tDot11fIEESETrafStrmMet, present), 0, "ESETrafStrmMet" , 0, 10, 10, SigIeESETrafStrmMet, {0, 64, 150, 7, 0}, 4, DOT11F_EID_ESETRAFSTRMMET, 0, }, {0, 0, 0, NULL, 0, 0, 0, 0, {0, 0, 0, 0, 0}, 0, 0xff, 0, }, }; tANI_U32 dot11fUnpackAddTSResponse(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U32 nBuf, tDot11fAddTSResponse *pFrm) @@ -6140,16 +6212,16 @@ tANI_U32 dot11fUnpackAddTSResponse(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U32 FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ADDTSRESPONSE), ( tANI_U8* )&pFrm->WMMTCLASPROC.version, 1); FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ADDTSRESPONSE), ( tANI_U8* )&pFrm->WMMTCLASPROC.processing, 1); } - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ADDTSRESPONSE), FRFL("CCXTrafStrmMet:\n")); - if (!pFrm->CCXTrafStrmMet.present) + FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ADDTSRESPONSE), FRFL("ESETrafStrmMet:\n")); + if (!pFrm->ESETrafStrmMet.present) { FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ADDTSRESPONSE), FRFL("Not present.\n")); } else { - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ADDTSRESPONSE), ( tANI_U8* )&pFrm->CCXTrafStrmMet.tsid, 1); - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ADDTSRESPONSE), ( tANI_U8* )&pFrm->CCXTrafStrmMet.state, 1); - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ADDTSRESPONSE), ( tANI_U8* )&pFrm->CCXTrafStrmMet.msmt_interval, 2); + FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ADDTSRESPONSE), ( tANI_U8* )&pFrm->ESETrafStrmMet.tsid, 1); + FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ADDTSRESPONSE), ( tANI_U8* )&pFrm->ESETrafStrmMet.state, 1); + FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ADDTSRESPONSE), ( tANI_U8* )&pFrm->ESETrafStrmMet.msmt_interval, 2); } } # endif // DOT11F_DUMP_FRAMES @@ -6180,13 +6252,14 @@ tANI_U32 dot11fUnpackAddTSResponse(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U32 {offsetof(tDot11fAssocRequest, Airgo), offsetof(tDot11fIEAirgo, present), 0, "Airgo" , 0, 5, 232, SigIeAirgo, {0, 10, 245, 0, 0}, 3, DOT11F_EID_AIRGO, 0, }, {offsetof(tDot11fAssocRequest, WscIEOpaque), offsetof(tDot11fIEWscIEOpaque, present), 0, "WscIEOpaque" , 0, 8, 255, SigIeWscIEOpaque, {0, 80, 242, 4, 0}, 4, DOT11F_EID_WSCIEOPAQUE, 0, }, {offsetof(tDot11fAssocRequest, WAPIOpaque), offsetof(tDot11fIEWAPIOpaque, present), 0, "WAPIOpaque" , 0, 8, 255, SigIeWAPIOpaque, {0, 0, 0, 0, 0}, 0, DOT11F_EID_WAPIOPAQUE, 0, }, - {offsetof(tDot11fAssocRequest, CCXRadMgmtCap), offsetof(tDot11fIECCXRadMgmtCap, present), 0, "CCXRadMgmtCap" , 0, 8, 8, SigIeCCXRadMgmtCap, {0, 64, 150, 1, 0}, 4, DOT11F_EID_CCXRADMGMTCAP, 0, }, - {offsetof(tDot11fAssocRequest, CCXVersion), offsetof(tDot11fIECCXVersion, present), 0, "CCXVersion" , 0, 7, 7, SigIeCCXVersion, {0, 64, 150, 3, 0}, 4, DOT11F_EID_CCXVERSION, 0, }, + {offsetof(tDot11fAssocRequest, ESERadMgmtCap), offsetof(tDot11fIEESERadMgmtCap, present), 0, "ESERadMgmtCap" , 0, 8, 8, SigIeESERadMgmtCap, {0, 64, 150, 1, 0}, 4, DOT11F_EID_ESERADMGMTCAP, 0, }, + {offsetof(tDot11fAssocRequest, ESEVersion), offsetof(tDot11fIEESEVersion, present), 0, "ESEVersion" , 0, 7, 7, SigIeESEVersion, {0, 64, 150, 3, 0}, 4, DOT11F_EID_ESEVERSION, 0, }, {offsetof(tDot11fAssocRequest, P2PIEOpaque), offsetof(tDot11fIEP2PIEOpaque, present), 0, "P2PIEOpaque" , 0, 8, 255, SigIeP2PIEOpaque, {80, 111, 154, 9, 0}, 4, DOT11F_EID_P2PIEOPAQUE, 0, }, {offsetof(tDot11fAssocRequest, WFDIEOpaque), offsetof(tDot11fIEWFDIEOpaque, present), 0, "WFDIEOpaque" , 0, 8, 255, SigIeWFDIEOpaque, {80, 111, 154, 10, 0}, 4, DOT11F_EID_WFDIEOPAQUE, 0, }, {offsetof(tDot11fAssocRequest, VHTCaps), offsetof(tDot11fIEVHTCaps, present), 0, "VHTCaps" , 0, 14, 14, SigIeVHTCaps, {0, 0, 0, 0, 0}, 0, DOT11F_EID_VHTCAPS, 0, }, {offsetof(tDot11fAssocRequest, ExtCap), offsetof(tDot11fIEExtCap, present), 0, "ExtCap" , 0, 10, 10, SigIeExtCap, {0, 0, 0, 0, 0}, 0, DOT11F_EID_EXTCAP, 0, }, {offsetof(tDot11fAssocRequest, OperatingMode), offsetof(tDot11fIEOperatingMode, present), 0, "OperatingMode" , 0, 3, 3, SigIeOperatingMode, {0, 0, 0, 0, 0}, 0, DOT11F_EID_OPERATINGMODE, 0, }, + {offsetof(tDot11fAssocRequest, QosMapSet), offsetof(tDot11fIEQosMapSet, present), 0, "QosMapSet" , 0, 2, 62, SigIeQosMapSet, {0, 0, 0, 0, 0}, 0, DOT11F_EID_QOSMAPSET, 0, }, {0, 0, 0, NULL, 0, 0, 0, 0, {0, 0, 0, 0, 0}, 0, 0xff, 0, }, }; tANI_U32 dot11fUnpackAssocRequest(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U32 nBuf, tDot11fAssocRequest *pFrm) @@ -6673,25 +6746,25 @@ tANI_U32 dot11fUnpackAssocRequest(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U32 n FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCREQUEST), FRFL("num_data: %d.\n"), pFrm->WAPIOpaque.num_data); FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCREQUEST), ( tANI_U8* ) pFrm->WAPIOpaque.data, pFrm->WAPIOpaque.num_data); } - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCREQUEST), FRFL("CCXRadMgmtCap:\n")); - if (!pFrm->CCXRadMgmtCap.present) + FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCREQUEST), FRFL("ESERadMgmtCap:\n")); + if (!pFrm->ESERadMgmtCap.present) { FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCREQUEST), FRFL("Not present.\n")); } else { - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCREQUEST), ( tANI_U8* )&pFrm->CCXRadMgmtCap.mgmt_state, 1); - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCREQUEST), FRFL("mbssid_mask (3): %d\n"), pFrm->CCXRadMgmtCap.mbssid_mask); - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCREQUEST), FRFL("reserved (5): %d\n"), pFrm->CCXRadMgmtCap.reserved); + FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCREQUEST), ( tANI_U8* )&pFrm->ESERadMgmtCap.mgmt_state, 1); + FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCREQUEST), FRFL("mbssid_mask (3): %d\n"), pFrm->ESERadMgmtCap.mbssid_mask); + FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCREQUEST), FRFL("reserved (5): %d\n"), pFrm->ESERadMgmtCap.reserved); } - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCREQUEST), FRFL("CCXVersion:\n")); - if (!pFrm->CCXVersion.present) + FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCREQUEST), FRFL("ESEVersion:\n")); + if (!pFrm->ESEVersion.present) { FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCREQUEST), FRFL("Not present.\n")); } else { - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCREQUEST), ( tANI_U8* )&pFrm->CCXVersion.version, 1); + FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCREQUEST), ( tANI_U8* )&pFrm->ESEVersion.version, 1); } FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCREQUEST), FRFL("P2PIEOpaque:\n")); if (!pFrm->P2PIEOpaque.present) @@ -6818,6 +6891,16 @@ tANI_U32 dot11fUnpackAssocRequest(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U32 n FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCREQUEST), FRFL("rxNSS (3): %d\n"), pFrm->OperatingMode.rxNSS); FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCREQUEST), FRFL("rxNSSType (1): %d\n"), pFrm->OperatingMode.rxNSSType); } + FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCREQUEST), FRFL("QosMapSet:\n")); + if (!pFrm->QosMapSet.present) + { + FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCREQUEST), FRFL("Not present.\n")); + } + else + { + FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCREQUEST), FRFL("num_dscp_exceptions: %d.\n"), pFrm->QosMapSet.num_dscp_exceptions); + FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCREQUEST), ( tANI_U8* ) pFrm->QosMapSet.dscp_exceptions, pFrm->QosMapSet.num_dscp_exceptions); + } } # endif // DOT11F_DUMP_FRAMES return status; @@ -6842,13 +6925,14 @@ tANI_U32 dot11fUnpackAssocRequest(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U32 n {offsetof(tDot11fAssocResponse, FTInfo), offsetof(tDot11fIEFTInfo, present), 0, "FTInfo" , 0, 84, 222, SigIeFTInfo, {0, 0, 0, 0, 0}, 0, DOT11F_EID_FTINFO, 0, }, {offsetof(tDot11fAssocResponse, RICDataDesc), offsetof(tDot11fIERICDataDesc, present), offsetof(tDot11fAssocResponse, num_RICDataDesc), "RICDataDesc" , 2, 2, 550, SigIeRICDataDesc, {0, 0, 0, 0, 0}, 0, DOT11F_EID_RICDATADESC, 0, }, {offsetof(tDot11fAssocResponse, WPA), offsetof(tDot11fIEWPA, present), 0, "WPA" , 0, 8, 50, SigIeWPA, {0, 80, 242, 1, 0}, 4, DOT11F_EID_WPA, 0, }, + {offsetof(tDot11fAssocResponse, TimeoutInterval), offsetof(tDot11fIETimeoutInterval, present), 0, "TimeoutInterval" , 0, 7, 7, SigIeTimeoutInterval, {0, 0, 0, 0, 0}, 0, DOT11F_EID_TIMEOUTINTERVAL, 0, }, {offsetof(tDot11fAssocResponse, HTCaps), offsetof(tDot11fIEHTCaps, present), 0, "HTCaps" , 0, 28, 60, SigIeHTCaps, {0, 0, 0, 0, 0}, 0, DOT11F_EID_HTCAPS, 0, }, {offsetof(tDot11fAssocResponse, HTInfo), offsetof(tDot11fIEHTInfo, present), 0, "HTInfo" , 0, 24, 56, SigIeHTInfo, {0, 0, 0, 0, 0}, 0, DOT11F_EID_HTINFO, 0, }, {offsetof(tDot11fAssocResponse, WMMParams), offsetof(tDot11fIEWMMParams, present), 0, "WMMParams" , 0, 26, 26, SigIeWMMParams, {0, 80, 242, 2, 1}, 5, DOT11F_EID_WMMPARAMS, 0, }, {offsetof(tDot11fAssocResponse, WMMCaps), offsetof(tDot11fIEWMMCaps, present), 0, "WMMCaps" , 0, 9, 9, SigIeWMMCaps, {0, 80, 242, 2, 5}, 5, DOT11F_EID_WMMCAPS, 0, }, - {offsetof(tDot11fAssocResponse, CCXRadMgmtCap), offsetof(tDot11fIECCXRadMgmtCap, present), 0, "CCXRadMgmtCap" , 0, 8, 8, SigIeCCXRadMgmtCap, {0, 64, 150, 1, 0}, 4, DOT11F_EID_CCXRADMGMTCAP, 0, }, - {offsetof(tDot11fAssocResponse, CCXTrafStrmMet), offsetof(tDot11fIECCXTrafStrmMet, present), 0, "CCXTrafStrmMet" , 0, 10, 10, SigIeCCXTrafStrmMet, {0, 64, 150, 7, 0}, 4, DOT11F_EID_CCXTRAFSTRMMET, 0, }, - {offsetof(tDot11fAssocResponse, CCXTxmitPower), offsetof(tDot11fIECCXTxmitPower, present), 0, "CCXTxmitPower" , 0, 8, 8, SigIeCCXTxmitPower, {0, 64, 150, 0, 0}, 4, DOT11F_EID_CCXTXMITPOWER, 0, }, + {offsetof(tDot11fAssocResponse, ESERadMgmtCap), offsetof(tDot11fIEESERadMgmtCap, present), 0, "ESERadMgmtCap" , 0, 8, 8, SigIeESERadMgmtCap, {0, 64, 150, 1, 0}, 4, DOT11F_EID_ESERADMGMTCAP, 0, }, + {offsetof(tDot11fAssocResponse, ESETrafStrmMet), offsetof(tDot11fIEESETrafStrmMet, present), 0, "ESETrafStrmMet" , 0, 10, 10, SigIeESETrafStrmMet, {0, 64, 150, 7, 0}, 4, DOT11F_EID_ESETRAFSTRMMET, 0, }, + {offsetof(tDot11fAssocResponse, ESETxmitPower), offsetof(tDot11fIEESETxmitPower, present), 0, "ESETxmitPower" , 0, 8, 8, SigIeESETxmitPower, {0, 64, 150, 0, 0}, 4, DOT11F_EID_ESETXMITPOWER, 0, }, {offsetof(tDot11fAssocResponse, WMMTSPEC), offsetof(tDot11fIEWMMTSPEC, present), offsetof(tDot11fAssocResponse, num_WMMTSPEC), "WMMTSPEC" , 4, 63, 63, SigIeWMMTSPEC, {0, 80, 242, 2, 2}, 5, DOT11F_EID_WMMTSPEC, 0, }, {offsetof(tDot11fAssocResponse, Airgo), offsetof(tDot11fIEAirgo, present), 0, "Airgo" , 0, 5, 232, SigIeAirgo, {0, 10, 245, 0, 0}, 3, DOT11F_EID_AIRGO, 0, }, {offsetof(tDot11fAssocResponse, WscAssocRes), offsetof(tDot11fIEWscAssocRes, present), 0, "WscAssocRes" , 0, 6, 37, SigIeWscAssocRes, {0, 80, 242, 4, 0}, 4, DOT11F_EID_WSCASSOCRES, 0, }, @@ -6856,6 +6940,8 @@ tANI_U32 dot11fUnpackAssocRequest(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U32 n {offsetof(tDot11fAssocResponse, VHTCaps), offsetof(tDot11fIEVHTCaps, present), 0, "VHTCaps" , 0, 14, 14, SigIeVHTCaps, {0, 0, 0, 0, 0}, 0, DOT11F_EID_VHTCAPS, 0, }, {offsetof(tDot11fAssocResponse, VHTOperation), offsetof(tDot11fIEVHTOperation, present), 0, "VHTOperation" , 0, 7, 7, SigIeVHTOperation, {0, 0, 0, 0, 0}, 0, DOT11F_EID_VHTOPERATION, 0, }, {offsetof(tDot11fAssocResponse, ExtCap), offsetof(tDot11fIEExtCap, present), 0, "ExtCap" , 0, 10, 10, SigIeExtCap, {0, 0, 0, 0, 0}, 0, DOT11F_EID_EXTCAP, 0, }, + {offsetof(tDot11fAssocResponse, OBSSScanParameters), offsetof(tDot11fIEOBSSScanParameters, present), 0, "OBSSScanParameters" , 0, 16, 16, SigIeOBSSScanParameters, {0, 0, 0, 0, 0}, 0, DOT11F_EID_OBSSSCANPARAMETERS, 0, }, + {offsetof(tDot11fAssocResponse, QosMapSet), offsetof(tDot11fIEQosMapSet, present), 0, "QosMapSet" , 0, 2, 62, SigIeQosMapSet, {0, 0, 0, 0, 0}, 0, DOT11F_EID_QOSMAPSET, 0, }, {0, 0, 0, NULL, 0, 0, 0, 0, {0, 0, 0, 0, 0}, 0, 0xff, 0, }, }; tANI_U32 dot11fUnpackAssocResponse(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U32 nBuf, tDot11fAssocResponse *pFrm) @@ -7358,6 +7444,16 @@ tANI_U32 dot11fUnpackAssocResponse(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U32 FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCRESPONSE), ( tANI_U8* ) pFrm->WPA.auth_suites, 4 * pFrm->WPA.auth_suite_count); FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCRESPONSE), ( tANI_U8* )&pFrm->WPA.caps, 2); } + FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCRESPONSE), FRFL("TimeoutInterval:\n")); + if (!pFrm->TimeoutInterval.present) + { + FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCRESPONSE), FRFL("Not present.\n")); + } + else + { + FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCRESPONSE), ( tANI_U8* )&pFrm->TimeoutInterval.timeoutType, 1); + FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCRESPONSE), ( tANI_U8* )&pFrm->TimeoutInterval.timeoutValue, 4); + } FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCRESPONSE), FRFL("HTCaps:\n")); if (!pFrm->HTCaps.present) { @@ -7497,37 +7593,37 @@ tANI_U32 dot11fUnpackAssocResponse(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U32 FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCRESPONSE), FRFL("txop_request (1): %d\n"), pFrm->WMMCaps.txop_request); FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCRESPONSE), FRFL("more_ack (1): %d\n"), pFrm->WMMCaps.more_ack); } - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCRESPONSE), FRFL("CCXRadMgmtCap:\n")); - if (!pFrm->CCXRadMgmtCap.present) + FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCRESPONSE), FRFL("ESERadMgmtCap:\n")); + if (!pFrm->ESERadMgmtCap.present) { FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCRESPONSE), FRFL("Not present.\n")); } else { - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCRESPONSE), ( tANI_U8* )&pFrm->CCXRadMgmtCap.mgmt_state, 1); - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCRESPONSE), FRFL("mbssid_mask (3): %d\n"), pFrm->CCXRadMgmtCap.mbssid_mask); - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCRESPONSE), FRFL("reserved (5): %d\n"), pFrm->CCXRadMgmtCap.reserved); + FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCRESPONSE), ( tANI_U8* )&pFrm->ESERadMgmtCap.mgmt_state, 1); + FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCRESPONSE), FRFL("mbssid_mask (3): %d\n"), pFrm->ESERadMgmtCap.mbssid_mask); + FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCRESPONSE), FRFL("reserved (5): %d\n"), pFrm->ESERadMgmtCap.reserved); } - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCRESPONSE), FRFL("CCXTrafStrmMet:\n")); - if (!pFrm->CCXTrafStrmMet.present) + FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCRESPONSE), FRFL("ESETrafStrmMet:\n")); + if (!pFrm->ESETrafStrmMet.present) { FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCRESPONSE), FRFL("Not present.\n")); } else { - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCRESPONSE), ( tANI_U8* )&pFrm->CCXTrafStrmMet.tsid, 1); - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCRESPONSE), ( tANI_U8* )&pFrm->CCXTrafStrmMet.state, 1); - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCRESPONSE), ( tANI_U8* )&pFrm->CCXTrafStrmMet.msmt_interval, 2); + FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCRESPONSE), ( tANI_U8* )&pFrm->ESETrafStrmMet.tsid, 1); + FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCRESPONSE), ( tANI_U8* )&pFrm->ESETrafStrmMet.state, 1); + FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCRESPONSE), ( tANI_U8* )&pFrm->ESETrafStrmMet.msmt_interval, 2); } - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCRESPONSE), FRFL("CCXTxmitPower:\n")); - if (!pFrm->CCXTxmitPower.present) + FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCRESPONSE), FRFL("ESETxmitPower:\n")); + if (!pFrm->ESETxmitPower.present) { FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCRESPONSE), FRFL("Not present.\n")); } else { - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCRESPONSE), ( tANI_U8* )&pFrm->CCXTxmitPower.power_limit, 1); - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCRESPONSE), ( tANI_U8* )&pFrm->CCXTxmitPower.reserved, 1); + FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCRESPONSE), ( tANI_U8* )&pFrm->ESETxmitPower.power_limit, 1); + FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCRESPONSE), ( tANI_U8* )&pFrm->ESETxmitPower.reserved, 1); } for (i = 0; i < pFrm->num_WMMTSPEC; ++i) { @@ -7974,6 +8070,31 @@ tANI_U32 dot11fUnpackAssocResponse(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U32 FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCRESPONSE), FRFL("operModeNotification (1): %d\n"), pFrm->ExtCap.operModeNotification); FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCRESPONSE), FRFL("reserved7 (1): %d\n"), pFrm->ExtCap.reserved7); } + FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCRESPONSE), FRFL("OBSSScanParameters:\n")); + if (!pFrm->OBSSScanParameters.present) + { + FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCRESPONSE), FRFL("Not present.\n")); + } + else + { + FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCRESPONSE), ( tANI_U8* )&pFrm->OBSSScanParameters.obssScanPassiveDwell, 2); + FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCRESPONSE), ( tANI_U8* )&pFrm->OBSSScanParameters.obssScanActiveDwell, 2); + FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCRESPONSE), ( tANI_U8* )&pFrm->OBSSScanParameters.bssChannelWidthTriggerScanInterval, 2); + FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCRESPONSE), ( tANI_U8* )&pFrm->OBSSScanParameters.obssScanPassiveTotalPerChannel, 2); + FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCRESPONSE), ( tANI_U8* )&pFrm->OBSSScanParameters.obssScanActiveTotalPerChannel, 2); + FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCRESPONSE), ( tANI_U8* )&pFrm->OBSSScanParameters.bssWidthChannelTransitionDelayFactor, 2); + FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCRESPONSE), ( tANI_U8* )&pFrm->OBSSScanParameters.obssScanActivityThreshold, 2); + } + FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCRESPONSE), FRFL("QosMapSet:\n")); + if (!pFrm->QosMapSet.present) + { + FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCRESPONSE), FRFL("Not present.\n")); + } + else + { + FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCRESPONSE), FRFL("num_dscp_exceptions: %d.\n"), pFrm->QosMapSet.num_dscp_exceptions); + FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCRESPONSE), ( tANI_U8* ) pFrm->QosMapSet.dscp_exceptions, pFrm->QosMapSet.num_dscp_exceptions); + } } # endif // DOT11F_DUMP_FRAMES return status; @@ -7992,7 +8113,7 @@ tANI_U32 dot11fUnpackAssocResponse(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U32 {offsetof(tDot11fAuthentication, RSNOpaque), offsetof(tDot11fIERSNOpaque, present), 0, "RSNOpaque" , 0, 8, 255, SigIeRSNOpaque, {0, 0, 0, 0, 0}, 0, DOT11F_EID_RSNOPAQUE, 0, }, {offsetof(tDot11fAuthentication, MobilityDomain), offsetof(tDot11fIEMobilityDomain, present), 0, "MobilityDomain" , 0, 5, 5, SigIeMobilityDomain, {0, 0, 0, 0, 0}, 0, DOT11F_EID_MOBILITYDOMAIN, 0, }, {offsetof(tDot11fAuthentication, FTInfo), offsetof(tDot11fIEFTInfo, present), 0, "FTInfo" , 0, 84, 222, SigIeFTInfo, {0, 0, 0, 0, 0}, 0, DOT11F_EID_FTINFO, 0, }, - {offsetof(tDot11fAuthentication, FTTimeoutInterval), offsetof(tDot11fIEFTTimeoutInterval, present), 0, "FTTimeoutInterval" , 0, 7, 7, SigIeFTTimeoutInterval, {0, 0, 0, 0, 0}, 0, DOT11F_EID_FTTIMEOUTINTERVAL, 0, }, + {offsetof(tDot11fAuthentication, TimeoutInterval), offsetof(tDot11fIETimeoutInterval, present), 0, "TimeoutInterval" , 0, 7, 7, SigIeTimeoutInterval, {0, 0, 0, 0, 0}, 0, DOT11F_EID_TIMEOUTINTERVAL, 0, }, {offsetof(tDot11fAuthentication, RICDataDesc), offsetof(tDot11fIERICDataDesc, present), offsetof(tDot11fAuthentication, num_RICDataDesc), "RICDataDesc" , 2, 2, 550, SigIeRICDataDesc, {0, 0, 0, 0, 0}, 0, DOT11F_EID_RICDATADESC, 0, }, {0, 0, 0, NULL, 0, 0, 0, 0, {0, 0, 0, 0, 0}, 0, 0xff, 0, }, }; @@ -8105,15 +8226,15 @@ tANI_U32 dot11fUnpackAuthentication(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U32 FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_AUTHENTICATION), ( tANI_U8* )&pFrm->FTInfo.IGTK.key, 24); } } - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_AUTHENTICATION), FRFL("FTTimeoutInterval:\n")); - if (!pFrm->FTTimeoutInterval.present) + FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_AUTHENTICATION), FRFL("TimeoutInterval:\n")); + if (!pFrm->TimeoutInterval.present) { FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_AUTHENTICATION), FRFL("Not present.\n")); } else { - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_AUTHENTICATION), ( tANI_U8* )&pFrm->FTTimeoutInterval.timeoutType, 1); - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_AUTHENTICATION), ( tANI_U8* )&pFrm->FTTimeoutInterval.timeoutValue, 4); + FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_AUTHENTICATION), ( tANI_U8* )&pFrm->TimeoutInterval.timeoutType, 1); + FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_AUTHENTICATION), ( tANI_U8* )&pFrm->TimeoutInterval.timeoutValue, 4); } for (i = 0; i < pFrm->num_RICDataDesc; ++i) { @@ -8428,9 +8549,9 @@ tANI_U32 dot11fUnpackAuthentication(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U32 {offsetof(tDot11fBeacon, WMMParams), offsetof(tDot11fIEWMMParams, present), 0, "WMMParams" , 0, 26, 26, SigIeWMMParams, {0, 80, 242, 2, 1}, 5, DOT11F_EID_WMMPARAMS, 0, }, {offsetof(tDot11fBeacon, WMMCaps), offsetof(tDot11fIEWMMCaps, present), 0, "WMMCaps" , 0, 9, 9, SigIeWMMCaps, {0, 80, 242, 2, 5}, 5, DOT11F_EID_WMMCAPS, 0, }, {offsetof(tDot11fBeacon, WAPI), offsetof(tDot11fIEWAPI, present), 0, "WAPI" , 0, 14, 112, SigIeWAPI, {0, 0, 0, 0, 0}, 0, DOT11F_EID_WAPI, 0, }, - {offsetof(tDot11fBeacon, CCXRadMgmtCap), offsetof(tDot11fIECCXRadMgmtCap, present), 0, "CCXRadMgmtCap" , 0, 8, 8, SigIeCCXRadMgmtCap, {0, 64, 150, 1, 0}, 4, DOT11F_EID_CCXRADMGMTCAP, 0, }, - {offsetof(tDot11fBeacon, CCXTrafStrmMet), offsetof(tDot11fIECCXTrafStrmMet, present), 0, "CCXTrafStrmMet" , 0, 10, 10, SigIeCCXTrafStrmMet, {0, 64, 150, 7, 0}, 4, DOT11F_EID_CCXTRAFSTRMMET, 0, }, - {offsetof(tDot11fBeacon, CCXTxmitPower), offsetof(tDot11fIECCXTxmitPower, present), 0, "CCXTxmitPower" , 0, 8, 8, SigIeCCXTxmitPower, {0, 64, 150, 0, 0}, 4, DOT11F_EID_CCXTXMITPOWER, 0, }, + {offsetof(tDot11fBeacon, ESERadMgmtCap), offsetof(tDot11fIEESERadMgmtCap, present), 0, "ESERadMgmtCap" , 0, 8, 8, SigIeESERadMgmtCap, {0, 64, 150, 1, 0}, 4, DOT11F_EID_ESERADMGMTCAP, 0, }, + {offsetof(tDot11fBeacon, ESETrafStrmMet), offsetof(tDot11fIEESETrafStrmMet, present), 0, "ESETrafStrmMet" , 0, 10, 10, SigIeESETrafStrmMet, {0, 64, 150, 7, 0}, 4, DOT11F_EID_ESETRAFSTRMMET, 0, }, + {offsetof(tDot11fBeacon, ESETxmitPower), offsetof(tDot11fIEESETxmitPower, present), 0, "ESETxmitPower" , 0, 8, 8, SigIeESETxmitPower, {0, 64, 150, 0, 0}, 4, DOT11F_EID_ESETXMITPOWER, 0, }, {offsetof(tDot11fBeacon, Airgo), offsetof(tDot11fIEAirgo, present), 0, "Airgo" , 0, 5, 232, SigIeAirgo, {0, 10, 245, 0, 0}, 3, DOT11F_EID_AIRGO, 0, }, {offsetof(tDot11fBeacon, WscBeacon), offsetof(tDot11fIEWscBeacon, present), 0, "WscBeacon" , 0, 6, 84, SigIeWscBeacon, {0, 80, 242, 4, 0}, 4, DOT11F_EID_WSCBEACON, 0, }, {offsetof(tDot11fBeacon, P2PBeacon), offsetof(tDot11fIEP2PBeacon, present), 0, "P2PBeacon" , 0, 6, 61, SigIeP2PBeacon, {80, 111, 154, 9, 0}, 4, DOT11F_EID_P2PBEACON, 0, }, @@ -8440,6 +8561,7 @@ tANI_U32 dot11fUnpackAuthentication(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U32 {offsetof(tDot11fBeacon, ExtCap), offsetof(tDot11fIEExtCap, present), 0, "ExtCap" , 0, 10, 10, SigIeExtCap, {0, 0, 0, 0, 0}, 0, DOT11F_EID_EXTCAP, 0, }, {offsetof(tDot11fBeacon, OperatingMode), offsetof(tDot11fIEOperatingMode, present), 0, "OperatingMode" , 0, 3, 3, SigIeOperatingMode, {0, 0, 0, 0, 0}, 0, DOT11F_EID_OPERATINGMODE, 0, }, {offsetof(tDot11fBeacon, WiderBWChanSwitchAnn), offsetof(tDot11fIEWiderBWChanSwitchAnn, present), 0, "WiderBWChanSwitchAnn" , 0, 5, 5, SigIeWiderBWChanSwitchAnn, {0, 0, 0, 0, 0}, 0, DOT11F_EID_WIDERBWCHANSWITCHANN, 0, }, + {offsetof(tDot11fBeacon, OBSSScanParameters), offsetof(tDot11fIEOBSSScanParameters, present), 0, "OBSSScanParameters" , 0, 16, 16, SigIeOBSSScanParameters, {0, 0, 0, 0, 0}, 0, DOT11F_EID_OBSSSCANPARAMETERS, 0, }, {0, 0, 0, NULL, 0, 0, 0, 0, {0, 0, 0, 0, 0}, 0, 0xff, 0, }, }; tANI_U32 dot11fUnpackBeacon(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U32 nBuf, tDot11fBeacon *pFrm) @@ -8983,37 +9105,37 @@ tANI_U32 dot11fUnpackBeacon(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U32 nBuf, t FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON), ( tANI_U8* )&pFrm->WAPI.bkid_count, 2); FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON), ( tANI_U8* ) pFrm->WAPI.bkid, 16 * pFrm->WAPI.bkid_count); } - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON), FRFL("CCXRadMgmtCap:\n")); - if (!pFrm->CCXRadMgmtCap.present) + FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON), FRFL("ESERadMgmtCap:\n")); + if (!pFrm->ESERadMgmtCap.present) { FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON), FRFL("Not present.\n")); } else { - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON), ( tANI_U8* )&pFrm->CCXRadMgmtCap.mgmt_state, 1); - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON), FRFL("mbssid_mask (3): %d\n"), pFrm->CCXRadMgmtCap.mbssid_mask); - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON), FRFL("reserved (5): %d\n"), pFrm->CCXRadMgmtCap.reserved); + FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON), ( tANI_U8* )&pFrm->ESERadMgmtCap.mgmt_state, 1); + FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON), FRFL("mbssid_mask (3): %d\n"), pFrm->ESERadMgmtCap.mbssid_mask); + FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON), FRFL("reserved (5): %d\n"), pFrm->ESERadMgmtCap.reserved); } - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON), FRFL("CCXTrafStrmMet:\n")); - if (!pFrm->CCXTrafStrmMet.present) + FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON), FRFL("ESETrafStrmMet:\n")); + if (!pFrm->ESETrafStrmMet.present) { FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON), FRFL("Not present.\n")); } else { - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON), ( tANI_U8* )&pFrm->CCXTrafStrmMet.tsid, 1); - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON), ( tANI_U8* )&pFrm->CCXTrafStrmMet.state, 1); - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON), ( tANI_U8* )&pFrm->CCXTrafStrmMet.msmt_interval, 2); + FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON), ( tANI_U8* )&pFrm->ESETrafStrmMet.tsid, 1); + FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON), ( tANI_U8* )&pFrm->ESETrafStrmMet.state, 1); + FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON), ( tANI_U8* )&pFrm->ESETrafStrmMet.msmt_interval, 2); } - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON), FRFL("CCXTxmitPower:\n")); - if (!pFrm->CCXTxmitPower.present) + FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON), FRFL("ESETxmitPower:\n")); + if (!pFrm->ESETxmitPower.present) { FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON), FRFL("Not present.\n")); } else { - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON), ( tANI_U8* )&pFrm->CCXTxmitPower.power_limit, 1); - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON), ( tANI_U8* )&pFrm->CCXTxmitPower.reserved, 1); + FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON), ( tANI_U8* )&pFrm->ESETxmitPower.power_limit, 1); + FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON), ( tANI_U8* )&pFrm->ESETxmitPower.reserved, 1); } FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON), FRFL("Airgo:\n")); if (!pFrm->Airgo.present) @@ -9524,6 +9646,21 @@ tANI_U32 dot11fUnpackBeacon(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U32 nBuf, t FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON), ( tANI_U8* )&pFrm->WiderBWChanSwitchAnn.newCenterChanFreq0, 1); FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON), ( tANI_U8* )&pFrm->WiderBWChanSwitchAnn.newCenterChanFreq1, 1); } + FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON), FRFL("OBSSScanParameters:\n")); + if (!pFrm->OBSSScanParameters.present) + { + FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON), FRFL("Not present.\n")); + } + else + { + FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON), ( tANI_U8* )&pFrm->OBSSScanParameters.obssScanPassiveDwell, 2); + FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON), ( tANI_U8* )&pFrm->OBSSScanParameters.obssScanActiveDwell, 2); + FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON), ( tANI_U8* )&pFrm->OBSSScanParameters.bssChannelWidthTriggerScanInterval, 2); + FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON), ( tANI_U8* )&pFrm->OBSSScanParameters.obssScanPassiveTotalPerChannel, 2); + FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON), ( tANI_U8* )&pFrm->OBSSScanParameters.obssScanActiveTotalPerChannel, 2); + FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON), ( tANI_U8* )&pFrm->OBSSScanParameters.bssWidthChannelTransitionDelayFactor, 2); + FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON), ( tANI_U8* )&pFrm->OBSSScanParameters.obssScanActivityThreshold, 2); + } } # endif // DOT11F_DUMP_FRAMES return status; @@ -9649,9 +9786,9 @@ tANI_U32 dot11fUnpackBeacon1(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U32 nBuf, {offsetof(tDot11fBeacon2, Airgo), offsetof(tDot11fIEAirgo, present), 0, "Airgo" , 0, 5, 232, SigIeAirgo, {0, 10, 245, 0, 0}, 3, DOT11F_EID_AIRGO, 0, }, {offsetof(tDot11fBeacon2, WscBeacon), offsetof(tDot11fIEWscBeacon, present), 0, "WscBeacon" , 0, 6, 84, SigIeWscBeacon, {0, 80, 242, 4, 0}, 4, DOT11F_EID_WSCBEACON, 0, }, {offsetof(tDot11fBeacon2, WAPI), offsetof(tDot11fIEWAPI, present), 0, "WAPI" , 0, 14, 112, SigIeWAPI, {0, 0, 0, 0, 0}, 0, DOT11F_EID_WAPI, 0, }, - {offsetof(tDot11fBeacon2, CCXRadMgmtCap), offsetof(tDot11fIECCXRadMgmtCap, present), 0, "CCXRadMgmtCap" , 0, 8, 8, SigIeCCXRadMgmtCap, {0, 64, 150, 1, 0}, 4, DOT11F_EID_CCXRADMGMTCAP, 0, }, - {offsetof(tDot11fBeacon2, CCXTrafStrmMet), offsetof(tDot11fIECCXTrafStrmMet, present), 0, "CCXTrafStrmMet" , 0, 10, 10, SigIeCCXTrafStrmMet, {0, 64, 150, 7, 0}, 4, DOT11F_EID_CCXTRAFSTRMMET, 0, }, - {offsetof(tDot11fBeacon2, CCXTxmitPower), offsetof(tDot11fIECCXTxmitPower, present), 0, "CCXTxmitPower" , 0, 8, 8, SigIeCCXTxmitPower, {0, 64, 150, 0, 0}, 4, DOT11F_EID_CCXTXMITPOWER, 0, }, + {offsetof(tDot11fBeacon2, ESERadMgmtCap), offsetof(tDot11fIEESERadMgmtCap, present), 0, "ESERadMgmtCap" , 0, 8, 8, SigIeESERadMgmtCap, {0, 64, 150, 1, 0}, 4, DOT11F_EID_ESERADMGMTCAP, 0, }, + {offsetof(tDot11fBeacon2, ESETrafStrmMet), offsetof(tDot11fIEESETrafStrmMet, present), 0, "ESETrafStrmMet" , 0, 10, 10, SigIeESETrafStrmMet, {0, 64, 150, 7, 0}, 4, DOT11F_EID_ESETRAFSTRMMET, 0, }, + {offsetof(tDot11fBeacon2, ESETxmitPower), offsetof(tDot11fIEESETxmitPower, present), 0, "ESETxmitPower" , 0, 8, 8, SigIeESETxmitPower, {0, 64, 150, 0, 0}, 4, DOT11F_EID_ESETXMITPOWER, 0, }, {offsetof(tDot11fBeacon2, P2PBeacon), offsetof(tDot11fIEP2PBeacon, present), 0, "P2PBeacon" , 0, 6, 61, SigIeP2PBeacon, {80, 111, 154, 9, 0}, 4, DOT11F_EID_P2PBEACON, 0, }, {offsetof(tDot11fBeacon2, VHTCaps), offsetof(tDot11fIEVHTCaps, present), 0, "VHTCaps" , 0, 14, 14, SigIeVHTCaps, {0, 0, 0, 0, 0}, 0, DOT11F_EID_VHTCAPS, 0, }, {offsetof(tDot11fBeacon2, VHTOperation), offsetof(tDot11fIEVHTOperation, present), 0, "VHTOperation" , 0, 7, 7, SigIeVHTOperation, {0, 0, 0, 0, 0}, 0, DOT11F_EID_VHTOPERATION, 0, }, @@ -10379,37 +10516,37 @@ tANI_U32 dot11fUnpackBeacon2(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U32 nBuf, FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON2), ( tANI_U8* )&pFrm->WAPI.bkid_count, 2); FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON2), ( tANI_U8* ) pFrm->WAPI.bkid, 16 * pFrm->WAPI.bkid_count); } - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON2), FRFL("CCXRadMgmtCap:\n")); - if (!pFrm->CCXRadMgmtCap.present) + FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON2), FRFL("ESERadMgmtCap:\n")); + if (!pFrm->ESERadMgmtCap.present) { FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON2), FRFL("Not present.\n")); } else { - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON2), ( tANI_U8* )&pFrm->CCXRadMgmtCap.mgmt_state, 1); - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON2), FRFL("mbssid_mask (3): %d\n"), pFrm->CCXRadMgmtCap.mbssid_mask); - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON2), FRFL("reserved (5): %d\n"), pFrm->CCXRadMgmtCap.reserved); + FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON2), ( tANI_U8* )&pFrm->ESERadMgmtCap.mgmt_state, 1); + FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON2), FRFL("mbssid_mask (3): %d\n"), pFrm->ESERadMgmtCap.mbssid_mask); + FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON2), FRFL("reserved (5): %d\n"), pFrm->ESERadMgmtCap.reserved); } - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON2), FRFL("CCXTrafStrmMet:\n")); - if (!pFrm->CCXTrafStrmMet.present) + FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON2), FRFL("ESETrafStrmMet:\n")); + if (!pFrm->ESETrafStrmMet.present) { FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON2), FRFL("Not present.\n")); } else { - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON2), ( tANI_U8* )&pFrm->CCXTrafStrmMet.tsid, 1); - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON2), ( tANI_U8* )&pFrm->CCXTrafStrmMet.state, 1); - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON2), ( tANI_U8* )&pFrm->CCXTrafStrmMet.msmt_interval, 2); + FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON2), ( tANI_U8* )&pFrm->ESETrafStrmMet.tsid, 1); + FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON2), ( tANI_U8* )&pFrm->ESETrafStrmMet.state, 1); + FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON2), ( tANI_U8* )&pFrm->ESETrafStrmMet.msmt_interval, 2); } - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON2), FRFL("CCXTxmitPower:\n")); - if (!pFrm->CCXTxmitPower.present) + FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON2), FRFL("ESETxmitPower:\n")); + if (!pFrm->ESETxmitPower.present) { FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON2), FRFL("Not present.\n")); } else { - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON2), ( tANI_U8* )&pFrm->CCXTxmitPower.power_limit, 1); - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON2), ( tANI_U8* )&pFrm->CCXTxmitPower.reserved, 1); + FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON2), ( tANI_U8* )&pFrm->ESETxmitPower.power_limit, 1); + FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON2), ( tANI_U8* )&pFrm->ESETxmitPower.reserved, 1); } FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON2), FRFL("P2PBeacon:\n")); if (!pFrm->P2PBeacon.present) @@ -10633,10 +10770,10 @@ tANI_U32 dot11fUnpackBeacon2(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U32 nBuf, {offsetof(tDot11fBeaconIEs, WMMParams), offsetof(tDot11fIEWMMParams, present), 0, "WMMParams" , 0, 26, 26, SigIeWMMParams, {0, 80, 242, 2, 1}, 5, DOT11F_EID_WMMPARAMS, 0, }, {offsetof(tDot11fBeaconIEs, WMMCaps), offsetof(tDot11fIEWMMCaps, present), 0, "WMMCaps" , 0, 9, 9, SigIeWMMCaps, {0, 80, 242, 2, 5}, 5, DOT11F_EID_WMMCAPS, 0, }, {offsetof(tDot11fBeaconIEs, WAPI), offsetof(tDot11fIEWAPI, present), 0, "WAPI" , 0, 14, 112, SigIeWAPI, {0, 0, 0, 0, 0}, 0, DOT11F_EID_WAPI, 0, }, - {offsetof(tDot11fBeaconIEs, CCXVersion), offsetof(tDot11fIECCXVersion, present), 0, "CCXVersion" , 0, 7, 7, SigIeCCXVersion, {0, 64, 150, 3, 0}, 4, DOT11F_EID_CCXVERSION, 0, }, - {offsetof(tDot11fBeaconIEs, CCXRadMgmtCap), offsetof(tDot11fIECCXRadMgmtCap, present), 0, "CCXRadMgmtCap" , 0, 8, 8, SigIeCCXRadMgmtCap, {0, 64, 150, 1, 0}, 4, DOT11F_EID_CCXRADMGMTCAP, 0, }, - {offsetof(tDot11fBeaconIEs, CCXTrafStrmMet), offsetof(tDot11fIECCXTrafStrmMet, present), 0, "CCXTrafStrmMet" , 0, 10, 10, SigIeCCXTrafStrmMet, {0, 64, 150, 7, 0}, 4, DOT11F_EID_CCXTRAFSTRMMET, 0, }, - {offsetof(tDot11fBeaconIEs, CCXTxmitPower), offsetof(tDot11fIECCXTxmitPower, present), 0, "CCXTxmitPower" , 0, 8, 8, SigIeCCXTxmitPower, {0, 64, 150, 0, 0}, 4, DOT11F_EID_CCXTXMITPOWER, 0, }, + {offsetof(tDot11fBeaconIEs, ESEVersion), offsetof(tDot11fIEESEVersion, present), 0, "ESEVersion" , 0, 7, 7, SigIeESEVersion, {0, 64, 150, 3, 0}, 4, DOT11F_EID_ESEVERSION, 0, }, + {offsetof(tDot11fBeaconIEs, ESERadMgmtCap), offsetof(tDot11fIEESERadMgmtCap, present), 0, "ESERadMgmtCap" , 0, 8, 8, SigIeESERadMgmtCap, {0, 64, 150, 1, 0}, 4, DOT11F_EID_ESERADMGMTCAP, 0, }, + {offsetof(tDot11fBeaconIEs, ESETrafStrmMet), offsetof(tDot11fIEESETrafStrmMet, present), 0, "ESETrafStrmMet" , 0, 10, 10, SigIeESETrafStrmMet, {0, 64, 150, 7, 0}, 4, DOT11F_EID_ESETRAFSTRMMET, 0, }, + {offsetof(tDot11fBeaconIEs, ESETxmitPower), offsetof(tDot11fIEESETxmitPower, present), 0, "ESETxmitPower" , 0, 8, 8, SigIeESETxmitPower, {0, 64, 150, 0, 0}, 4, DOT11F_EID_ESETXMITPOWER, 0, }, {offsetof(tDot11fBeaconIEs, Airgo), offsetof(tDot11fIEAirgo, present), 0, "Airgo" , 0, 5, 232, SigIeAirgo, {0, 10, 245, 0, 0}, 3, DOT11F_EID_AIRGO, 0, }, {offsetof(tDot11fBeaconIEs, WscBeaconProbeRes), offsetof(tDot11fIEWscBeaconProbeRes, present), 0, "WscBeaconProbeRes" , 0, 6, 319, SigIeWscBeaconProbeRes, {0, 80, 242, 4, 0}, 4, DOT11F_EID_WSCBEACONPROBERES, 0, }, {offsetof(tDot11fBeaconIEs, P2PBeaconProbeRes), offsetof(tDot11fIEP2PBeaconProbeRes, present), 0, "P2PBeaconProbeRes" , 0, 6, 1150, SigIeP2PBeaconProbeRes, {80, 111, 154, 9, 0}, 4, DOT11F_EID_P2PBEACONPROBERES, 0, }, @@ -10646,6 +10783,7 @@ tANI_U32 dot11fUnpackBeacon2(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U32 nBuf, {offsetof(tDot11fBeaconIEs, ExtCap), offsetof(tDot11fIEExtCap, present), 0, "ExtCap" , 0, 10, 10, SigIeExtCap, {0, 0, 0, 0, 0}, 0, DOT11F_EID_EXTCAP, 0, }, {offsetof(tDot11fBeaconIEs, OperatingMode), offsetof(tDot11fIEOperatingMode, present), 0, "OperatingMode" , 0, 3, 3, SigIeOperatingMode, {0, 0, 0, 0, 0}, 0, DOT11F_EID_OPERATINGMODE, 0, }, {offsetof(tDot11fBeaconIEs, WiderBWChanSwitchAnn), offsetof(tDot11fIEWiderBWChanSwitchAnn, present), 0, "WiderBWChanSwitchAnn" , 0, 5, 5, SigIeWiderBWChanSwitchAnn, {0, 0, 0, 0, 0}, 0, DOT11F_EID_WIDERBWCHANSWITCHANN, 0, }, + {offsetof(tDot11fBeaconIEs, OBSSScanParameters), offsetof(tDot11fIEOBSSScanParameters, present), 0, "OBSSScanParameters" , 0, 16, 16, SigIeOBSSScanParameters, {0, 0, 0, 0, 0}, 0, DOT11F_EID_OBSSSCANPARAMETERS, 0, }, {0, 0, 0, NULL, 0, 0, 0, 0, {0, 0, 0, 0, 0}, 0, 0xff, 0, }, }; tANI_U32 dot11fUnpackBeaconIEs(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U32 nBuf, tDot11fBeaconIEs *pFrm) @@ -11168,46 +11306,46 @@ tANI_U32 dot11fUnpackBeaconIEs(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U32 nBuf FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACONIES), ( tANI_U8* )&pFrm->WAPI.bkid_count, 2); FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACONIES), ( tANI_U8* ) pFrm->WAPI.bkid, 16 * pFrm->WAPI.bkid_count); } - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACONIES), FRFL("CCXVersion:\n")); - if (!pFrm->CCXVersion.present) + FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACONIES), FRFL("ESEVersion:\n")); + if (!pFrm->ESEVersion.present) { FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACONIES), FRFL("Not present.\n")); } else { - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACONIES), ( tANI_U8* )&pFrm->CCXVersion.version, 1); + FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACONIES), ( tANI_U8* )&pFrm->ESEVersion.version, 1); } - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACONIES), FRFL("CCXRadMgmtCap:\n")); - if (!pFrm->CCXRadMgmtCap.present) + FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACONIES), FRFL("ESERadMgmtCap:\n")); + if (!pFrm->ESERadMgmtCap.present) { FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACONIES), FRFL("Not present.\n")); } else { - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACONIES), ( tANI_U8* )&pFrm->CCXRadMgmtCap.mgmt_state, 1); - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACONIES), FRFL("mbssid_mask (3): %d\n"), pFrm->CCXRadMgmtCap.mbssid_mask); - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACONIES), FRFL("reserved (5): %d\n"), pFrm->CCXRadMgmtCap.reserved); + FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACONIES), ( tANI_U8* )&pFrm->ESERadMgmtCap.mgmt_state, 1); + FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACONIES), FRFL("mbssid_mask (3): %d\n"), pFrm->ESERadMgmtCap.mbssid_mask); + FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACONIES), FRFL("reserved (5): %d\n"), pFrm->ESERadMgmtCap.reserved); } - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACONIES), FRFL("CCXTrafStrmMet:\n")); - if (!pFrm->CCXTrafStrmMet.present) + FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACONIES), FRFL("ESETrafStrmMet:\n")); + if (!pFrm->ESETrafStrmMet.present) { FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACONIES), FRFL("Not present.\n")); } else { - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACONIES), ( tANI_U8* )&pFrm->CCXTrafStrmMet.tsid, 1); - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACONIES), ( tANI_U8* )&pFrm->CCXTrafStrmMet.state, 1); - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACONIES), ( tANI_U8* )&pFrm->CCXTrafStrmMet.msmt_interval, 2); + FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACONIES), ( tANI_U8* )&pFrm->ESETrafStrmMet.tsid, 1); + FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACONIES), ( tANI_U8* )&pFrm->ESETrafStrmMet.state, 1); + FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACONIES), ( tANI_U8* )&pFrm->ESETrafStrmMet.msmt_interval, 2); } - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACONIES), FRFL("CCXTxmitPower:\n")); - if (!pFrm->CCXTxmitPower.present) + FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACONIES), FRFL("ESETxmitPower:\n")); + if (!pFrm->ESETxmitPower.present) { FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACONIES), FRFL("Not present.\n")); } else { - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACONIES), ( tANI_U8* )&pFrm->CCXTxmitPower.power_limit, 1); - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACONIES), ( tANI_U8* )&pFrm->CCXTxmitPower.reserved, 1); + FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACONIES), ( tANI_U8* )&pFrm->ESETxmitPower.power_limit, 1); + FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACONIES), ( tANI_U8* )&pFrm->ESETxmitPower.reserved, 1); } FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACONIES), FRFL("Airgo:\n")); if (!pFrm->Airgo.present) @@ -11838,6 +11976,21 @@ tANI_U32 dot11fUnpackBeaconIEs(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U32 nBuf FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACONIES), ( tANI_U8* )&pFrm->WiderBWChanSwitchAnn.newCenterChanFreq0, 1); FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACONIES), ( tANI_U8* )&pFrm->WiderBWChanSwitchAnn.newCenterChanFreq1, 1); } + FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACONIES), FRFL("OBSSScanParameters:\n")); + if (!pFrm->OBSSScanParameters.present) + { + FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACONIES), FRFL("Not present.\n")); + } + else + { + FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACONIES), ( tANI_U8* )&pFrm->OBSSScanParameters.obssScanPassiveDwell, 2); + FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACONIES), ( tANI_U8* )&pFrm->OBSSScanParameters.obssScanActiveDwell, 2); + FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACONIES), ( tANI_U8* )&pFrm->OBSSScanParameters.bssChannelWidthTriggerScanInterval, 2); + FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACONIES), ( tANI_U8* )&pFrm->OBSSScanParameters.obssScanPassiveTotalPerChannel, 2); + FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACONIES), ( tANI_U8* )&pFrm->OBSSScanParameters.obssScanActiveTotalPerChannel, 2); + FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACONIES), ( tANI_U8* )&pFrm->OBSSScanParameters.bssWidthChannelTransitionDelayFactor, 2); + FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACONIES), ( tANI_U8* )&pFrm->OBSSScanParameters.obssScanActivityThreshold, 2); + } } # endif // DOT11F_DUMP_FRAMES return status; @@ -14101,9 +14254,9 @@ tANI_U32 dot11fUnpackProbeRequest(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U32 n {offsetof(tDot11fProbeResponse, WMMParams), offsetof(tDot11fIEWMMParams, present), 0, "WMMParams" , 0, 26, 26, SigIeWMMParams, {0, 80, 242, 2, 1}, 5, DOT11F_EID_WMMPARAMS, 0, }, {offsetof(tDot11fProbeResponse, WMMCaps), offsetof(tDot11fIEWMMCaps, present), 0, "WMMCaps" , 0, 9, 9, SigIeWMMCaps, {0, 80, 242, 2, 5}, 5, DOT11F_EID_WMMCAPS, 0, }, {offsetof(tDot11fProbeResponse, WAPI), offsetof(tDot11fIEWAPI, present), 0, "WAPI" , 0, 14, 112, SigIeWAPI, {0, 0, 0, 0, 0}, 0, DOT11F_EID_WAPI, 0, }, - {offsetof(tDot11fProbeResponse, CCXRadMgmtCap), offsetof(tDot11fIECCXRadMgmtCap, present), 0, "CCXRadMgmtCap" , 0, 8, 8, SigIeCCXRadMgmtCap, {0, 64, 150, 1, 0}, 4, DOT11F_EID_CCXRADMGMTCAP, 0, }, - {offsetof(tDot11fProbeResponse, CCXTrafStrmMet), offsetof(tDot11fIECCXTrafStrmMet, present), 0, "CCXTrafStrmMet" , 0, 10, 10, SigIeCCXTrafStrmMet, {0, 64, 150, 7, 0}, 4, DOT11F_EID_CCXTRAFSTRMMET, 0, }, - {offsetof(tDot11fProbeResponse, CCXTxmitPower), offsetof(tDot11fIECCXTxmitPower, present), 0, "CCXTxmitPower" , 0, 8, 8, SigIeCCXTxmitPower, {0, 64, 150, 0, 0}, 4, DOT11F_EID_CCXTXMITPOWER, 0, }, + {offsetof(tDot11fProbeResponse, ESERadMgmtCap), offsetof(tDot11fIEESERadMgmtCap, present), 0, "ESERadMgmtCap" , 0, 8, 8, SigIeESERadMgmtCap, {0, 64, 150, 1, 0}, 4, DOT11F_EID_ESERADMGMTCAP, 0, }, + {offsetof(tDot11fProbeResponse, ESETrafStrmMet), offsetof(tDot11fIEESETrafStrmMet, present), 0, "ESETrafStrmMet" , 0, 10, 10, SigIeESETrafStrmMet, {0, 64, 150, 7, 0}, 4, DOT11F_EID_ESETRAFSTRMMET, 0, }, + {offsetof(tDot11fProbeResponse, ESETxmitPower), offsetof(tDot11fIEESETxmitPower, present), 0, "ESETxmitPower" , 0, 8, 8, SigIeESETxmitPower, {0, 64, 150, 0, 0}, 4, DOT11F_EID_ESETXMITPOWER, 0, }, {offsetof(tDot11fProbeResponse, Airgo), offsetof(tDot11fIEAirgo, present), 0, "Airgo" , 0, 5, 232, SigIeAirgo, {0, 10, 245, 0, 0}, 3, DOT11F_EID_AIRGO, 0, }, {offsetof(tDot11fProbeResponse, WscProbeRes), offsetof(tDot11fIEWscProbeRes, present), 0, "WscProbeRes" , 0, 6, 319, SigIeWscProbeRes, {0, 80, 242, 4, 0}, 4, DOT11F_EID_WSCPROBERES, 0, }, {offsetof(tDot11fProbeResponse, P2PProbeRes), offsetof(tDot11fIEP2PProbeRes, present), 0, "P2PProbeRes" , 0, 6, 1141, SigIeP2PProbeRes, {80, 111, 154, 9, 0}, 4, DOT11F_EID_P2PPROBERES, 0, }, @@ -14111,6 +14264,7 @@ tANI_U32 dot11fUnpackProbeRequest(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U32 n {offsetof(tDot11fProbeResponse, VHTOperation), offsetof(tDot11fIEVHTOperation, present), 0, "VHTOperation" , 0, 7, 7, SigIeVHTOperation, {0, 0, 0, 0, 0}, 0, DOT11F_EID_VHTOPERATION, 0, }, {offsetof(tDot11fProbeResponse, VHTExtBssLoad), offsetof(tDot11fIEVHTExtBssLoad, present), 0, "VHTExtBssLoad" , 0, 7, 7, SigIeVHTExtBssLoad, {0, 0, 0, 0, 0}, 0, DOT11F_EID_VHTEXTBSSLOAD, 0, }, {offsetof(tDot11fProbeResponse, ExtCap), offsetof(tDot11fIEExtCap, present), 0, "ExtCap" , 0, 10, 10, SigIeExtCap, {0, 0, 0, 0, 0}, 0, DOT11F_EID_EXTCAP, 0, }, + {offsetof(tDot11fProbeResponse, OBSSScanParameters), offsetof(tDot11fIEOBSSScanParameters, present), 0, "OBSSScanParameters" , 0, 16, 16, SigIeOBSSScanParameters, {0, 0, 0, 0, 0}, 0, DOT11F_EID_OBSSSCANPARAMETERS, 0, }, {0, 0, 0, NULL, 0, 0, 0, 0, {0, 0, 0, 0, 0}, 0, 0xff, 0, }, }; tANI_U32 dot11fUnpackProbeResponse(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U32 nBuf, tDot11fProbeResponse *pFrm) @@ -14620,37 +14774,37 @@ tANI_U32 dot11fUnpackProbeResponse(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U32 FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_PROBERESPONSE), ( tANI_U8* )&pFrm->WAPI.bkid_count, 2); FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_PROBERESPONSE), ( tANI_U8* ) pFrm->WAPI.bkid, 16 * pFrm->WAPI.bkid_count); } - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_PROBERESPONSE), FRFL("CCXRadMgmtCap:\n")); - if (!pFrm->CCXRadMgmtCap.present) + FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_PROBERESPONSE), FRFL("ESERadMgmtCap:\n")); + if (!pFrm->ESERadMgmtCap.present) { FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_PROBERESPONSE), FRFL("Not present.\n")); } else { - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_PROBERESPONSE), ( tANI_U8* )&pFrm->CCXRadMgmtCap.mgmt_state, 1); - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_PROBERESPONSE), FRFL("mbssid_mask (3): %d\n"), pFrm->CCXRadMgmtCap.mbssid_mask); - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_PROBERESPONSE), FRFL("reserved (5): %d\n"), pFrm->CCXRadMgmtCap.reserved); + FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_PROBERESPONSE), ( tANI_U8* )&pFrm->ESERadMgmtCap.mgmt_state, 1); + FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_PROBERESPONSE), FRFL("mbssid_mask (3): %d\n"), pFrm->ESERadMgmtCap.mbssid_mask); + FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_PROBERESPONSE), FRFL("reserved (5): %d\n"), pFrm->ESERadMgmtCap.reserved); } - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_PROBERESPONSE), FRFL("CCXTrafStrmMet:\n")); - if (!pFrm->CCXTrafStrmMet.present) + FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_PROBERESPONSE), FRFL("ESETrafStrmMet:\n")); + if (!pFrm->ESETrafStrmMet.present) { FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_PROBERESPONSE), FRFL("Not present.\n")); } else { - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_PROBERESPONSE), ( tANI_U8* )&pFrm->CCXTrafStrmMet.tsid, 1); - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_PROBERESPONSE), ( tANI_U8* )&pFrm->CCXTrafStrmMet.state, 1); - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_PROBERESPONSE), ( tANI_U8* )&pFrm->CCXTrafStrmMet.msmt_interval, 2); + FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_PROBERESPONSE), ( tANI_U8* )&pFrm->ESETrafStrmMet.tsid, 1); + FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_PROBERESPONSE), ( tANI_U8* )&pFrm->ESETrafStrmMet.state, 1); + FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_PROBERESPONSE), ( tANI_U8* )&pFrm->ESETrafStrmMet.msmt_interval, 2); } - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_PROBERESPONSE), FRFL("CCXTxmitPower:\n")); - if (!pFrm->CCXTxmitPower.present) + FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_PROBERESPONSE), FRFL("ESETxmitPower:\n")); + if (!pFrm->ESETxmitPower.present) { FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_PROBERESPONSE), FRFL("Not present.\n")); } else { - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_PROBERESPONSE), ( tANI_U8* )&pFrm->CCXTxmitPower.power_limit, 1); - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_PROBERESPONSE), ( tANI_U8* )&pFrm->CCXTxmitPower.reserved, 1); + FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_PROBERESPONSE), ( tANI_U8* )&pFrm->ESETxmitPower.power_limit, 1); + FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_PROBERESPONSE), ( tANI_U8* )&pFrm->ESETxmitPower.reserved, 1); } FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_PROBERESPONSE), FRFL("Airgo:\n")); if (!pFrm->Airgo.present) @@ -15249,6 +15403,21 @@ tANI_U32 dot11fUnpackProbeResponse(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U32 FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_PROBERESPONSE), FRFL("operModeNotification (1): %d\n"), pFrm->ExtCap.operModeNotification); FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_PROBERESPONSE), FRFL("reserved7 (1): %d\n"), pFrm->ExtCap.reserved7); } + FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_PROBERESPONSE), FRFL("OBSSScanParameters:\n")); + if (!pFrm->OBSSScanParameters.present) + { + FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_PROBERESPONSE), FRFL("Not present.\n")); + } + else + { + FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_PROBERESPONSE), ( tANI_U8* )&pFrm->OBSSScanParameters.obssScanPassiveDwell, 2); + FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_PROBERESPONSE), ( tANI_U8* )&pFrm->OBSSScanParameters.obssScanActiveDwell, 2); + FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_PROBERESPONSE), ( tANI_U8* )&pFrm->OBSSScanParameters.bssChannelWidthTriggerScanInterval, 2); + FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_PROBERESPONSE), ( tANI_U8* )&pFrm->OBSSScanParameters.obssScanPassiveTotalPerChannel, 2); + FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_PROBERESPONSE), ( tANI_U8* )&pFrm->OBSSScanParameters.obssScanActiveTotalPerChannel, 2); + FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_PROBERESPONSE), ( tANI_U8* )&pFrm->OBSSScanParameters.bssWidthChannelTransitionDelayFactor, 2); + FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_PROBERESPONSE), ( tANI_U8* )&pFrm->OBSSScanParameters.obssScanActivityThreshold, 2); + } } # endif // DOT11F_DUMP_FRAMES return status; @@ -15406,6 +15575,49 @@ tANI_U32 dot11fUnpackProvisionDiscoveryRes(tpAniSirGlobal pCtx, tANI_U8 *pBuf, t } /* End dot11fUnpackProvisionDiscoveryRes. */ + static const tFFDefn FFS_QosMapConfigure[] = { + { "Category", offsetof(tDot11fQosMapConfigure, Category), SigFfCategory , DOT11F_FF_CATEGORY_LEN, }, + { "Action", offsetof(tDot11fQosMapConfigure, Action), SigFfAction , DOT11F_FF_ACTION_LEN, }, + { NULL, 0, 0, 0,}, + }; + + static const tIEDefn IES_QosMapConfigure[] = { + {offsetof(tDot11fQosMapConfigure, QosMapSet), offsetof(tDot11fIEQosMapSet, present), 0, "QosMapSet" , 0, 2, 62, SigIeQosMapSet, {0, 0, 0, 0, 0}, 0, DOT11F_EID_QOSMAPSET, 1, }, + {0, 0, 0, NULL, 0, 0, 0, 0, {0, 0, 0, 0, 0}, 0, 0xff, 0, }, }; + +tANI_U32 dot11fUnpackQosMapConfigure(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U32 nBuf, tDot11fQosMapConfigure *pFrm) +{ + tANI_U32 i = 0; + tANI_U32 status = 0; + status = UnpackCore(pCtx, pBuf, nBuf, FFS_QosMapConfigure, IES_QosMapConfigure, ( tANI_U8* )pFrm, sizeof(*pFrm)); + + (void)i; +# ifdef DOT11F_DUMP_FRAMES + if (!DOT11F_FAILED(status)) + { + FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_QOSMAPCONFIGURE), FRFL("Unpacked the QosMapConfigure:\n")); + FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_QOSMAPCONFIGURE), pBuf, nBuf); + FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_QOSMAPCONFIGURE), FRFL("to:\n")); + FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_QOSMAPCONFIGURE), FRFL("Category:\n")); + FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_QOSMAPCONFIGURE), ( tANI_U8* )&pFrm->Category.category, 1); + FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_QOSMAPCONFIGURE), FRFL("Action:\n")); + FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_QOSMAPCONFIGURE), ( tANI_U8* )&pFrm->Action.action, 1); + FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_QOSMAPCONFIGURE), FRFL("QosMapSet:\n")); + if (!pFrm->QosMapSet.present) + { + FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_QOSMAPCONFIGURE), FRFL("Not present.\n")); + } + else + { + FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_QOSMAPCONFIGURE), FRFL("num_dscp_exceptions: %d.\n"), pFrm->QosMapSet.num_dscp_exceptions); + FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_QOSMAPCONFIGURE), ( tANI_U8* ) pFrm->QosMapSet.dscp_exceptions, pFrm->QosMapSet.num_dscp_exceptions); + } + } +# endif // DOT11F_DUMP_FRAMES + return status; + +} /* End dot11fUnpackQosMapConfigure. */ + static const tFFDefn FFS_RadioMeasurementReport[] = { { "Category", offsetof(tDot11fRadioMeasurementReport, Category), SigFfCategory , DOT11F_FF_CATEGORY_LEN, }, { "Action", offsetof(tDot11fRadioMeasurementReport, Action), SigFfAction , DOT11F_FF_ACTION_LEN, }, @@ -15615,16 +15827,17 @@ tANI_U32 dot11fUnpackRadioMeasurementRequest(tpAniSirGlobal pCtx, tANI_U8 *pBuf, {offsetof(tDot11fReAssocRequest, Airgo), offsetof(tDot11fIEAirgo, present), 0, "Airgo" , 0, 5, 232, SigIeAirgo, {0, 10, 245, 0, 0}, 3, DOT11F_EID_AIRGO, 0, }, {offsetof(tDot11fReAssocRequest, WscIEOpaque), offsetof(tDot11fIEWscIEOpaque, present), 0, "WscIEOpaque" , 0, 8, 255, SigIeWscIEOpaque, {0, 80, 242, 4, 0}, 4, DOT11F_EID_WSCIEOPAQUE, 0, }, {offsetof(tDot11fReAssocRequest, WAPIOpaque), offsetof(tDot11fIEWAPIOpaque, present), 0, "WAPIOpaque" , 0, 8, 255, SigIeWAPIOpaque, {0, 0, 0, 0, 0}, 0, DOT11F_EID_WAPIOPAQUE, 0, }, - {offsetof(tDot11fReAssocRequest, CCXRadMgmtCap), offsetof(tDot11fIECCXRadMgmtCap, present), 0, "CCXRadMgmtCap" , 0, 8, 8, SigIeCCXRadMgmtCap, {0, 64, 150, 1, 0}, 4, DOT11F_EID_CCXRADMGMTCAP, 0, }, - {offsetof(tDot11fReAssocRequest, CCXVersion), offsetof(tDot11fIECCXVersion, present), 0, "CCXVersion" , 0, 7, 7, SigIeCCXVersion, {0, 64, 150, 3, 0}, 4, DOT11F_EID_CCXVERSION, 0, }, - {offsetof(tDot11fReAssocRequest, CCXCckmOpaque), offsetof(tDot11fIECCXCckmOpaque, present), 0, "CCXCckmOpaque" , 0, 12, 26, SigIeCCXCckmOpaque, {0, 64, 150, 0, 0}, 4, DOT11F_EID_CCXCCKMOPAQUE, 0, }, + {offsetof(tDot11fReAssocRequest, ESERadMgmtCap), offsetof(tDot11fIEESERadMgmtCap, present), 0, "ESERadMgmtCap" , 0, 8, 8, SigIeESERadMgmtCap, {0, 64, 150, 1, 0}, 4, DOT11F_EID_ESERADMGMTCAP, 0, }, + {offsetof(tDot11fReAssocRequest, ESEVersion), offsetof(tDot11fIEESEVersion, present), 0, "ESEVersion" , 0, 7, 7, SigIeESEVersion, {0, 64, 150, 3, 0}, 4, DOT11F_EID_ESEVERSION, 0, }, + {offsetof(tDot11fReAssocRequest, ESECckmOpaque), offsetof(tDot11fIEESECckmOpaque, present), 0, "ESECckmOpaque" , 0, 12, 26, SigIeESECckmOpaque, {0, 64, 150, 0, 0}, 4, DOT11F_EID_ESECCKMOPAQUE, 0, }, {offsetof(tDot11fReAssocRequest, WMMTSPEC), offsetof(tDot11fIEWMMTSPEC, present), offsetof(tDot11fReAssocRequest, num_WMMTSPEC), "WMMTSPEC" , 4, 63, 63, SigIeWMMTSPEC, {0, 80, 242, 2, 2}, 5, DOT11F_EID_WMMTSPEC, 0, }, - {offsetof(tDot11fReAssocRequest, CCXTrafStrmRateSet), offsetof(tDot11fIECCXTrafStrmRateSet, present), 0, "CCXTrafStrmRateSet" , 0, 7, 15, SigIeCCXTrafStrmRateSet, {0, 64, 150, 8, 0}, 4, DOT11F_EID_CCXTRAFSTRMRATESET, 0, }, + {offsetof(tDot11fReAssocRequest, ESETrafStrmRateSet), offsetof(tDot11fIEESETrafStrmRateSet, present), 0, "ESETrafStrmRateSet" , 0, 7, 15, SigIeESETrafStrmRateSet, {0, 64, 150, 8, 0}, 4, DOT11F_EID_ESETRAFSTRMRATESET, 0, }, {offsetof(tDot11fReAssocRequest, P2PIEOpaque), offsetof(tDot11fIEP2PIEOpaque, present), 0, "P2PIEOpaque" , 0, 8, 255, SigIeP2PIEOpaque, {80, 111, 154, 9, 0}, 4, DOT11F_EID_P2PIEOPAQUE, 0, }, {offsetof(tDot11fReAssocRequest, WFDIEOpaque), offsetof(tDot11fIEWFDIEOpaque, present), 0, "WFDIEOpaque" , 0, 8, 255, SigIeWFDIEOpaque, {80, 111, 154, 10, 0}, 4, DOT11F_EID_WFDIEOPAQUE, 0, }, {offsetof(tDot11fReAssocRequest, VHTCaps), offsetof(tDot11fIEVHTCaps, present), 0, "VHTCaps" , 0, 14, 14, SigIeVHTCaps, {0, 0, 0, 0, 0}, 0, DOT11F_EID_VHTCAPS, 0, }, {offsetof(tDot11fReAssocRequest, ExtCap), offsetof(tDot11fIEExtCap, present), 0, "ExtCap" , 0, 10, 10, SigIeExtCap, {0, 0, 0, 0, 0}, 0, DOT11F_EID_EXTCAP, 0, }, {offsetof(tDot11fReAssocRequest, OperatingMode), offsetof(tDot11fIEOperatingMode, present), 0, "OperatingMode" , 0, 3, 3, SigIeOperatingMode, {0, 0, 0, 0, 0}, 0, DOT11F_EID_OPERATINGMODE, 0, }, + {offsetof(tDot11fReAssocRequest, QosMapSet), offsetof(tDot11fIEQosMapSet, present), 0, "QosMapSet" , 0, 2, 62, SigIeQosMapSet, {0, 0, 0, 0, 0}, 0, DOT11F_EID_QOSMAPSET, 0, }, {0, 0, 0, NULL, 0, 0, 0, 0, {0, 0, 0, 0, 0}, 0, 0xff, 0, }, }; tANI_U32 dot11fUnpackReAssocRequest(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U32 nBuf, tDot11fReAssocRequest *pFrm) @@ -16439,35 +16652,35 @@ tANI_U32 dot11fUnpackReAssocRequest(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U32 FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCREQUEST), FRFL("num_data: %d.\n"), pFrm->WAPIOpaque.num_data); FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCREQUEST), ( tANI_U8* ) pFrm->WAPIOpaque.data, pFrm->WAPIOpaque.num_data); } - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCREQUEST), FRFL("CCXRadMgmtCap:\n")); - if (!pFrm->CCXRadMgmtCap.present) + FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCREQUEST), FRFL("ESERadMgmtCap:\n")); + if (!pFrm->ESERadMgmtCap.present) { FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCREQUEST), FRFL("Not present.\n")); } else { - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCREQUEST), ( tANI_U8* )&pFrm->CCXRadMgmtCap.mgmt_state, 1); - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCREQUEST), FRFL("mbssid_mask (3): %d\n"), pFrm->CCXRadMgmtCap.mbssid_mask); - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCREQUEST), FRFL("reserved (5): %d\n"), pFrm->CCXRadMgmtCap.reserved); + FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCREQUEST), ( tANI_U8* )&pFrm->ESERadMgmtCap.mgmt_state, 1); + FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCREQUEST), FRFL("mbssid_mask (3): %d\n"), pFrm->ESERadMgmtCap.mbssid_mask); + FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCREQUEST), FRFL("reserved (5): %d\n"), pFrm->ESERadMgmtCap.reserved); } - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCREQUEST), FRFL("CCXVersion:\n")); - if (!pFrm->CCXVersion.present) + FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCREQUEST), FRFL("ESEVersion:\n")); + if (!pFrm->ESEVersion.present) { FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCREQUEST), FRFL("Not present.\n")); } else { - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCREQUEST), ( tANI_U8* )&pFrm->CCXVersion.version, 1); + FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCREQUEST), ( tANI_U8* )&pFrm->ESEVersion.version, 1); } - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCREQUEST), FRFL("CCXCckmOpaque:\n")); - if (!pFrm->CCXCckmOpaque.present) + FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCREQUEST), FRFL("ESECckmOpaque:\n")); + if (!pFrm->ESECckmOpaque.present) { FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCREQUEST), FRFL("Not present.\n")); } else { - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCREQUEST), FRFL("num_data: %d.\n"), pFrm->CCXCckmOpaque.num_data); - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCREQUEST), ( tANI_U8* ) pFrm->CCXCckmOpaque.data, pFrm->CCXCckmOpaque.num_data); + FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCREQUEST), FRFL("num_data: %d.\n"), pFrm->ESECckmOpaque.num_data); + FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCREQUEST), ( tANI_U8* ) pFrm->ESECckmOpaque.data, pFrm->ESECckmOpaque.num_data); } for (i = 0; i < pFrm->num_WMMTSPEC; ++i) { @@ -16507,16 +16720,16 @@ tANI_U32 dot11fUnpackReAssocRequest(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U32 FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCREQUEST), ( tANI_U8* )&pFrm->WMMTSPEC[i].medium_time, 2); } } - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCREQUEST), FRFL("CCXTrafStrmRateSet:\n")); - if (!pFrm->CCXTrafStrmRateSet.present) + FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCREQUEST), FRFL("ESETrafStrmRateSet:\n")); + if (!pFrm->ESETrafStrmRateSet.present) { FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCREQUEST), FRFL("Not present.\n")); } else { - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCREQUEST), ( tANI_U8* )&pFrm->CCXTrafStrmRateSet.tsid, 1); - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCREQUEST), FRFL("num_tsrates: %d.\n"), pFrm->CCXTrafStrmRateSet.num_tsrates); - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCREQUEST), ( tANI_U8* ) pFrm->CCXTrafStrmRateSet.tsrates, pFrm->CCXTrafStrmRateSet.num_tsrates); + FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCREQUEST), ( tANI_U8* )&pFrm->ESETrafStrmRateSet.tsid, 1); + FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCREQUEST), FRFL("num_tsrates: %d.\n"), pFrm->ESETrafStrmRateSet.num_tsrates); + FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCREQUEST), ( tANI_U8* ) pFrm->ESETrafStrmRateSet.tsrates, pFrm->ESETrafStrmRateSet.num_tsrates); } FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCREQUEST), FRFL("P2PIEOpaque:\n")); if (!pFrm->P2PIEOpaque.present) @@ -16643,6 +16856,16 @@ tANI_U32 dot11fUnpackReAssocRequest(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U32 FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCREQUEST), FRFL("rxNSS (3): %d\n"), pFrm->OperatingMode.rxNSS); FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCREQUEST), FRFL("rxNSSType (1): %d\n"), pFrm->OperatingMode.rxNSSType); } + FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCREQUEST), FRFL("QosMapSet:\n")); + if (!pFrm->QosMapSet.present) + { + FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCREQUEST), FRFL("Not present.\n")); + } + else + { + FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCREQUEST), FRFL("num_dscp_exceptions: %d.\n"), pFrm->QosMapSet.num_dscp_exceptions); + FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCREQUEST), ( tANI_U8* ) pFrm->QosMapSet.dscp_exceptions, pFrm->QosMapSet.num_dscp_exceptions); + } } # endif // DOT11F_DUMP_FRAMES return status; @@ -16668,20 +16891,23 @@ tANI_U32 dot11fUnpackReAssocRequest(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U32 {offsetof(tDot11fReAssocResponse, FTInfo), offsetof(tDot11fIEFTInfo, present), 0, "FTInfo" , 0, 84, 222, SigIeFTInfo, {0, 0, 0, 0, 0}, 0, DOT11F_EID_FTINFO, 0, }, {offsetof(tDot11fReAssocResponse, RICDataDesc), offsetof(tDot11fIERICDataDesc, present), offsetof(tDot11fReAssocResponse, num_RICDataDesc), "RICDataDesc" , 2, 2, 550, SigIeRICDataDesc, {0, 0, 0, 0, 0}, 0, DOT11F_EID_RICDATADESC, 0, }, {offsetof(tDot11fReAssocResponse, WPA), offsetof(tDot11fIEWPA, present), 0, "WPA" , 0, 8, 50, SigIeWPA, {0, 80, 242, 1, 0}, 4, DOT11F_EID_WPA, 0, }, + {offsetof(tDot11fReAssocResponse, TimeoutInterval), offsetof(tDot11fIETimeoutInterval, present), 0, "TimeoutInterval" , 0, 7, 7, SigIeTimeoutInterval, {0, 0, 0, 0, 0}, 0, DOT11F_EID_TIMEOUTINTERVAL, 0, }, {offsetof(tDot11fReAssocResponse, HTCaps), offsetof(tDot11fIEHTCaps, present), 0, "HTCaps" , 0, 28, 60, SigIeHTCaps, {0, 0, 0, 0, 0}, 0, DOT11F_EID_HTCAPS, 0, }, {offsetof(tDot11fReAssocResponse, HTInfo), offsetof(tDot11fIEHTInfo, present), 0, "HTInfo" , 0, 24, 56, SigIeHTInfo, {0, 0, 0, 0, 0}, 0, DOT11F_EID_HTINFO, 0, }, {offsetof(tDot11fReAssocResponse, WMMParams), offsetof(tDot11fIEWMMParams, present), 0, "WMMParams" , 0, 26, 26, SigIeWMMParams, {0, 80, 242, 2, 1}, 5, DOT11F_EID_WMMPARAMS, 0, }, - {offsetof(tDot11fReAssocResponse, CCXRadMgmtCap), offsetof(tDot11fIECCXRadMgmtCap, present), 0, "CCXRadMgmtCap" , 0, 8, 8, SigIeCCXRadMgmtCap, {0, 64, 150, 1, 0}, 4, DOT11F_EID_CCXRADMGMTCAP, 0, }, - {offsetof(tDot11fReAssocResponse, CCXTrafStrmMet), offsetof(tDot11fIECCXTrafStrmMet, present), 0, "CCXTrafStrmMet" , 0, 10, 10, SigIeCCXTrafStrmMet, {0, 64, 150, 7, 0}, 4, DOT11F_EID_CCXTRAFSTRMMET, 0, }, - {offsetof(tDot11fReAssocResponse, CCXTxmitPower), offsetof(tDot11fIECCXTxmitPower, present), 0, "CCXTxmitPower" , 0, 8, 8, SigIeCCXTxmitPower, {0, 64, 150, 0, 0}, 4, DOT11F_EID_CCXTXMITPOWER, 0, }, + {offsetof(tDot11fReAssocResponse, ESERadMgmtCap), offsetof(tDot11fIEESERadMgmtCap, present), 0, "ESERadMgmtCap" , 0, 8, 8, SigIeESERadMgmtCap, {0, 64, 150, 1, 0}, 4, DOT11F_EID_ESERADMGMTCAP, 0, }, + {offsetof(tDot11fReAssocResponse, ESETrafStrmMet), offsetof(tDot11fIEESETrafStrmMet, present), 0, "ESETrafStrmMet" , 0, 10, 10, SigIeESETrafStrmMet, {0, 64, 150, 7, 0}, 4, DOT11F_EID_ESETRAFSTRMMET, 0, }, + {offsetof(tDot11fReAssocResponse, ESETxmitPower), offsetof(tDot11fIEESETxmitPower, present), 0, "ESETxmitPower" , 0, 8, 8, SigIeESETxmitPower, {0, 64, 150, 0, 0}, 4, DOT11F_EID_ESETXMITPOWER, 0, }, {offsetof(tDot11fReAssocResponse, WMMTSPEC), offsetof(tDot11fIEWMMTSPEC, present), offsetof(tDot11fReAssocResponse, num_WMMTSPEC), "WMMTSPEC" , 4, 63, 63, SigIeWMMTSPEC, {0, 80, 242, 2, 2}, 5, DOT11F_EID_WMMTSPEC, 0, }, - {offsetof(tDot11fReAssocResponse, CCXTrafStrmRateSet), offsetof(tDot11fIECCXTrafStrmRateSet, present), 0, "CCXTrafStrmRateSet" , 0, 7, 15, SigIeCCXTrafStrmRateSet, {0, 64, 150, 8, 0}, 4, DOT11F_EID_CCXTRAFSTRMRATESET, 0, }, + {offsetof(tDot11fReAssocResponse, ESETrafStrmRateSet), offsetof(tDot11fIEESETrafStrmRateSet, present), 0, "ESETrafStrmRateSet" , 0, 7, 15, SigIeESETrafStrmRateSet, {0, 64, 150, 8, 0}, 4, DOT11F_EID_ESETRAFSTRMRATESET, 0, }, {offsetof(tDot11fReAssocResponse, Airgo), offsetof(tDot11fIEAirgo, present), 0, "Airgo" , 0, 5, 232, SigIeAirgo, {0, 10, 245, 0, 0}, 3, DOT11F_EID_AIRGO, 0, }, {offsetof(tDot11fReAssocResponse, WscReassocRes), offsetof(tDot11fIEWscReassocRes, present), 0, "WscReassocRes" , 0, 6, 37, SigIeWscReassocRes, {0, 80, 242, 4, 0}, 4, DOT11F_EID_WSCREASSOCRES, 0, }, {offsetof(tDot11fReAssocResponse, P2PAssocRes), offsetof(tDot11fIEP2PAssocRes, present), 0, "P2PAssocRes" , 0, 6, 17, SigIeP2PAssocRes, {80, 111, 154, 9, 0}, 4, DOT11F_EID_P2PASSOCRES, 0, }, {offsetof(tDot11fReAssocResponse, VHTCaps), offsetof(tDot11fIEVHTCaps, present), 0, "VHTCaps" , 0, 14, 14, SigIeVHTCaps, {0, 0, 0, 0, 0}, 0, DOT11F_EID_VHTCAPS, 0, }, {offsetof(tDot11fReAssocResponse, VHTOperation), offsetof(tDot11fIEVHTOperation, present), 0, "VHTOperation" , 0, 7, 7, SigIeVHTOperation, {0, 0, 0, 0, 0}, 0, DOT11F_EID_VHTOPERATION, 0, }, {offsetof(tDot11fReAssocResponse, ExtCap), offsetof(tDot11fIEExtCap, present), 0, "ExtCap" , 0, 10, 10, SigIeExtCap, {0, 0, 0, 0, 0}, 0, DOT11F_EID_EXTCAP, 0, }, + {offsetof(tDot11fReAssocResponse, OBSSScanParameters), offsetof(tDot11fIEOBSSScanParameters, present), 0, "OBSSScanParameters" , 0, 16, 16, SigIeOBSSScanParameters, {0, 0, 0, 0, 0}, 0, DOT11F_EID_OBSSSCANPARAMETERS, 0, }, + {offsetof(tDot11fReAssocResponse, QosMapSet), offsetof(tDot11fIEQosMapSet, present), 0, "QosMapSet" , 0, 2, 62, SigIeQosMapSet, {0, 0, 0, 0, 0}, 0, DOT11F_EID_QOSMAPSET, 0, }, {0, 0, 0, NULL, 0, 0, 0, 0, {0, 0, 0, 0, 0}, 0, 0xff, 0, }, }; tANI_U32 dot11fUnpackReAssocResponse(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U32 nBuf, tDot11fReAssocResponse *pFrm) @@ -17194,6 +17420,16 @@ tANI_U32 dot11fUnpackReAssocResponse(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U3 FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCRESPONSE), ( tANI_U8* ) pFrm->WPA.auth_suites, 4 * pFrm->WPA.auth_suite_count); FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCRESPONSE), ( tANI_U8* )&pFrm->WPA.caps, 2); } + FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCRESPONSE), FRFL("TimeoutInterval:\n")); + if (!pFrm->TimeoutInterval.present) + { + FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCRESPONSE), FRFL("Not present.\n")); + } + else + { + FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCRESPONSE), ( tANI_U8* )&pFrm->TimeoutInterval.timeoutType, 1); + FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCRESPONSE), ( tANI_U8* )&pFrm->TimeoutInterval.timeoutValue, 4); + } FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCRESPONSE), FRFL("HTCaps:\n")); if (!pFrm->HTCaps.present) { @@ -17319,37 +17555,37 @@ tANI_U32 dot11fUnpackReAssocResponse(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U3 FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCRESPONSE), FRFL("acvo_acwmax (4): %d\n"), pFrm->WMMParams.acvo_acwmax); FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCRESPONSE), ( tANI_U8* )&pFrm->WMMParams.acvo_txoplimit, 2); } - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCRESPONSE), FRFL("CCXRadMgmtCap:\n")); - if (!pFrm->CCXRadMgmtCap.present) + FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCRESPONSE), FRFL("ESERadMgmtCap:\n")); + if (!pFrm->ESERadMgmtCap.present) { FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCRESPONSE), FRFL("Not present.\n")); } else { - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCRESPONSE), ( tANI_U8* )&pFrm->CCXRadMgmtCap.mgmt_state, 1); - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCRESPONSE), FRFL("mbssid_mask (3): %d\n"), pFrm->CCXRadMgmtCap.mbssid_mask); - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCRESPONSE), FRFL("reserved (5): %d\n"), pFrm->CCXRadMgmtCap.reserved); + FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCRESPONSE), ( tANI_U8* )&pFrm->ESERadMgmtCap.mgmt_state, 1); + FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCRESPONSE), FRFL("mbssid_mask (3): %d\n"), pFrm->ESERadMgmtCap.mbssid_mask); + FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCRESPONSE), FRFL("reserved (5): %d\n"), pFrm->ESERadMgmtCap.reserved); } - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCRESPONSE), FRFL("CCXTrafStrmMet:\n")); - if (!pFrm->CCXTrafStrmMet.present) + FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCRESPONSE), FRFL("ESETrafStrmMet:\n")); + if (!pFrm->ESETrafStrmMet.present) { FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCRESPONSE), FRFL("Not present.\n")); } else { - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCRESPONSE), ( tANI_U8* )&pFrm->CCXTrafStrmMet.tsid, 1); - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCRESPONSE), ( tANI_U8* )&pFrm->CCXTrafStrmMet.state, 1); - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCRESPONSE), ( tANI_U8* )&pFrm->CCXTrafStrmMet.msmt_interval, 2); + FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCRESPONSE), ( tANI_U8* )&pFrm->ESETrafStrmMet.tsid, 1); + FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCRESPONSE), ( tANI_U8* )&pFrm->ESETrafStrmMet.state, 1); + FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCRESPONSE), ( tANI_U8* )&pFrm->ESETrafStrmMet.msmt_interval, 2); } - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCRESPONSE), FRFL("CCXTxmitPower:\n")); - if (!pFrm->CCXTxmitPower.present) + FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCRESPONSE), FRFL("ESETxmitPower:\n")); + if (!pFrm->ESETxmitPower.present) { FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCRESPONSE), FRFL("Not present.\n")); } else { - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCRESPONSE), ( tANI_U8* )&pFrm->CCXTxmitPower.power_limit, 1); - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCRESPONSE), ( tANI_U8* )&pFrm->CCXTxmitPower.reserved, 1); + FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCRESPONSE), ( tANI_U8* )&pFrm->ESETxmitPower.power_limit, 1); + FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCRESPONSE), ( tANI_U8* )&pFrm->ESETxmitPower.reserved, 1); } for (i = 0; i < pFrm->num_WMMTSPEC; ++i) { @@ -17389,16 +17625,16 @@ tANI_U32 dot11fUnpackReAssocResponse(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U3 FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCRESPONSE), ( tANI_U8* )&pFrm->WMMTSPEC[i].medium_time, 2); } } - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCRESPONSE), FRFL("CCXTrafStrmRateSet:\n")); - if (!pFrm->CCXTrafStrmRateSet.present) + FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCRESPONSE), FRFL("ESETrafStrmRateSet:\n")); + if (!pFrm->ESETrafStrmRateSet.present) { FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCRESPONSE), FRFL("Not present.\n")); } else { - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCRESPONSE), ( tANI_U8* )&pFrm->CCXTrafStrmRateSet.tsid, 1); - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCRESPONSE), FRFL("num_tsrates: %d.\n"), pFrm->CCXTrafStrmRateSet.num_tsrates); - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCRESPONSE), ( tANI_U8* ) pFrm->CCXTrafStrmRateSet.tsrates, pFrm->CCXTrafStrmRateSet.num_tsrates); + FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCRESPONSE), ( tANI_U8* )&pFrm->ESETrafStrmRateSet.tsid, 1); + FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCRESPONSE), FRFL("num_tsrates: %d.\n"), pFrm->ESETrafStrmRateSet.num_tsrates); + FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCRESPONSE), ( tANI_U8* ) pFrm->ESETrafStrmRateSet.tsrates, pFrm->ESETrafStrmRateSet.num_tsrates); } FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCRESPONSE), FRFL("Airgo:\n")); if (!pFrm->Airgo.present) @@ -17807,6 +18043,31 @@ tANI_U32 dot11fUnpackReAssocResponse(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U3 FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCRESPONSE), FRFL("operModeNotification (1): %d\n"), pFrm->ExtCap.operModeNotification); FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCRESPONSE), FRFL("reserved7 (1): %d\n"), pFrm->ExtCap.reserved7); } + FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCRESPONSE), FRFL("OBSSScanParameters:\n")); + if (!pFrm->OBSSScanParameters.present) + { + FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCRESPONSE), FRFL("Not present.\n")); + } + else + { + FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCRESPONSE), ( tANI_U8* )&pFrm->OBSSScanParameters.obssScanPassiveDwell, 2); + FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCRESPONSE), ( tANI_U8* )&pFrm->OBSSScanParameters.obssScanActiveDwell, 2); + FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCRESPONSE), ( tANI_U8* )&pFrm->OBSSScanParameters.bssChannelWidthTriggerScanInterval, 2); + FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCRESPONSE), ( tANI_U8* )&pFrm->OBSSScanParameters.obssScanPassiveTotalPerChannel, 2); + FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCRESPONSE), ( tANI_U8* )&pFrm->OBSSScanParameters.obssScanActiveTotalPerChannel, 2); + FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCRESPONSE), ( tANI_U8* )&pFrm->OBSSScanParameters.bssWidthChannelTransitionDelayFactor, 2); + FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCRESPONSE), ( tANI_U8* )&pFrm->OBSSScanParameters.obssScanActivityThreshold, 2); + } + FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCRESPONSE), FRFL("QosMapSet:\n")); + if (!pFrm->QosMapSet.present) + { + FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCRESPONSE), FRFL("Not present.\n")); + } + else + { + FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCRESPONSE), FRFL("num_dscp_exceptions: %d.\n"), pFrm->QosMapSet.num_dscp_exceptions); + FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCRESPONSE), ( tANI_U8* ) pFrm->QosMapSet.dscp_exceptions, pFrm->QosMapSet.num_dscp_exceptions); + } } # endif // DOT11F_DUMP_FRAMES return status; @@ -17850,6 +18111,41 @@ tANI_U32 dot11fUnpackSMPowerSave(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U32 nB } /* End dot11fUnpackSMPowerSave. */ + static const tFFDefn FFS_SaQueryReq[] = { + { "Category", offsetof(tDot11fSaQueryReq, Category), SigFfCategory , DOT11F_FF_CATEGORY_LEN, }, + { "Action", offsetof(tDot11fSaQueryReq, Action), SigFfAction , DOT11F_FF_ACTION_LEN, }, + { "TransactionId", offsetof(tDot11fSaQueryReq, TransactionId), SigFfTransactionId , DOT11F_FF_TRANSACTIONID_LEN, }, + { NULL, 0, 0, 0,}, + }; + + static const tIEDefn IES_SaQueryReq[] = { + {0, 0, 0, NULL, 0, 0, 0, 0, {0, 0, 0, 0, 0}, 0, 0xff, 0, }, }; + +tANI_U32 dot11fUnpackSaQueryReq(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U32 nBuf, tDot11fSaQueryReq *pFrm) +{ + tANI_U32 i = 0; + tANI_U32 status = 0; + status = UnpackCore(pCtx, pBuf, nBuf, FFS_SaQueryReq, IES_SaQueryReq, ( tANI_U8* )pFrm, sizeof(*pFrm)); + + (void)i; +# ifdef DOT11F_DUMP_FRAMES + if (!DOT11F_FAILED(status)) + { + FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_SAQUERYREQ), FRFL("Unpacked the SaQueryReq:\n")); + FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_SAQUERYREQ), pBuf, nBuf); + FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_SAQUERYREQ), FRFL("to:\n")); + FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_SAQUERYREQ), FRFL("Category:\n")); + FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_SAQUERYREQ), ( tANI_U8* )&pFrm->Category.category, 1); + FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_SAQUERYREQ), FRFL("Action:\n")); + FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_SAQUERYREQ), ( tANI_U8* )&pFrm->Action.action, 1); + FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_SAQUERYREQ), FRFL("TransactionId:\n")); + FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_SAQUERYREQ), ( tANI_U8* )&pFrm->TransactionId.transId, 2); + } +# endif // DOT11F_DUMP_FRAMES + return status; + +} /* End dot11fUnpackSaQueryReq. */ + static const tFFDefn FFS_SaQueryRsp[] = { { "Category", offsetof(tDot11fSaQueryRsp, Category), SigFfCategory , DOT11F_FF_CATEGORY_LEN, }, { "Action", offsetof(tDot11fSaQueryRsp, Action), SigFfAction , DOT11F_FF_ACTION_LEN, }, @@ -17944,10 +18240,11 @@ tANI_U32 dot11fUnpackTDLSDisReq(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U32 nBu {offsetof(tDot11fTDLSDisRsp, SuppRates), offsetof(tDot11fIESuppRates, present), 0, "SuppRates" , 0, 2, 14, SigIeSuppRates, {0, 0, 0, 0, 0}, 0, DOT11F_EID_SUPPRATES, 1, }, {offsetof(tDot11fTDLSDisRsp, ExtSuppRates), offsetof(tDot11fIEExtSuppRates, present), 0, "ExtSuppRates" , 0, 3, 14, SigIeExtSuppRates, {0, 0, 0, 0, 0}, 0, DOT11F_EID_EXTSUPPRATES, 0, }, {offsetof(tDot11fTDLSDisRsp, SuppChannels), offsetof(tDot11fIESuppChannels, present), 0, "SuppChannels" , 0, 4, 98, SigIeSuppChannels, {0, 0, 0, 0, 0}, 0, DOT11F_EID_SUPPCHANNELS, 0, }, + {offsetof(tDot11fTDLSDisRsp, SuppOperatingClasses), offsetof(tDot11fIESuppOperatingClasses, present), 0, "SuppOperatingClasses" , 0, 3, 34, SigIeSuppOperatingClasses, {0, 0, 0, 0, 0}, 0, DOT11F_EID_SUPPOPERATINGCLASSES, 0, }, {offsetof(tDot11fTDLSDisRsp, RSN), offsetof(tDot11fIERSN, present), 0, "RSN" , 0, 8, 116, SigIeRSN, {0, 0, 0, 0, 0}, 0, DOT11F_EID_RSN, 0, }, {offsetof(tDot11fTDLSDisRsp, ExtCap), offsetof(tDot11fIEExtCap, present), 0, "ExtCap" , 0, 10, 10, SigIeExtCap, {0, 0, 0, 0, 0}, 0, DOT11F_EID_EXTCAP, 0, }, {offsetof(tDot11fTDLSDisRsp, FTInfo), offsetof(tDot11fIEFTInfo, present), 0, "FTInfo" , 0, 84, 222, SigIeFTInfo, {0, 0, 0, 0, 0}, 0, DOT11F_EID_FTINFO, 0, }, - {offsetof(tDot11fTDLSDisRsp, FTTimeoutInterval), offsetof(tDot11fIEFTTimeoutInterval, present), 0, "FTTimeoutInterval" , 0, 7, 7, SigIeFTTimeoutInterval, {0, 0, 0, 0, 0}, 0, DOT11F_EID_FTTIMEOUTINTERVAL, 0, }, + {offsetof(tDot11fTDLSDisRsp, TimeoutInterval), offsetof(tDot11fIETimeoutInterval, present), 0, "TimeoutInterval" , 0, 7, 7, SigIeTimeoutInterval, {0, 0, 0, 0, 0}, 0, DOT11F_EID_TIMEOUTINTERVAL, 0, }, {offsetof(tDot11fTDLSDisRsp, RICData), offsetof(tDot11fIERICData, present), 0, "RICData" , 0, 6, 6, SigIeRICData, {0, 0, 0, 0, 0}, 0, DOT11F_EID_RICDATA, 0, }, {offsetof(tDot11fTDLSDisRsp, HTCaps), offsetof(tDot11fIEHTCaps, present), 0, "HTCaps" , 0, 28, 60, SigIeHTCaps, {0, 0, 0, 0, 0}, 0, DOT11F_EID_HTCAPS, 0, }, {offsetof(tDot11fTDLSDisRsp, LinkIdentifier), offsetof(tDot11fIELinkIdentifier, present), 0, "LinkIdentifier" , 0, 20, 20, SigIeLinkIdentifier, {0, 0, 0, 0, 0}, 0, DOT11F_EID_LINKIDENTIFIER, 1, }, @@ -18020,6 +18317,16 @@ tANI_U32 dot11fUnpackTDLSDisRsp(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U32 nBu FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSDISRSP), FRFL("num_bands: %d.\n"), pFrm->SuppChannels.num_bands); FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSDISRSP), ( tANI_U8* ) pFrm->SuppChannels.bands, 2 * pFrm->SuppChannels.num_bands); } + FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSDISRSP), FRFL("SuppOperatingClasses:\n")); + if (!pFrm->SuppOperatingClasses.present) + { + FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSDISRSP), FRFL("Not present.\n")); + } + else + { + FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSDISRSP), FRFL("num_classes: %d.\n"), pFrm->SuppOperatingClasses.num_classes); + FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSDISRSP), ( tANI_U8* ) pFrm->SuppOperatingClasses.classes, pFrm->SuppOperatingClasses.num_classes); + } FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSDISRSP), FRFL("RSN:\n")); if (!pFrm->RSN.present) { @@ -18155,15 +18462,15 @@ tANI_U32 dot11fUnpackTDLSDisRsp(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U32 nBu FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSDISRSP), ( tANI_U8* )&pFrm->FTInfo.IGTK.key, 24); } } - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSDISRSP), FRFL("FTTimeoutInterval:\n")); - if (!pFrm->FTTimeoutInterval.present) + FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSDISRSP), FRFL("TimeoutInterval:\n")); + if (!pFrm->TimeoutInterval.present) { FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSDISRSP), FRFL("Not present.\n")); } else { - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSDISRSP), ( tANI_U8* )&pFrm->FTTimeoutInterval.timeoutType, 1); - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSDISRSP), ( tANI_U8* )&pFrm->FTTimeoutInterval.timeoutValue, 4); + FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSDISRSP), ( tANI_U8* )&pFrm->TimeoutInterval.timeoutType, 1); + FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSDISRSP), ( tANI_U8* )&pFrm->TimeoutInterval.timeoutValue, 4); } FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSDISRSP), FRFL("RICData:\n")); if (!pFrm->RICData.present) @@ -18415,7 +18722,7 @@ tANI_U32 dot11fUnpackTDLSPeerTrafficRsp(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI {offsetof(tDot11fTDLSSetupCnf, RSN), offsetof(tDot11fIERSN, present), 0, "RSN" , 0, 8, 116, SigIeRSN, {0, 0, 0, 0, 0}, 0, DOT11F_EID_RSN, 0, }, {offsetof(tDot11fTDLSSetupCnf, EDCAParamSet), offsetof(tDot11fIEEDCAParamSet, present), 0, "EDCAParamSet" , 0, 20, 20, SigIeEDCAParamSet, {0, 0, 0, 0, 0}, 0, DOT11F_EID_EDCAPARAMSET, 0, }, {offsetof(tDot11fTDLSSetupCnf, FTInfo), offsetof(tDot11fIEFTInfo, present), 0, "FTInfo" , 0, 84, 222, SigIeFTInfo, {0, 0, 0, 0, 0}, 0, DOT11F_EID_FTINFO, 0, }, - {offsetof(tDot11fTDLSSetupCnf, FTTimeoutInterval), offsetof(tDot11fIEFTTimeoutInterval, present), 0, "FTTimeoutInterval" , 0, 7, 7, SigIeFTTimeoutInterval, {0, 0, 0, 0, 0}, 0, DOT11F_EID_FTTIMEOUTINTERVAL, 0, }, + {offsetof(tDot11fTDLSSetupCnf, TimeoutInterval), offsetof(tDot11fIETimeoutInterval, present), 0, "TimeoutInterval" , 0, 7, 7, SigIeTimeoutInterval, {0, 0, 0, 0, 0}, 0, DOT11F_EID_TIMEOUTINTERVAL, 0, }, {offsetof(tDot11fTDLSSetupCnf, HTInfo), offsetof(tDot11fIEHTInfo, present), 0, "HTInfo" , 0, 24, 56, SigIeHTInfo, {0, 0, 0, 0, 0}, 0, DOT11F_EID_HTINFO, 0, }, {offsetof(tDot11fTDLSSetupCnf, LinkIdentifier), offsetof(tDot11fIELinkIdentifier, present), 0, "LinkIdentifier" , 0, 20, 20, SigIeLinkIdentifier, {0, 0, 0, 0, 0}, 0, DOT11F_EID_LINKIDENTIFIER, 0, }, {offsetof(tDot11fTDLSSetupCnf, WMMInfoStation), offsetof(tDot11fIEWMMInfoStation, present), 0, "WMMInfoStation" , 0, 9, 9, SigIeWMMInfoStation, {0, 80, 242, 2, 0}, 5, DOT11F_EID_WMMINFOSTATION, 0, }, @@ -18558,15 +18865,15 @@ tANI_U32 dot11fUnpackTDLSSetupCnf(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U32 n FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSSETUPCNF), ( tANI_U8* )&pFrm->FTInfo.IGTK.key, 24); } } - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSSETUPCNF), FRFL("FTTimeoutInterval:\n")); - if (!pFrm->FTTimeoutInterval.present) + FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSSETUPCNF), FRFL("TimeoutInterval:\n")); + if (!pFrm->TimeoutInterval.present) { FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSSETUPCNF), FRFL("Not present.\n")); } else { - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSSETUPCNF), ( tANI_U8* )&pFrm->FTTimeoutInterval.timeoutType, 1); - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSSETUPCNF), ( tANI_U8* )&pFrm->FTTimeoutInterval.timeoutValue, 4); + FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSSETUPCNF), ( tANI_U8* )&pFrm->TimeoutInterval.timeoutType, 1); + FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSSETUPCNF), ( tANI_U8* )&pFrm->TimeoutInterval.timeoutValue, 4); } FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSSETUPCNF), FRFL("HTInfo:\n")); if (!pFrm->HTInfo.present) @@ -18669,9 +18976,10 @@ tANI_U32 dot11fUnpackTDLSSetupCnf(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U32 n {offsetof(tDot11fTDLSSetupReq, SuppChannels), offsetof(tDot11fIESuppChannels, present), 0, "SuppChannels" , 0, 4, 98, SigIeSuppChannels, {0, 0, 0, 0, 0}, 0, DOT11F_EID_SUPPCHANNELS, 0, }, {offsetof(tDot11fTDLSSetupReq, RSN), offsetof(tDot11fIERSN, present), 0, "RSN" , 0, 8, 116, SigIeRSN, {0, 0, 0, 0, 0}, 0, DOT11F_EID_RSN, 0, }, {offsetof(tDot11fTDLSSetupReq, ExtCap), offsetof(tDot11fIEExtCap, present), 0, "ExtCap" , 0, 10, 10, SigIeExtCap, {0, 0, 0, 0, 0}, 0, DOT11F_EID_EXTCAP, 0, }, + {offsetof(tDot11fTDLSSetupReq, SuppOperatingClasses), offsetof(tDot11fIESuppOperatingClasses, present), 0, "SuppOperatingClasses" , 0, 3, 34, SigIeSuppOperatingClasses, {0, 0, 0, 0, 0}, 0, DOT11F_EID_SUPPOPERATINGCLASSES, 0, }, {offsetof(tDot11fTDLSSetupReq, QOSCapsStation), offsetof(tDot11fIEQOSCapsStation, present), 0, "QOSCapsStation" , 0, 3, 3, SigIeQOSCapsStation, {0, 0, 0, 0, 0}, 0, DOT11F_EID_QOSCAPSSTATION, 0, }, {offsetof(tDot11fTDLSSetupReq, FTInfo), offsetof(tDot11fIEFTInfo, present), 0, "FTInfo" , 0, 84, 222, SigIeFTInfo, {0, 0, 0, 0, 0}, 0, DOT11F_EID_FTINFO, 0, }, - {offsetof(tDot11fTDLSSetupReq, FTTimeoutInterval), offsetof(tDot11fIEFTTimeoutInterval, present), 0, "FTTimeoutInterval" , 0, 7, 7, SigIeFTTimeoutInterval, {0, 0, 0, 0, 0}, 0, DOT11F_EID_FTTIMEOUTINTERVAL, 0, }, + {offsetof(tDot11fTDLSSetupReq, TimeoutInterval), offsetof(tDot11fIETimeoutInterval, present), 0, "TimeoutInterval" , 0, 7, 7, SigIeTimeoutInterval, {0, 0, 0, 0, 0}, 0, DOT11F_EID_TIMEOUTINTERVAL, 0, }, {offsetof(tDot11fTDLSSetupReq, RICData), offsetof(tDot11fIERICData, present), 0, "RICData" , 0, 6, 6, SigIeRICData, {0, 0, 0, 0, 0}, 0, DOT11F_EID_RICDATA, 0, }, {offsetof(tDot11fTDLSSetupReq, HTCaps), offsetof(tDot11fIEHTCaps, present), 0, "HTCaps" , 0, 28, 60, SigIeHTCaps, {0, 0, 0, 0, 0}, 0, DOT11F_EID_HTCAPS, 0, }, {offsetof(tDot11fTDLSSetupReq, LinkIdentifier), offsetof(tDot11fIELinkIdentifier, present), 0, "LinkIdentifier" , 0, 20, 20, SigIeLinkIdentifier, {0, 0, 0, 0, 0}, 0, DOT11F_EID_LINKIDENTIFIER, 1, }, @@ -18834,6 +19142,16 @@ tANI_U32 dot11fUnpackTDLSSetupReq(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U32 n FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSSETUPREQ), FRFL("operModeNotification (1): %d\n"), pFrm->ExtCap.operModeNotification); FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSSETUPREQ), FRFL("reserved7 (1): %d\n"), pFrm->ExtCap.reserved7); } + FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSSETUPREQ), FRFL("SuppOperatingClasses:\n")); + if (!pFrm->SuppOperatingClasses.present) + { + FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSSETUPREQ), FRFL("Not present.\n")); + } + else + { + FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSSETUPREQ), FRFL("num_classes: %d.\n"), pFrm->SuppOperatingClasses.num_classes); + FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSSETUPREQ), ( tANI_U8* ) pFrm->SuppOperatingClasses.classes, pFrm->SuppOperatingClasses.num_classes); + } FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSSETUPREQ), FRFL("QOSCapsStation:\n")); if (!pFrm->QOSCapsStation.present) { @@ -18907,15 +19225,15 @@ tANI_U32 dot11fUnpackTDLSSetupReq(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U32 n FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSSETUPREQ), ( tANI_U8* )&pFrm->FTInfo.IGTK.key, 24); } } - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSSETUPREQ), FRFL("FTTimeoutInterval:\n")); - if (!pFrm->FTTimeoutInterval.present) + FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSSETUPREQ), FRFL("TimeoutInterval:\n")); + if (!pFrm->TimeoutInterval.present) { FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSSETUPREQ), FRFL("Not present.\n")); } else { - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSSETUPREQ), ( tANI_U8* )&pFrm->FTTimeoutInterval.timeoutType, 1); - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSSETUPREQ), ( tANI_U8* )&pFrm->FTTimeoutInterval.timeoutValue, 4); + FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSSETUPREQ), ( tANI_U8* )&pFrm->TimeoutInterval.timeoutType, 1); + FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSSETUPREQ), ( tANI_U8* )&pFrm->TimeoutInterval.timeoutValue, 4); } FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSSETUPREQ), FRFL("RICData:\n")); if (!pFrm->RICData.present) @@ -19077,9 +19395,10 @@ tANI_U32 dot11fUnpackTDLSSetupReq(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U32 n {offsetof(tDot11fTDLSSetupRsp, SuppChannels), offsetof(tDot11fIESuppChannels, present), 0, "SuppChannels" , 0, 4, 98, SigIeSuppChannels, {0, 0, 0, 0, 0}, 0, DOT11F_EID_SUPPCHANNELS, 0, }, {offsetof(tDot11fTDLSSetupRsp, RSN), offsetof(tDot11fIERSN, present), 0, "RSN" , 0, 8, 116, SigIeRSN, {0, 0, 0, 0, 0}, 0, DOT11F_EID_RSN, 0, }, {offsetof(tDot11fTDLSSetupRsp, ExtCap), offsetof(tDot11fIEExtCap, present), 0, "ExtCap" , 0, 10, 10, SigIeExtCap, {0, 0, 0, 0, 0}, 0, DOT11F_EID_EXTCAP, 0, }, + {offsetof(tDot11fTDLSSetupRsp, SuppOperatingClasses), offsetof(tDot11fIESuppOperatingClasses, present), 0, "SuppOperatingClasses" , 0, 3, 34, SigIeSuppOperatingClasses, {0, 0, 0, 0, 0}, 0, DOT11F_EID_SUPPOPERATINGCLASSES, 0, }, {offsetof(tDot11fTDLSSetupRsp, QOSCapsStation), offsetof(tDot11fIEQOSCapsStation, present), 0, "QOSCapsStation" , 0, 3, 3, SigIeQOSCapsStation, {0, 0, 0, 0, 0}, 0, DOT11F_EID_QOSCAPSSTATION, 0, }, {offsetof(tDot11fTDLSSetupRsp, FTInfo), offsetof(tDot11fIEFTInfo, present), 0, "FTInfo" , 0, 84, 222, SigIeFTInfo, {0, 0, 0, 0, 0}, 0, DOT11F_EID_FTINFO, 0, }, - {offsetof(tDot11fTDLSSetupRsp, FTTimeoutInterval), offsetof(tDot11fIEFTTimeoutInterval, present), 0, "FTTimeoutInterval" , 0, 7, 7, SigIeFTTimeoutInterval, {0, 0, 0, 0, 0}, 0, DOT11F_EID_FTTIMEOUTINTERVAL, 0, }, + {offsetof(tDot11fTDLSSetupRsp, TimeoutInterval), offsetof(tDot11fIETimeoutInterval, present), 0, "TimeoutInterval" , 0, 7, 7, SigIeTimeoutInterval, {0, 0, 0, 0, 0}, 0, DOT11F_EID_TIMEOUTINTERVAL, 0, }, {offsetof(tDot11fTDLSSetupRsp, RICData), offsetof(tDot11fIERICData, present), 0, "RICData" , 0, 6, 6, SigIeRICData, {0, 0, 0, 0, 0}, 0, DOT11F_EID_RICDATA, 0, }, {offsetof(tDot11fTDLSSetupRsp, HTCaps), offsetof(tDot11fIEHTCaps, present), 0, "HTCaps" , 0, 28, 60, SigIeHTCaps, {0, 0, 0, 0, 0}, 0, DOT11F_EID_HTCAPS, 0, }, {offsetof(tDot11fTDLSSetupRsp, LinkIdentifier), offsetof(tDot11fIELinkIdentifier, present), 0, "LinkIdentifier" , 0, 20, 20, SigIeLinkIdentifier, {0, 0, 0, 0, 0}, 0, DOT11F_EID_LINKIDENTIFIER, 0, }, @@ -19245,6 +19564,16 @@ tANI_U32 dot11fUnpackTDLSSetupRsp(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U32 n FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSSETUPRSP), FRFL("operModeNotification (1): %d\n"), pFrm->ExtCap.operModeNotification); FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSSETUPRSP), FRFL("reserved7 (1): %d\n"), pFrm->ExtCap.reserved7); } + FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSSETUPRSP), FRFL("SuppOperatingClasses:\n")); + if (!pFrm->SuppOperatingClasses.present) + { + FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSSETUPRSP), FRFL("Not present.\n")); + } + else + { + FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSSETUPRSP), FRFL("num_classes: %d.\n"), pFrm->SuppOperatingClasses.num_classes); + FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSSETUPRSP), ( tANI_U8* ) pFrm->SuppOperatingClasses.classes, pFrm->SuppOperatingClasses.num_classes); + } FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSSETUPRSP), FRFL("QOSCapsStation:\n")); if (!pFrm->QOSCapsStation.present) { @@ -19318,15 +19647,15 @@ tANI_U32 dot11fUnpackTDLSSetupRsp(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U32 n FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSSETUPRSP), ( tANI_U8* )&pFrm->FTInfo.IGTK.key, 24); } } - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSSETUPRSP), FRFL("FTTimeoutInterval:\n")); - if (!pFrm->FTTimeoutInterval.present) + FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSSETUPRSP), FRFL("TimeoutInterval:\n")); + if (!pFrm->TimeoutInterval.present) { FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSSETUPRSP), FRFL("Not present.\n")); } else { - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSSETUPRSP), ( tANI_U8* )&pFrm->FTTimeoutInterval.timeoutType, 1); - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSSETUPRSP), ( tANI_U8* )&pFrm->FTTimeoutInterval.timeoutValue, 4); + FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSSETUPRSP), ( tANI_U8* )&pFrm->TimeoutInterval.timeoutType, 1); + FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSSETUPRSP), ( tANI_U8* )&pFrm->TimeoutInterval.timeoutValue, 4); } FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSSETUPRSP), FRFL("RICData:\n")); if (!pFrm->RICData.present) @@ -19728,7 +20057,7 @@ tANI_U32 dot11fUnpackVHTGidManagementActionFrame(tpAniSirGlobal pCtx, tANI_U8 *p static const tIEDefn IES_WMMAddTSRequest[] = { {offsetof(tDot11fWMMAddTSRequest, WMMTSPEC), offsetof(tDot11fIEWMMTSPEC, present), 0, "WMMTSPEC" , 0, 63, 63, SigIeWMMTSPEC, {0, 80, 242, 2, 2}, 5, DOT11F_EID_WMMTSPEC, 1, }, - {offsetof(tDot11fWMMAddTSRequest, CCXTrafStrmRateSet), offsetof(tDot11fIECCXTrafStrmRateSet, present), 0, "CCXTrafStrmRateSet" , 0, 7, 15, SigIeCCXTrafStrmRateSet, {0, 64, 150, 8, 0}, 4, DOT11F_EID_CCXTRAFSTRMRATESET, 0, }, + {offsetof(tDot11fWMMAddTSRequest, ESETrafStrmRateSet), offsetof(tDot11fIEESETrafStrmRateSet, present), 0, "ESETrafStrmRateSet" , 0, 7, 15, SigIeESETrafStrmRateSet, {0, 64, 150, 8, 0}, 4, DOT11F_EID_ESETRAFSTRMRATESET, 0, }, {0, 0, 0, NULL, 0, 0, 0, 0, {0, 0, 0, 0, 0}, 0, 0xff, 0, }, }; tANI_U32 dot11fUnpackWMMAddTSRequest(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U32 nBuf, tDot11fWMMAddTSRequest *pFrm) @@ -19787,16 +20116,16 @@ tANI_U32 dot11fUnpackWMMAddTSRequest(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U3 FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_WMMADDTSREQUEST), ( tANI_U8* )&pFrm->WMMTSPEC.surplus_bw_allowance, 2); FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_WMMADDTSREQUEST), ( tANI_U8* )&pFrm->WMMTSPEC.medium_time, 2); } - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_WMMADDTSREQUEST), FRFL("CCXTrafStrmRateSet:\n")); - if (!pFrm->CCXTrafStrmRateSet.present) + FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_WMMADDTSREQUEST), FRFL("ESETrafStrmRateSet:\n")); + if (!pFrm->ESETrafStrmRateSet.present) { FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_WMMADDTSREQUEST), FRFL("Not present.\n")); } else { - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_WMMADDTSREQUEST), ( tANI_U8* )&pFrm->CCXTrafStrmRateSet.tsid, 1); - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_WMMADDTSREQUEST), FRFL("num_tsrates: %d.\n"), pFrm->CCXTrafStrmRateSet.num_tsrates); - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_WMMADDTSREQUEST), ( tANI_U8* ) pFrm->CCXTrafStrmRateSet.tsrates, pFrm->CCXTrafStrmRateSet.num_tsrates); + FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_WMMADDTSREQUEST), ( tANI_U8* )&pFrm->ESETrafStrmRateSet.tsid, 1); + FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_WMMADDTSREQUEST), FRFL("num_tsrates: %d.\n"), pFrm->ESETrafStrmRateSet.num_tsrates); + FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_WMMADDTSREQUEST), ( tANI_U8* ) pFrm->ESETrafStrmRateSet.tsrates, pFrm->ESETrafStrmRateSet.num_tsrates); } } # endif // DOT11F_DUMP_FRAMES @@ -19814,7 +20143,7 @@ tANI_U32 dot11fUnpackWMMAddTSRequest(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U3 static const tIEDefn IES_WMMAddTSResponse[] = { {offsetof(tDot11fWMMAddTSResponse, WMMTSPEC), offsetof(tDot11fIEWMMTSPEC, present), 0, "WMMTSPEC" , 0, 63, 63, SigIeWMMTSPEC, {0, 80, 242, 2, 2}, 5, DOT11F_EID_WMMTSPEC, 0, }, - {offsetof(tDot11fWMMAddTSResponse, CCXTrafStrmMet), offsetof(tDot11fIECCXTrafStrmMet, present), 0, "CCXTrafStrmMet" , 0, 10, 10, SigIeCCXTrafStrmMet, {0, 64, 150, 7, 0}, 4, DOT11F_EID_CCXTRAFSTRMMET, 0, }, + {offsetof(tDot11fWMMAddTSResponse, ESETrafStrmMet), offsetof(tDot11fIEESETrafStrmMet, present), 0, "ESETrafStrmMet" , 0, 10, 10, SigIeESETrafStrmMet, {0, 64, 150, 7, 0}, 4, DOT11F_EID_ESETRAFSTRMMET, 0, }, {0, 0, 0, NULL, 0, 0, 0, 0, {0, 0, 0, 0, 0}, 0, 0xff, 0, }, }; tANI_U32 dot11fUnpackWMMAddTSResponse(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U32 nBuf, tDot11fWMMAddTSResponse *pFrm) @@ -19873,16 +20202,16 @@ tANI_U32 dot11fUnpackWMMAddTSResponse(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_WMMADDTSRESPONSE), ( tANI_U8* )&pFrm->WMMTSPEC.surplus_bw_allowance, 2); FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_WMMADDTSRESPONSE), ( tANI_U8* )&pFrm->WMMTSPEC.medium_time, 2); } - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_WMMADDTSRESPONSE), FRFL("CCXTrafStrmMet:\n")); - if (!pFrm->CCXTrafStrmMet.present) + FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_WMMADDTSRESPONSE), FRFL("ESETrafStrmMet:\n")); + if (!pFrm->ESETrafStrmMet.present) { FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_WMMADDTSRESPONSE), FRFL("Not present.\n")); } else { - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_WMMADDTSRESPONSE), ( tANI_U8* )&pFrm->CCXTrafStrmMet.tsid, 1); - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_WMMADDTSRESPONSE), ( tANI_U8* )&pFrm->CCXTrafStrmMet.state, 1); - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_WMMADDTSRESPONSE), ( tANI_U8* )&pFrm->CCXTrafStrmMet.msmt_interval, 2); + FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_WMMADDTSRESPONSE), ( tANI_U8* )&pFrm->ESETrafStrmMet.tsid, 1); + FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_WMMADDTSRESPONSE), ( tANI_U8* )&pFrm->ESETrafStrmMet.state, 1); + FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_WMMADDTSRESPONSE), ( tANI_U8* )&pFrm->ESETrafStrmMet.msmt_interval, 2); } } # endif // DOT11F_DUMP_FRAMES @@ -20358,24 +20687,6 @@ static tANI_U32 UnpackCore(tpAniSirGlobal pCtx, case SigIeAirgo: status |= dot11fUnpackIeAirgo(pCtx, pBufRemaining, len, ( tDot11fIEAirgo* )(pFrm + pIe->offset + sizeof(tDot11fIEAirgo)*countOffset) ); break; - case SigIeCCXCckmOpaque: - status |= dot11fUnpackIeCCXCckmOpaque(pCtx, pBufRemaining, len, ( tDot11fIECCXCckmOpaque* )(pFrm + pIe->offset + sizeof(tDot11fIECCXCckmOpaque)*countOffset) ); - break; - case SigIeCCXRadMgmtCap: - status |= dot11fUnpackIeCCXRadMgmtCap(pCtx, pBufRemaining, len, ( tDot11fIECCXRadMgmtCap* )(pFrm + pIe->offset + sizeof(tDot11fIECCXRadMgmtCap)*countOffset) ); - break; - case SigIeCCXTrafStrmMet: - status |= dot11fUnpackIeCCXTrafStrmMet(pCtx, pBufRemaining, len, ( tDot11fIECCXTrafStrmMet* )(pFrm + pIe->offset + sizeof(tDot11fIECCXTrafStrmMet)*countOffset) ); - break; - case SigIeCCXTrafStrmRateSet: - status |= dot11fUnpackIeCCXTrafStrmRateSet(pCtx, pBufRemaining, len, ( tDot11fIECCXTrafStrmRateSet* )(pFrm + pIe->offset + sizeof(tDot11fIECCXTrafStrmRateSet)*countOffset) ); - break; - case SigIeCCXTxmitPower: - status |= dot11fUnpackIeCCXTxmitPower(pCtx, pBufRemaining, len, ( tDot11fIECCXTxmitPower* )(pFrm + pIe->offset + sizeof(tDot11fIECCXTxmitPower)*countOffset) ); - break; - case SigIeCCXVersion: - status |= dot11fUnpackIeCCXVersion(pCtx, pBufRemaining, len, ( tDot11fIECCXVersion* )(pFrm + pIe->offset + sizeof(tDot11fIECCXVersion)*countOffset) ); - break; case SigIeCFParams: status |= dot11fUnpackIeCFParams(pCtx, pBufRemaining, len, ( tDot11fIECFParams* )(pFrm + pIe->offset + sizeof(tDot11fIECFParams)*countOffset) ); break; @@ -20399,6 +20710,24 @@ static tANI_U32 UnpackCore(tpAniSirGlobal pCtx, case SigIeERPInfo: status |= dot11fUnpackIeERPInfo(pCtx, pBufRemaining, len, ( tDot11fIEERPInfo* )(pFrm + pIe->offset + sizeof(tDot11fIEERPInfo)*countOffset) ); break; + case SigIeESECckmOpaque: + status |= dot11fUnpackIeESECckmOpaque(pCtx, pBufRemaining, len, ( tDot11fIEESECckmOpaque* )(pFrm + pIe->offset + sizeof(tDot11fIEESECckmOpaque)*countOffset) ); + break; + case SigIeESERadMgmtCap: + status |= dot11fUnpackIeESERadMgmtCap(pCtx, pBufRemaining, len, ( tDot11fIEESERadMgmtCap* )(pFrm + pIe->offset + sizeof(tDot11fIEESERadMgmtCap)*countOffset) ); + break; + case SigIeESETrafStrmMet: + status |= dot11fUnpackIeESETrafStrmMet(pCtx, pBufRemaining, len, ( tDot11fIEESETrafStrmMet* )(pFrm + pIe->offset + sizeof(tDot11fIEESETrafStrmMet)*countOffset) ); + break; + case SigIeESETrafStrmRateSet: + status |= dot11fUnpackIeESETrafStrmRateSet(pCtx, pBufRemaining, len, ( tDot11fIEESETrafStrmRateSet* )(pFrm + pIe->offset + sizeof(tDot11fIEESETrafStrmRateSet)*countOffset) ); + break; + case SigIeESETxmitPower: + status |= dot11fUnpackIeESETxmitPower(pCtx, pBufRemaining, len, ( tDot11fIEESETxmitPower* )(pFrm + pIe->offset + sizeof(tDot11fIEESETxmitPower)*countOffset) ); + break; + case SigIeESEVersion: + status |= dot11fUnpackIeESEVersion(pCtx, pBufRemaining, len, ( tDot11fIEESEVersion* )(pFrm + pIe->offset + sizeof(tDot11fIEESEVersion)*countOffset) ); + break; case SigIeExtCap: status |= dot11fUnpackIeExtCap(pCtx, pBufRemaining, len, ( tDot11fIEExtCap* )(pFrm + pIe->offset + sizeof(tDot11fIEExtCap)*countOffset) ); break; @@ -20422,9 +20751,6 @@ static tANI_U32 UnpackCore(tpAniSirGlobal pCtx, case SigIeFTInfo: status |= dot11fUnpackIeFTInfo(pCtx, pBufRemaining, len, ( tDot11fIEFTInfo* )(pFrm + pIe->offset + sizeof(tDot11fIEFTInfo)*countOffset) ); break; - case SigIeFTTimeoutInterval: - status |= dot11fUnpackIeFTTimeoutInterval(pCtx, pBufRemaining, len, ( tDot11fIEFTTimeoutInterval* )(pFrm + pIe->offset + sizeof(tDot11fIEFTTimeoutInterval)*countOffset) ); - break; case SigIeHTCaps: status |= dot11fUnpackIeHTCaps(pCtx, pBufRemaining, len, ( tDot11fIEHTCaps* )(pFrm + pIe->offset + sizeof(tDot11fIEHTCaps)*countOffset) ); break; @@ -20449,6 +20775,9 @@ static tANI_U32 UnpackCore(tpAniSirGlobal pCtx, case SigIeNeighborReport: status |= dot11fUnpackIeNeighborReport(pCtx, pBufRemaining, len, ( tDot11fIENeighborReport* )(pFrm + pIe->offset + sizeof(tDot11fIENeighborReport)*countOffset) ); break; + case SigIeOBSSScanParameters: + status |= dot11fUnpackIeOBSSScanParameters(pCtx, pBufRemaining, len, ( tDot11fIEOBSSScanParameters* )(pFrm + pIe->offset + sizeof(tDot11fIEOBSSScanParameters)*countOffset) ); + break; case SigIeOperatingMode: status |= dot11fUnpackIeOperatingMode(pCtx, pBufRemaining, len, ( tDot11fIEOperatingMode* )(pFrm + pIe->offset + sizeof(tDot11fIEOperatingMode)*countOffset) ); break; @@ -20536,6 +20865,9 @@ static tANI_U32 UnpackCore(tpAniSirGlobal pCtx, case SigIeQOSCapsStation: status |= dot11fUnpackIeQOSCapsStation(pCtx, pBufRemaining, len, ( tDot11fIEQOSCapsStation* )(pFrm + pIe->offset + sizeof(tDot11fIEQOSCapsStation)*countOffset) ); break; + case SigIeQosMapSet: + status |= dot11fUnpackIeQosMapSet(pCtx, pBufRemaining, len, ( tDot11fIEQosMapSet* )(pFrm + pIe->offset + sizeof(tDot11fIEQosMapSet)*countOffset) ); + break; case SigIeQuiet: status |= dot11fUnpackIeQuiet(pCtx, pBufRemaining, len, ( tDot11fIEQuiet* )(pFrm + pIe->offset + sizeof(tDot11fIEQuiet)*countOffset) ); break; @@ -20567,6 +20899,9 @@ static tANI_U32 UnpackCore(tpAniSirGlobal pCtx, case SigIeSuppChannels: status |= dot11fUnpackIeSuppChannels(pCtx, pBufRemaining, len, ( tDot11fIESuppChannels* )(pFrm + pIe->offset + sizeof(tDot11fIESuppChannels)*countOffset) ); break; + case SigIeSuppOperatingClasses: + status |= dot11fUnpackIeSuppOperatingClasses(pCtx, pBufRemaining, len, ( tDot11fIESuppOperatingClasses* )(pFrm + pIe->offset + sizeof(tDot11fIESuppOperatingClasses)*countOffset) ); + break; case SigIeSuppRates: status |= dot11fUnpackIeSuppRates(pCtx, pBufRemaining, len, ( tDot11fIESuppRates* )(pFrm + pIe->offset + sizeof(tDot11fIESuppRates)*countOffset) ); break; @@ -20579,6 +20914,9 @@ static tANI_U32 UnpackCore(tpAniSirGlobal pCtx, case SigIeTPCRequest: status |= dot11fUnpackIeTPCRequest(pCtx, pBufRemaining, len, ( tDot11fIETPCRequest* )(pFrm + pIe->offset + sizeof(tDot11fIETPCRequest)*countOffset) ); break; + case SigIeTimeoutInterval: + status |= dot11fUnpackIeTimeoutInterval(pCtx, pBufRemaining, len, ( tDot11fIETimeoutInterval* )(pFrm + pIe->offset + sizeof(tDot11fIETimeoutInterval)*countOffset) ); + break; case SigIeVHTCaps: status |= dot11fUnpackIeVHTCaps(pCtx, pBufRemaining, len, ( tDot11fIEVHTCaps* )(pFrm + pIe->offset + sizeof(tDot11fIEVHTCaps)*countOffset) ); break; @@ -20767,7 +21105,7 @@ static tANI_U32 UnpackTlvCore( tpAniSirGlobal pCtx, FRAMES_LOG0( pCtx, FRLOGE, FRFL("This frame reports " "fewer two byte(s) remaining.\n") ); status |= DOT11F_INCOMPLETE_TLV; - FRAMES_DBG_BREAK(); + FRAMES_DBG_BREAK(); goto MandatoryCheck; } pBufRemaining += 2; @@ -22077,6 +22415,14 @@ tANI_U32 dot11fGetPackedProvisionDiscoveryResSize(tpAniSirGlobal pCtx, tDot11fPr return status; } /* End dot11fGetPackedProvisionDiscoveryResSize. */ +tANI_U32 dot11fGetPackedQosMapConfigureSize(tpAniSirGlobal pCtx, tDot11fQosMapConfigure *pFrm, tANI_U32 *pnNeeded) +{ + tANI_U32 status = 0; + *pnNeeded = 2; + status = GetPackedSizeCore(pCtx, ( tANI_U8* )pFrm, pnNeeded, IES_QosMapConfigure); + return status; +} /* End dot11fGetPackedQosMapConfigureSize. */ + tANI_U32 dot11fGetPackedRadioMeasurementReportSize(tpAniSirGlobal pCtx, tDot11fRadioMeasurementReport *pFrm, tANI_U32 *pnNeeded) { tANI_U32 status = 0; @@ -22117,6 +22463,14 @@ tANI_U32 dot11fGetPackedSMPowerSaveSize(tpAniSirGlobal pCtx, tDot11fSMPowerSave return status; } /* End dot11fGetPackedSMPowerSaveSize. */ +tANI_U32 dot11fGetPackedSaQueryReqSize(tpAniSirGlobal pCtx, tDot11fSaQueryReq *pFrm, tANI_U32 *pnNeeded) +{ + tANI_U32 status = 0; + *pnNeeded = 4; + status = GetPackedSizeCore(pCtx, ( tANI_U8* )pFrm, pnNeeded, IES_SaQueryReq); + return status; +} /* End dot11fGetPackedSaQueryReqSize. */ + tANI_U32 dot11fGetPackedSaQueryRspSize(tpAniSirGlobal pCtx, tDot11fSaQueryRsp *pFrm, tANI_U32 *pnNeeded) { tANI_U32 status = 0; @@ -22496,36 +22850,6 @@ static tANI_U32 GetPackedSizeCore(tpAniSirGlobal pCtx, offset = sizeof(tDot11fIEAirgo); status |= dot11fGetPackedIEAirgo(pCtx, ( tDot11fIEAirgo* )(pFrm + pIe->offset + offset * i ), pnNeeded); break; - case SigIeCCXCckmOpaque: - offset = sizeof(tDot11fIECCXCckmOpaque); - byteCount = ((tDot11fIECCXCckmOpaque* )(pFrm + pIe->offset + sizeof(tDot11fIECCXCckmOpaque) * i ))->num_data; - pIePresent = ( (tDot11fIECCXCckmOpaque* )(pFrm + pIe->offset + offset * i ))->present; - break; - case SigIeCCXRadMgmtCap: - offset = sizeof(tDot11fIECCXRadMgmtCap); - byteCount = 2; - pIePresent = ( (tDot11fIECCXRadMgmtCap* )(pFrm + pIe->offset + offset * i ))->present; - break; - case SigIeCCXTrafStrmMet: - offset = sizeof(tDot11fIECCXTrafStrmMet); - byteCount = 4; - pIePresent = ( (tDot11fIECCXTrafStrmMet* )(pFrm + pIe->offset + offset * i ))->present; - break; - case SigIeCCXTrafStrmRateSet: - offset = sizeof(tDot11fIECCXTrafStrmRateSet); - byteCount = ((tDot11fIECCXTrafStrmRateSet* )(pFrm + pIe->offset + sizeof(tDot11fIECCXTrafStrmRateSet) * i ))->num_tsrates + 1; - pIePresent = ( (tDot11fIECCXTrafStrmRateSet* )(pFrm + pIe->offset + offset * i ))->present; - break; - case SigIeCCXTxmitPower: - offset = sizeof(tDot11fIECCXTxmitPower); - byteCount = 2; - pIePresent = ( (tDot11fIECCXTxmitPower* )(pFrm + pIe->offset + offset * i ))->present; - break; - case SigIeCCXVersion: - offset = sizeof(tDot11fIECCXVersion); - byteCount = 1; - pIePresent = ( (tDot11fIECCXVersion* )(pFrm + pIe->offset + offset * i ))->present; - break; case SigIeCFParams: offset = sizeof(tDot11fIECFParams); byteCount = 6; @@ -22560,6 +22884,36 @@ static tANI_U32 GetPackedSizeCore(tpAniSirGlobal pCtx, byteCount = 1; pIePresent = ( (tDot11fIEERPInfo* )(pFrm + pIe->offset + offset * i ))->present; break; + case SigIeESECckmOpaque: + offset = sizeof(tDot11fIEESECckmOpaque); + byteCount = ((tDot11fIEESECckmOpaque* )(pFrm + pIe->offset + sizeof(tDot11fIEESECckmOpaque) * i ))->num_data; + pIePresent = ( (tDot11fIEESECckmOpaque* )(pFrm + pIe->offset + offset * i ))->present; + break; + case SigIeESERadMgmtCap: + offset = sizeof(tDot11fIEESERadMgmtCap); + byteCount = 2; + pIePresent = ( (tDot11fIEESERadMgmtCap* )(pFrm + pIe->offset + offset * i ))->present; + break; + case SigIeESETrafStrmMet: + offset = sizeof(tDot11fIEESETrafStrmMet); + byteCount = 4; + pIePresent = ( (tDot11fIEESETrafStrmMet* )(pFrm + pIe->offset + offset * i ))->present; + break; + case SigIeESETrafStrmRateSet: + offset = sizeof(tDot11fIEESETrafStrmRateSet); + byteCount = ((tDot11fIEESETrafStrmRateSet* )(pFrm + pIe->offset + sizeof(tDot11fIEESETrafStrmRateSet) * i ))->num_tsrates + 1; + pIePresent = ( (tDot11fIEESETrafStrmRateSet* )(pFrm + pIe->offset + offset * i ))->present; + break; + case SigIeESETxmitPower: + offset = sizeof(tDot11fIEESETxmitPower); + byteCount = 2; + pIePresent = ( (tDot11fIEESETxmitPower* )(pFrm + pIe->offset + offset * i ))->present; + break; + case SigIeESEVersion: + offset = sizeof(tDot11fIEESEVersion); + byteCount = 1; + pIePresent = ( (tDot11fIEESEVersion* )(pFrm + pIe->offset + offset * i ))->present; + break; case SigIeExtCap: offset = sizeof(tDot11fIEExtCap); byteCount = 8; @@ -22594,11 +22948,6 @@ static tANI_U32 GetPackedSizeCore(tpAniSirGlobal pCtx, offset = sizeof(tDot11fIEFTInfo); status |= dot11fGetPackedIEFTInfo(pCtx, ( tDot11fIEFTInfo* )(pFrm + pIe->offset + offset * i ), pnNeeded); break; - case SigIeFTTimeoutInterval: - offset = sizeof(tDot11fIEFTTimeoutInterval); - byteCount = 5; - pIePresent = ( (tDot11fIEFTTimeoutInterval* )(pFrm + pIe->offset + offset * i ))->present; - break; case SigIeHTCaps: offset = sizeof(tDot11fIEHTCaps); byteCount = ((tDot11fIEHTCaps* )(pFrm + pIe->offset + sizeof(tDot11fIEHTCaps) * i ))->num_rsvd + 26; @@ -22636,6 +22985,11 @@ static tANI_U32 GetPackedSizeCore(tpAniSirGlobal pCtx, offset = sizeof(tDot11fIENeighborReport); status |= dot11fGetPackedIENeighborReport(pCtx, ( tDot11fIENeighborReport* )(pFrm + pIe->offset + offset * i ), pnNeeded); break; + case SigIeOBSSScanParameters: + offset = sizeof(tDot11fIEOBSSScanParameters); + byteCount = 14; + pIePresent = ( (tDot11fIEOBSSScanParameters* )(pFrm + pIe->offset + offset * i ))->present; + break; case SigIeOperatingMode: offset = sizeof(tDot11fIEOperatingMode); byteCount = 1; @@ -22761,6 +23115,11 @@ static tANI_U32 GetPackedSizeCore(tpAniSirGlobal pCtx, byteCount = 1; pIePresent = ( (tDot11fIEQOSCapsStation* )(pFrm + pIe->offset + offset * i ))->present; break; + case SigIeQosMapSet: + offset = sizeof(tDot11fIEQosMapSet); + byteCount = ((tDot11fIEQosMapSet* )(pFrm + pIe->offset + sizeof(tDot11fIEQosMapSet) * i ))->num_dscp_exceptions; + pIePresent = ( (tDot11fIEQosMapSet* )(pFrm + pIe->offset + offset * i ))->present; + break; case SigIeQuiet: offset = sizeof(tDot11fIEQuiet); byteCount = 6; @@ -22795,6 +23154,11 @@ static tANI_U32 GetPackedSizeCore(tpAniSirGlobal pCtx, byteCount = ((tDot11fIESuppChannels* )(pFrm + pIe->offset + sizeof(tDot11fIESuppChannels) * i ))->num_bands * 2; pIePresent = ( (tDot11fIESuppChannels* )(pFrm + pIe->offset + offset * i ))->present; break; + case SigIeSuppOperatingClasses: + offset = sizeof(tDot11fIESuppOperatingClasses); + byteCount = ((tDot11fIESuppOperatingClasses* )(pFrm + pIe->offset + sizeof(tDot11fIESuppOperatingClasses) * i ))->num_classes; + pIePresent = ( (tDot11fIESuppOperatingClasses* )(pFrm + pIe->offset + offset * i ))->present; + break; case SigIeSuppRates: offset = sizeof(tDot11fIESuppRates); byteCount = ((tDot11fIESuppRates* )(pFrm + pIe->offset + sizeof(tDot11fIESuppRates) * i ))->num_rates; @@ -22815,6 +23179,11 @@ static tANI_U32 GetPackedSizeCore(tpAniSirGlobal pCtx, byteCount = 0; pIePresent = ( (tDot11fIETPCRequest* )(pFrm + pIe->offset + offset * i ))->present; break; + case SigIeTimeoutInterval: + offset = sizeof(tDot11fIETimeoutInterval); + byteCount = 5; + pIePresent = ( (tDot11fIETimeoutInterval* )(pFrm + pIe->offset + offset * i ))->present; + break; case SigIeVHTCaps: offset = sizeof(tDot11fIEVHTCaps); byteCount = 12; @@ -26928,254 +27297,6 @@ tANI_U32 dot11fPackIeAirgo(tpAniSirGlobal pCtx, return status; } /* End dot11fPackIeAirgo. */ -tANI_U32 dot11fPackIeCCXCckmOpaque(tpAniSirGlobal pCtx, - tDot11fIECCXCckmOpaque *pSrc, - tANI_U8 *pBuf, - tANI_U32 nBuf, - tANI_U32 *pnConsumed) -{ - tANI_U8* pIeLen = 0; - tANI_U32 nConsumedOnEntry = *pnConsumed; - tANI_U32 nNeeded = 0U; - nNeeded += pSrc->num_data; - while ( pSrc->present ) - { - if ( nNeeded > nBuf ) return DOT11F_BUFFER_OVERFLOW; - *pBuf = 156; - ++pBuf; ++(*pnConsumed); - pIeLen = pBuf; - ++pBuf; ++(*pnConsumed); - *pBuf = 0x0; - ++pBuf; ++(*pnConsumed); - *pBuf = 0x40; - ++pBuf; ++(*pnConsumed); - *pBuf = 0x96; - ++pBuf; ++(*pnConsumed); - *pBuf = 0x0; - ++pBuf; ++(*pnConsumed); - DOT11F_MEMCPY(pCtx, pBuf, &( pSrc->data ), pSrc->num_data); - *pnConsumed += pSrc->num_data; - // fieldsEndFlag = 1 - break; - } - (void)pCtx; - if (pIeLen) - { - *pIeLen = *pnConsumed - nConsumedOnEntry - 2; - } - return DOT11F_PARSE_SUCCESS; -} /* End dot11fPackIeCCXCckmOpaque. */ - -tANI_U32 dot11fPackIeCCXRadMgmtCap(tpAniSirGlobal pCtx, - tDot11fIECCXRadMgmtCap *pSrc, - tANI_U8 *pBuf, - tANI_U32 nBuf, - tANI_U32 *pnConsumed) -{ - tANI_U8* pIeLen = 0; - tANI_U32 nConsumedOnEntry = *pnConsumed; - tANI_U32 nNeeded = 0U; - tANI_U8 tmp112__; - nNeeded += 2; - while ( pSrc->present ) - { - if ( nNeeded > nBuf ) return DOT11F_BUFFER_OVERFLOW; - *pBuf = 221; - ++pBuf; ++(*pnConsumed); - pIeLen = pBuf; - ++pBuf; ++(*pnConsumed); - *pBuf = 0x0; - ++pBuf; ++(*pnConsumed); - *pBuf = 0x40; - ++pBuf; ++(*pnConsumed); - *pBuf = 0x96; - ++pBuf; ++(*pnConsumed); - *pBuf = 0x1; - ++pBuf; ++(*pnConsumed); - *pBuf = pSrc->mgmt_state; - *pnConsumed += 1; - pBuf += 1; - tmp112__ = 0U; - tmp112__ |= ( pSrc->mbssid_mask << 0 ); - tmp112__ |= ( pSrc->reserved << 3 ); - *pBuf = tmp112__; - *pnConsumed += 1; - // fieldsEndFlag = 1 - nBuf -= 1 ; - break; - } - (void)pCtx; - if (pIeLen) - { - *pIeLen = *pnConsumed - nConsumedOnEntry - 2; - } - return DOT11F_PARSE_SUCCESS; -} /* End dot11fPackIeCCXRadMgmtCap. */ - -tANI_U32 dot11fPackIeCCXTrafStrmMet(tpAniSirGlobal pCtx, - tDot11fIECCXTrafStrmMet *pSrc, - tANI_U8 *pBuf, - tANI_U32 nBuf, - tANI_U32 *pnConsumed) -{ - tANI_U8* pIeLen = 0; - tANI_U32 nConsumedOnEntry = *pnConsumed; - tANI_U32 nNeeded = 0U; - nNeeded += 4; - while ( pSrc->present ) - { - if ( nNeeded > nBuf ) return DOT11F_BUFFER_OVERFLOW; - *pBuf = 221; - ++pBuf; ++(*pnConsumed); - pIeLen = pBuf; - ++pBuf; ++(*pnConsumed); - *pBuf = 0x0; - ++pBuf; ++(*pnConsumed); - *pBuf = 0x40; - ++pBuf; ++(*pnConsumed); - *pBuf = 0x96; - ++pBuf; ++(*pnConsumed); - *pBuf = 0x7; - ++pBuf; ++(*pnConsumed); - *pBuf = pSrc->tsid; - *pnConsumed += 1; - pBuf += 1; - *pBuf = pSrc->state; - *pnConsumed += 1; - pBuf += 1; - frameshtons(pCtx, pBuf, pSrc->msmt_interval, 0); - *pnConsumed += 2; - // fieldsEndFlag = 1 - break; - } - (void)pCtx; - if (pIeLen) - { - *pIeLen = *pnConsumed - nConsumedOnEntry - 2; - } - return DOT11F_PARSE_SUCCESS; -} /* End dot11fPackIeCCXTrafStrmMet. */ - -tANI_U32 dot11fPackIeCCXTrafStrmRateSet(tpAniSirGlobal pCtx, - tDot11fIECCXTrafStrmRateSet *pSrc, - tANI_U8 *pBuf, - tANI_U32 nBuf, - tANI_U32 *pnConsumed) -{ - tANI_U8* pIeLen = 0; - tANI_U32 nConsumedOnEntry = *pnConsumed; - tANI_U32 nNeeded = 0U; - nNeeded += (pSrc->num_tsrates + 1); - while ( pSrc->present ) - { - if ( nNeeded > nBuf ) return DOT11F_BUFFER_OVERFLOW; - *pBuf = 221; - ++pBuf; ++(*pnConsumed); - pIeLen = pBuf; - ++pBuf; ++(*pnConsumed); - *pBuf = 0x0; - ++pBuf; ++(*pnConsumed); - *pBuf = 0x40; - ++pBuf; ++(*pnConsumed); - *pBuf = 0x96; - ++pBuf; ++(*pnConsumed); - *pBuf = 0x8; - ++pBuf; ++(*pnConsumed); - *pBuf = pSrc->tsid; - *pnConsumed += 1; - pBuf += 1; - DOT11F_MEMCPY(pCtx, pBuf, &( pSrc->tsrates ), pSrc->num_tsrates); - *pnConsumed += pSrc->num_tsrates; - // fieldsEndFlag = 1 - break; - } - (void)pCtx; - if (pIeLen) - { - *pIeLen = *pnConsumed - nConsumedOnEntry - 2; - } - return DOT11F_PARSE_SUCCESS; -} /* End dot11fPackIeCCXTrafStrmRateSet. */ - -tANI_U32 dot11fPackIeCCXTxmitPower(tpAniSirGlobal pCtx, - tDot11fIECCXTxmitPower *pSrc, - tANI_U8 *pBuf, - tANI_U32 nBuf, - tANI_U32 *pnConsumed) -{ - tANI_U8* pIeLen = 0; - tANI_U32 nConsumedOnEntry = *pnConsumed; - tANI_U32 nNeeded = 0U; - nNeeded += 2; - while ( pSrc->present ) - { - if ( nNeeded > nBuf ) return DOT11F_BUFFER_OVERFLOW; - *pBuf = 150; - ++pBuf; ++(*pnConsumed); - pIeLen = pBuf; - ++pBuf; ++(*pnConsumed); - *pBuf = 0x0; - ++pBuf; ++(*pnConsumed); - *pBuf = 0x40; - ++pBuf; ++(*pnConsumed); - *pBuf = 0x96; - ++pBuf; ++(*pnConsumed); - *pBuf = 0x0; - ++pBuf; ++(*pnConsumed); - *pBuf = pSrc->power_limit; - *pnConsumed += 1; - pBuf += 1; - *pBuf = pSrc->reserved; - *pnConsumed += 1; - // fieldsEndFlag = 1 - break; - } - (void)pCtx; - if (pIeLen) - { - *pIeLen = *pnConsumed - nConsumedOnEntry - 2; - } - return DOT11F_PARSE_SUCCESS; -} /* End dot11fPackIeCCXTxmitPower. */ - -tANI_U32 dot11fPackIeCCXVersion(tpAniSirGlobal pCtx, - tDot11fIECCXVersion *pSrc, - tANI_U8 *pBuf, - tANI_U32 nBuf, - tANI_U32 *pnConsumed) -{ - tANI_U8* pIeLen = 0; - tANI_U32 nConsumedOnEntry = *pnConsumed; - tANI_U32 nNeeded = 0U; - nNeeded += 1; - while ( pSrc->present ) - { - if ( nNeeded > nBuf ) return DOT11F_BUFFER_OVERFLOW; - *pBuf = 221; - ++pBuf; ++(*pnConsumed); - pIeLen = pBuf; - ++pBuf; ++(*pnConsumed); - *pBuf = 0x0; - ++pBuf; ++(*pnConsumed); - *pBuf = 0x40; - ++pBuf; ++(*pnConsumed); - *pBuf = 0x96; - ++pBuf; ++(*pnConsumed); - *pBuf = 0x3; - ++pBuf; ++(*pnConsumed); - *pBuf = pSrc->version; - *pnConsumed += 1; - // fieldsEndFlag = 1 - break; - } - (void)pCtx; - if (pIeLen) - { - *pIeLen = *pnConsumed - nConsumedOnEntry - 2; - } - return DOT11F_PARSE_SUCCESS; -} /* End dot11fPackIeCCXVersion. */ - tANI_U32 dot11fPackIeCFParams(tpAniSirGlobal pCtx, tDot11fIECFParams *pSrc, tANI_U8 *pBuf, @@ -27358,6 +27479,7 @@ tANI_U32 dot11fPackIeEDCAParamSet(tpAniSirGlobal pCtx, tANI_U8* pIeLen = 0; tANI_U32 nConsumedOnEntry = *pnConsumed; tANI_U32 nNeeded = 0U; + tANI_U8 tmp112__; tANI_U8 tmp113__; tANI_U8 tmp114__; tANI_U8 tmp115__; @@ -27365,7 +27487,6 @@ tANI_U32 dot11fPackIeEDCAParamSet(tpAniSirGlobal pCtx, tANI_U8 tmp117__; tANI_U8 tmp118__; tANI_U8 tmp119__; - tANI_U8 tmp120__; nNeeded += 18; while ( pSrc->present ) { @@ -27380,79 +27501,79 @@ tANI_U32 dot11fPackIeEDCAParamSet(tpAniSirGlobal pCtx, *pBuf = pSrc->reserved; *pnConsumed += 1; pBuf += 1; + tmp112__ = 0U; + tmp112__ |= ( pSrc->acbe_aifsn << 0 ); + tmp112__ |= ( pSrc->acbe_acm << 4 ); + tmp112__ |= ( pSrc->acbe_aci << 5 ); + tmp112__ |= ( pSrc->unused1 << 7 ); + *pBuf = tmp112__; + *pnConsumed += 1; + pBuf += 1; + nBuf -= 1 ; tmp113__ = 0U; - tmp113__ |= ( pSrc->acbe_aifsn << 0 ); - tmp113__ |= ( pSrc->acbe_acm << 4 ); - tmp113__ |= ( pSrc->acbe_aci << 5 ); - tmp113__ |= ( pSrc->unused1 << 7 ); + tmp113__ |= ( pSrc->acbe_acwmin << 0 ); + tmp113__ |= ( pSrc->acbe_acwmax << 4 ); *pBuf = tmp113__; *pnConsumed += 1; pBuf += 1; nBuf -= 1 ; + frameshtons(pCtx, pBuf, pSrc->acbe_txoplimit, 0); + *pnConsumed += 2; + pBuf += 2; tmp114__ = 0U; - tmp114__ |= ( pSrc->acbe_acwmin << 0 ); - tmp114__ |= ( pSrc->acbe_acwmax << 4 ); + tmp114__ |= ( pSrc->acbk_aifsn << 0 ); + tmp114__ |= ( pSrc->acbk_acm << 4 ); + tmp114__ |= ( pSrc->acbk_aci << 5 ); + tmp114__ |= ( pSrc->unused2 << 7 ); *pBuf = tmp114__; *pnConsumed += 1; pBuf += 1; nBuf -= 1 ; - frameshtons(pCtx, pBuf, pSrc->acbe_txoplimit, 0); - *pnConsumed += 2; - pBuf += 2; tmp115__ = 0U; - tmp115__ |= ( pSrc->acbk_aifsn << 0 ); - tmp115__ |= ( pSrc->acbk_acm << 4 ); - tmp115__ |= ( pSrc->acbk_aci << 5 ); - tmp115__ |= ( pSrc->unused2 << 7 ); + tmp115__ |= ( pSrc->acbk_acwmin << 0 ); + tmp115__ |= ( pSrc->acbk_acwmax << 4 ); *pBuf = tmp115__; *pnConsumed += 1; pBuf += 1; nBuf -= 1 ; + frameshtons(pCtx, pBuf, pSrc->acbk_txoplimit, 0); + *pnConsumed += 2; + pBuf += 2; tmp116__ = 0U; - tmp116__ |= ( pSrc->acbk_acwmin << 0 ); - tmp116__ |= ( pSrc->acbk_acwmax << 4 ); + tmp116__ |= ( pSrc->acvi_aifsn << 0 ); + tmp116__ |= ( pSrc->acvi_acm << 4 ); + tmp116__ |= ( pSrc->acvi_aci << 5 ); + tmp116__ |= ( pSrc->unused3 << 7 ); *pBuf = tmp116__; *pnConsumed += 1; pBuf += 1; nBuf -= 1 ; - frameshtons(pCtx, pBuf, pSrc->acbk_txoplimit, 0); - *pnConsumed += 2; - pBuf += 2; tmp117__ = 0U; - tmp117__ |= ( pSrc->acvi_aifsn << 0 ); - tmp117__ |= ( pSrc->acvi_acm << 4 ); - tmp117__ |= ( pSrc->acvi_aci << 5 ); - tmp117__ |= ( pSrc->unused3 << 7 ); + tmp117__ |= ( pSrc->acvi_acwmin << 0 ); + tmp117__ |= ( pSrc->acvi_acwmax << 4 ); *pBuf = tmp117__; *pnConsumed += 1; pBuf += 1; nBuf -= 1 ; + frameshtons(pCtx, pBuf, pSrc->acvi_txoplimit, 0); + *pnConsumed += 2; + pBuf += 2; tmp118__ = 0U; - tmp118__ |= ( pSrc->acvi_acwmin << 0 ); - tmp118__ |= ( pSrc->acvi_acwmax << 4 ); + tmp118__ |= ( pSrc->acvo_aifsn << 0 ); + tmp118__ |= ( pSrc->acvo_acm << 4 ); + tmp118__ |= ( pSrc->acvo_aci << 5 ); + tmp118__ |= ( pSrc->unused4 << 7 ); *pBuf = tmp118__; *pnConsumed += 1; pBuf += 1; nBuf -= 1 ; - frameshtons(pCtx, pBuf, pSrc->acvi_txoplimit, 0); - *pnConsumed += 2; - pBuf += 2; tmp119__ = 0U; - tmp119__ |= ( pSrc->acvo_aifsn << 0 ); - tmp119__ |= ( pSrc->acvo_acm << 4 ); - tmp119__ |= ( pSrc->acvo_aci << 5 ); - tmp119__ |= ( pSrc->unused4 << 7 ); + tmp119__ |= ( pSrc->acvo_acwmin << 0 ); + tmp119__ |= ( pSrc->acvo_acwmax << 4 ); *pBuf = tmp119__; *pnConsumed += 1; pBuf += 1; nBuf -= 1 ; - tmp120__ = 0U; - tmp120__ |= ( pSrc->acvo_acwmin << 0 ); - tmp120__ |= ( pSrc->acvo_acwmax << 4 ); - *pBuf = tmp120__; - *pnConsumed += 1; - pBuf += 1; - nBuf -= 1 ; frameshtons(pCtx, pBuf, pSrc->acvo_txoplimit, 0); *pnConsumed += 2; // fieldsEndFlag = 1 @@ -27475,7 +27596,7 @@ tANI_U32 dot11fPackIeERPInfo(tpAniSirGlobal pCtx, tANI_U8* pIeLen = 0; tANI_U32 nConsumedOnEntry = *pnConsumed; tANI_U32 nNeeded = 0U; - tANI_U8 tmp121__; + tANI_U8 tmp120__; nNeeded += 1; while ( pSrc->present ) { @@ -27484,11 +27605,95 @@ tANI_U32 dot11fPackIeERPInfo(tpAniSirGlobal pCtx, ++pBuf; ++(*pnConsumed); pIeLen = pBuf; ++pBuf; ++(*pnConsumed); + tmp120__ = 0U; + tmp120__ |= ( pSrc->non_erp_present << 0 ); + tmp120__ |= ( pSrc->use_prot << 1 ); + tmp120__ |= ( pSrc->barker_preamble << 2 ); + tmp120__ |= ( pSrc->unused << 3 ); + *pBuf = tmp120__; + *pnConsumed += 1; + // fieldsEndFlag = 1 + nBuf -= 1 ; + break; + } + (void)pCtx; + if (pIeLen) + { + *pIeLen = *pnConsumed - nConsumedOnEntry - 2; + } + return DOT11F_PARSE_SUCCESS; +} /* End dot11fPackIeERPInfo. */ + +tANI_U32 dot11fPackIeESECckmOpaque(tpAniSirGlobal pCtx, + tDot11fIEESECckmOpaque *pSrc, + tANI_U8 *pBuf, + tANI_U32 nBuf, + tANI_U32 *pnConsumed) +{ + tANI_U8* pIeLen = 0; + tANI_U32 nConsumedOnEntry = *pnConsumed; + tANI_U32 nNeeded = 0U; + nNeeded += pSrc->num_data; + while ( pSrc->present ) + { + if ( nNeeded > nBuf ) return DOT11F_BUFFER_OVERFLOW; + *pBuf = 156; + ++pBuf; ++(*pnConsumed); + pIeLen = pBuf; + ++pBuf; ++(*pnConsumed); + *pBuf = 0x0; + ++pBuf; ++(*pnConsumed); + *pBuf = 0x40; + ++pBuf; ++(*pnConsumed); + *pBuf = 0x96; + ++pBuf; ++(*pnConsumed); + *pBuf = 0x0; + ++pBuf; ++(*pnConsumed); + DOT11F_MEMCPY(pCtx, pBuf, &( pSrc->data ), pSrc->num_data); + *pnConsumed += pSrc->num_data; + // fieldsEndFlag = 1 + break; + } + (void)pCtx; + if (pIeLen) + { + *pIeLen = *pnConsumed - nConsumedOnEntry - 2; + } + return DOT11F_PARSE_SUCCESS; +} /* End dot11fPackIeESECckmOpaque. */ + +tANI_U32 dot11fPackIeESERadMgmtCap(tpAniSirGlobal pCtx, + tDot11fIEESERadMgmtCap *pSrc, + tANI_U8 *pBuf, + tANI_U32 nBuf, + tANI_U32 *pnConsumed) +{ + tANI_U8* pIeLen = 0; + tANI_U32 nConsumedOnEntry = *pnConsumed; + tANI_U32 nNeeded = 0U; + tANI_U8 tmp121__; + nNeeded += 2; + while ( pSrc->present ) + { + if ( nNeeded > nBuf ) return DOT11F_BUFFER_OVERFLOW; + *pBuf = 221; + ++pBuf; ++(*pnConsumed); + pIeLen = pBuf; + ++pBuf; ++(*pnConsumed); + *pBuf = 0x0; + ++pBuf; ++(*pnConsumed); + *pBuf = 0x40; + ++pBuf; ++(*pnConsumed); + *pBuf = 0x96; + ++pBuf; ++(*pnConsumed); + *pBuf = 0x1; + ++pBuf; ++(*pnConsumed); + *pBuf = pSrc->mgmt_state; + *pnConsumed += 1; + pBuf += 1; tmp121__ = 0U; - tmp121__ |= ( pSrc->non_erp_present << 0 ); - tmp121__ |= ( pSrc->use_prot << 1 ); - tmp121__ |= ( pSrc->barker_preamble << 2 ); - tmp121__ |= ( pSrc->unused << 3 ); + tmp121__ |= ( pSrc->mbssid_mask << 0 ); + tmp121__ |= ( pSrc->reserved << 3 ); *pBuf = tmp121__; *pnConsumed += 1; // fieldsEndFlag = 1 @@ -27501,7 +27706,171 @@ tANI_U32 dot11fPackIeERPInfo(tpAniSirGlobal pCtx, *pIeLen = *pnConsumed - nConsumedOnEntry - 2; } return DOT11F_PARSE_SUCCESS; -} /* End dot11fPackIeERPInfo. */ +} /* End dot11fPackIeESERadMgmtCap. */ + +tANI_U32 dot11fPackIeESETrafStrmMet(tpAniSirGlobal pCtx, + tDot11fIEESETrafStrmMet *pSrc, + tANI_U8 *pBuf, + tANI_U32 nBuf, + tANI_U32 *pnConsumed) +{ + tANI_U8* pIeLen = 0; + tANI_U32 nConsumedOnEntry = *pnConsumed; + tANI_U32 nNeeded = 0U; + nNeeded += 4; + while ( pSrc->present ) + { + if ( nNeeded > nBuf ) return DOT11F_BUFFER_OVERFLOW; + *pBuf = 221; + ++pBuf; ++(*pnConsumed); + pIeLen = pBuf; + ++pBuf; ++(*pnConsumed); + *pBuf = 0x0; + ++pBuf; ++(*pnConsumed); + *pBuf = 0x40; + ++pBuf; ++(*pnConsumed); + *pBuf = 0x96; + ++pBuf; ++(*pnConsumed); + *pBuf = 0x7; + ++pBuf; ++(*pnConsumed); + *pBuf = pSrc->tsid; + *pnConsumed += 1; + pBuf += 1; + *pBuf = pSrc->state; + *pnConsumed += 1; + pBuf += 1; + frameshtons(pCtx, pBuf, pSrc->msmt_interval, 0); + *pnConsumed += 2; + // fieldsEndFlag = 1 + break; + } + (void)pCtx; + if (pIeLen) + { + *pIeLen = *pnConsumed - nConsumedOnEntry - 2; + } + return DOT11F_PARSE_SUCCESS; +} /* End dot11fPackIeESETrafStrmMet. */ + +tANI_U32 dot11fPackIeESETrafStrmRateSet(tpAniSirGlobal pCtx, + tDot11fIEESETrafStrmRateSet *pSrc, + tANI_U8 *pBuf, + tANI_U32 nBuf, + tANI_U32 *pnConsumed) +{ + tANI_U8* pIeLen = 0; + tANI_U32 nConsumedOnEntry = *pnConsumed; + tANI_U32 nNeeded = 0U; + nNeeded += (pSrc->num_tsrates + 1); + while ( pSrc->present ) + { + if ( nNeeded > nBuf ) return DOT11F_BUFFER_OVERFLOW; + *pBuf = 221; + ++pBuf; ++(*pnConsumed); + pIeLen = pBuf; + ++pBuf; ++(*pnConsumed); + *pBuf = 0x0; + ++pBuf; ++(*pnConsumed); + *pBuf = 0x40; + ++pBuf; ++(*pnConsumed); + *pBuf = 0x96; + ++pBuf; ++(*pnConsumed); + *pBuf = 0x8; + ++pBuf; ++(*pnConsumed); + *pBuf = pSrc->tsid; + *pnConsumed += 1; + pBuf += 1; + DOT11F_MEMCPY(pCtx, pBuf, &( pSrc->tsrates ), pSrc->num_tsrates); + *pnConsumed += pSrc->num_tsrates; + // fieldsEndFlag = 1 + break; + } + (void)pCtx; + if (pIeLen) + { + *pIeLen = *pnConsumed - nConsumedOnEntry - 2; + } + return DOT11F_PARSE_SUCCESS; +} /* End dot11fPackIeESETrafStrmRateSet. */ + +tANI_U32 dot11fPackIeESETxmitPower(tpAniSirGlobal pCtx, + tDot11fIEESETxmitPower *pSrc, + tANI_U8 *pBuf, + tANI_U32 nBuf, + tANI_U32 *pnConsumed) +{ + tANI_U8* pIeLen = 0; + tANI_U32 nConsumedOnEntry = *pnConsumed; + tANI_U32 nNeeded = 0U; + nNeeded += 2; + while ( pSrc->present ) + { + if ( nNeeded > nBuf ) return DOT11F_BUFFER_OVERFLOW; + *pBuf = 150; + ++pBuf; ++(*pnConsumed); + pIeLen = pBuf; + ++pBuf; ++(*pnConsumed); + *pBuf = 0x0; + ++pBuf; ++(*pnConsumed); + *pBuf = 0x40; + ++pBuf; ++(*pnConsumed); + *pBuf = 0x96; + ++pBuf; ++(*pnConsumed); + *pBuf = 0x0; + ++pBuf; ++(*pnConsumed); + *pBuf = pSrc->power_limit; + *pnConsumed += 1; + pBuf += 1; + *pBuf = pSrc->reserved; + *pnConsumed += 1; + // fieldsEndFlag = 1 + break; + } + (void)pCtx; + if (pIeLen) + { + *pIeLen = *pnConsumed - nConsumedOnEntry - 2; + } + return DOT11F_PARSE_SUCCESS; +} /* End dot11fPackIeESETxmitPower. */ + +tANI_U32 dot11fPackIeESEVersion(tpAniSirGlobal pCtx, + tDot11fIEESEVersion *pSrc, + tANI_U8 *pBuf, + tANI_U32 nBuf, + tANI_U32 *pnConsumed) +{ + tANI_U8* pIeLen = 0; + tANI_U32 nConsumedOnEntry = *pnConsumed; + tANI_U32 nNeeded = 0U; + nNeeded += 1; + while ( pSrc->present ) + { + if ( nNeeded > nBuf ) return DOT11F_BUFFER_OVERFLOW; + *pBuf = 221; + ++pBuf; ++(*pnConsumed); + pIeLen = pBuf; + ++pBuf; ++(*pnConsumed); + *pBuf = 0x0; + ++pBuf; ++(*pnConsumed); + *pBuf = 0x40; + ++pBuf; ++(*pnConsumed); + *pBuf = 0x96; + ++pBuf; ++(*pnConsumed); + *pBuf = 0x3; + ++pBuf; ++(*pnConsumed); + *pBuf = pSrc->version; + *pnConsumed += 1; + // fieldsEndFlag = 1 + break; + } + (void)pCtx; + if (pIeLen) + { + *pIeLen = *pnConsumed - nConsumedOnEntry - 2; + } + return DOT11F_PARSE_SUCCESS; +} /* End dot11fPackIeESEVersion. */ tANI_U32 dot11fPackIeExtCap(tpAniSirGlobal pCtx, tDot11fIEExtCap *pSrc, @@ -27826,39 +28195,6 @@ tANI_U32 dot11fPackIeFTInfo(tpAniSirGlobal pCtx, return status; } /* End dot11fPackIeFTInfo. */ -tANI_U32 dot11fPackIeFTTimeoutInterval(tpAniSirGlobal pCtx, - tDot11fIEFTTimeoutInterval *pSrc, - tANI_U8 *pBuf, - tANI_U32 nBuf, - tANI_U32 *pnConsumed) -{ - tANI_U8* pIeLen = 0; - tANI_U32 nConsumedOnEntry = *pnConsumed; - tANI_U32 nNeeded = 0U; - nNeeded += 5; - while ( pSrc->present ) - { - if ( nNeeded > nBuf ) return DOT11F_BUFFER_OVERFLOW; - *pBuf = 56; - ++pBuf; ++(*pnConsumed); - pIeLen = pBuf; - ++pBuf; ++(*pnConsumed); - *pBuf = pSrc->timeoutType; - *pnConsumed += 1; - pBuf += 1; - frameshtonl(pCtx, pBuf, pSrc->timeoutValue, 0); - *pnConsumed += 4; - // fieldsEndFlag = 1 - break; - } - (void)pCtx; - if (pIeLen) - { - *pIeLen = *pnConsumed - nConsumedOnEntry - 2; - } - return DOT11F_PARSE_SUCCESS; -} /* End dot11fPackIeFTTimeoutInterval. */ - tANI_U32 dot11fPackIeHTCaps(tpAniSirGlobal pCtx, tDot11fIEHTCaps *pSrc, tANI_U8 *pBuf, @@ -28495,6 +28831,54 @@ tANI_U32 dot11fPackIeNeighborReport(tpAniSirGlobal pCtx, return status; } /* End dot11fPackIeNeighborReport. */ +tANI_U32 dot11fPackIeOBSSScanParameters(tpAniSirGlobal pCtx, + tDot11fIEOBSSScanParameters *pSrc, + tANI_U8 *pBuf, + tANI_U32 nBuf, + tANI_U32 *pnConsumed) +{ + tANI_U8* pIeLen = 0; + tANI_U32 nConsumedOnEntry = *pnConsumed; + tANI_U32 nNeeded = 0U; + nNeeded += 14; + while ( pSrc->present ) + { + if ( nNeeded > nBuf ) return DOT11F_BUFFER_OVERFLOW; + *pBuf = 74; + ++pBuf; ++(*pnConsumed); + pIeLen = pBuf; + ++pBuf; ++(*pnConsumed); + frameshtons(pCtx, pBuf, pSrc->obssScanPassiveDwell, 0); + *pnConsumed += 2; + pBuf += 2; + frameshtons(pCtx, pBuf, pSrc->obssScanActiveDwell, 0); + *pnConsumed += 2; + pBuf += 2; + frameshtons(pCtx, pBuf, pSrc->bssChannelWidthTriggerScanInterval, 0); + *pnConsumed += 2; + pBuf += 2; + frameshtons(pCtx, pBuf, pSrc->obssScanPassiveTotalPerChannel, 0); + *pnConsumed += 2; + pBuf += 2; + frameshtons(pCtx, pBuf, pSrc->obssScanActiveTotalPerChannel, 0); + *pnConsumed += 2; + pBuf += 2; + frameshtons(pCtx, pBuf, pSrc->bssWidthChannelTransitionDelayFactor, 0); + *pnConsumed += 2; + pBuf += 2; + frameshtons(pCtx, pBuf, pSrc->obssScanActivityThreshold, 0); + *pnConsumed += 2; + // fieldsEndFlag = 1 + break; + } + (void)pCtx; + if (pIeLen) + { + *pIeLen = *pnConsumed - nConsumedOnEntry - 2; + } + return DOT11F_PARSE_SUCCESS; +} /* End dot11fPackIeOBSSScanParameters. */ + tANI_U32 dot11fPackIeOperatingMode(tpAniSirGlobal pCtx, tDot11fIEOperatingMode *pSrc, tANI_U8 *pBuf, @@ -29678,6 +30062,36 @@ tANI_U32 dot11fPackIeQOSCapsStation(tpAniSirGlobal pCtx, return DOT11F_PARSE_SUCCESS; } /* End dot11fPackIeQOSCapsStation. */ +tANI_U32 dot11fPackIeQosMapSet(tpAniSirGlobal pCtx, + tDot11fIEQosMapSet *pSrc, + tANI_U8 *pBuf, + tANI_U32 nBuf, + tANI_U32 *pnConsumed) +{ + tANI_U8* pIeLen = 0; + tANI_U32 nConsumedOnEntry = *pnConsumed; + tANI_U32 nNeeded = 0U; + nNeeded += pSrc->num_dscp_exceptions; + while ( pSrc->present ) + { + if ( nNeeded > nBuf ) return DOT11F_BUFFER_OVERFLOW; + *pBuf = 110; + ++pBuf; ++(*pnConsumed); + pIeLen = pBuf; + ++pBuf; ++(*pnConsumed); + DOT11F_MEMCPY(pCtx, pBuf, &( pSrc->dscp_exceptions ), pSrc->num_dscp_exceptions); + *pnConsumed += pSrc->num_dscp_exceptions; + // fieldsEndFlag = 1 + break; + } + (void)pCtx; + if (pIeLen) + { + *pIeLen = *pnConsumed - nConsumedOnEntry - 2; + } + return DOT11F_PARSE_SUCCESS; +} /* End dot11fPackIeQosMapSet. */ + tANI_U32 dot11fPackIeQuiet(tpAniSirGlobal pCtx, tDot11fIEQuiet *pSrc, tANI_U8 *pBuf, @@ -29937,6 +30351,36 @@ tANI_U32 dot11fPackIeSuppChannels(tpAniSirGlobal pCtx, return DOT11F_PARSE_SUCCESS; } /* End dot11fPackIeSuppChannels. */ +tANI_U32 dot11fPackIeSuppOperatingClasses(tpAniSirGlobal pCtx, + tDot11fIESuppOperatingClasses *pSrc, + tANI_U8 *pBuf, + tANI_U32 nBuf, + tANI_U32 *pnConsumed) +{ + tANI_U8* pIeLen = 0; + tANI_U32 nConsumedOnEntry = *pnConsumed; + tANI_U32 nNeeded = 0U; + nNeeded += pSrc->num_classes; + while ( pSrc->present ) + { + if ( nNeeded > nBuf ) return DOT11F_BUFFER_OVERFLOW; + *pBuf = 59; + ++pBuf; ++(*pnConsumed); + pIeLen = pBuf; + ++pBuf; ++(*pnConsumed); + DOT11F_MEMCPY(pCtx, pBuf, &( pSrc->classes ), pSrc->num_classes); + *pnConsumed += pSrc->num_classes; + // fieldsEndFlag = 1 + break; + } + (void)pCtx; + if (pIeLen) + { + *pIeLen = *pnConsumed - nConsumedOnEntry - 2; + } + return DOT11F_PARSE_SUCCESS; +} /* End dot11fPackIeSuppOperatingClasses. */ + tANI_U32 dot11fPackIeSuppRates(tpAniSirGlobal pCtx, tDot11fIESuppRates *pSrc, tANI_U8 *pBuf, @@ -30066,6 +30510,39 @@ tANI_U32 dot11fPackIeTPCRequest(tpAniSirGlobal pCtx, return DOT11F_PARSE_SUCCESS; } /* End dot11fPackIeTPCRequest. */ +tANI_U32 dot11fPackIeTimeoutInterval(tpAniSirGlobal pCtx, + tDot11fIETimeoutInterval *pSrc, + tANI_U8 *pBuf, + tANI_U32 nBuf, + tANI_U32 *pnConsumed) +{ + tANI_U8* pIeLen = 0; + tANI_U32 nConsumedOnEntry = *pnConsumed; + tANI_U32 nNeeded = 0U; + nNeeded += 5; + while ( pSrc->present ) + { + if ( nNeeded > nBuf ) return DOT11F_BUFFER_OVERFLOW; + *pBuf = 56; + ++pBuf; ++(*pnConsumed); + pIeLen = pBuf; + ++pBuf; ++(*pnConsumed); + *pBuf = pSrc->timeoutType; + *pnConsumed += 1; + pBuf += 1; + frameshtonl(pCtx, pBuf, pSrc->timeoutValue, 0); + *pnConsumed += 4; + // fieldsEndFlag = 1 + break; + } + (void)pCtx; + if (pIeLen) + { + *pIeLen = *pnConsumed - nConsumedOnEntry - 2; + } + return DOT11F_PARSE_SUCCESS; +} /* End dot11fPackIeTimeoutInterval. */ + tANI_U32 dot11fPackIeVHTCaps(tpAniSirGlobal pCtx, tDot11fIEVHTCaps *pSrc, tANI_U8 *pBuf, @@ -31478,16 +31955,16 @@ tANI_U32 dot11fPackAddTSRequest(tpAniSirGlobal pCtx, tDot11fAddTSRequest *pFrm, FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ADDTSREQUEST), ( tANI_U8* )&pFrm->WMMTCLASPROC.version, 1); FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ADDTSREQUEST), ( tANI_U8* )&pFrm->WMMTCLASPROC.processing, 1); } - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ADDTSREQUEST), FRFL("CCXTrafStrmRateSet:\n")); - if (!pFrm->CCXTrafStrmRateSet.present) + FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ADDTSREQUEST), FRFL("ESETrafStrmRateSet:\n")); + if (!pFrm->ESETrafStrmRateSet.present) { FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ADDTSREQUEST), FRFL("Not present.\n")); } else { - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ADDTSREQUEST), ( tANI_U8* )&pFrm->CCXTrafStrmRateSet.tsid, 1); - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ADDTSREQUEST), FRFL("num_tsrates: %d.\n"), pFrm->CCXTrafStrmRateSet.num_tsrates); - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ADDTSREQUEST), ( tANI_U8* ) pFrm->CCXTrafStrmRateSet.tsrates, pFrm->CCXTrafStrmRateSet.num_tsrates); + FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ADDTSREQUEST), ( tANI_U8* )&pFrm->ESETrafStrmRateSet.tsid, 1); + FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ADDTSREQUEST), FRFL("num_tsrates: %d.\n"), pFrm->ESETrafStrmRateSet.num_tsrates); + FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ADDTSREQUEST), ( tANI_U8* ) pFrm->ESETrafStrmRateSet.tsrates, pFrm->ESETrafStrmRateSet.num_tsrates); } FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ADDTSREQUEST), FRFL("to:\n")); FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ADDTSREQUEST), pBuf, nBuf); @@ -31752,16 +32229,16 @@ tANI_U32 dot11fPackAddTSResponse(tpAniSirGlobal pCtx, tDot11fAddTSResponse *pFrm FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ADDTSRESPONSE), ( tANI_U8* )&pFrm->WMMTCLASPROC.version, 1); FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ADDTSRESPONSE), ( tANI_U8* )&pFrm->WMMTCLASPROC.processing, 1); } - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ADDTSRESPONSE), FRFL("CCXTrafStrmMet:\n")); - if (!pFrm->CCXTrafStrmMet.present) + FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ADDTSRESPONSE), FRFL("ESETrafStrmMet:\n")); + if (!pFrm->ESETrafStrmMet.present) { FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ADDTSRESPONSE), FRFL("Not present.\n")); } else { - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ADDTSRESPONSE), ( tANI_U8* )&pFrm->CCXTrafStrmMet.tsid, 1); - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ADDTSRESPONSE), ( tANI_U8* )&pFrm->CCXTrafStrmMet.state, 1); - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ADDTSRESPONSE), ( tANI_U8* )&pFrm->CCXTrafStrmMet.msmt_interval, 2); + FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ADDTSRESPONSE), ( tANI_U8* )&pFrm->ESETrafStrmMet.tsid, 1); + FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ADDTSRESPONSE), ( tANI_U8* )&pFrm->ESETrafStrmMet.state, 1); + FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ADDTSRESPONSE), ( tANI_U8* )&pFrm->ESETrafStrmMet.msmt_interval, 2); } FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ADDTSRESPONSE), FRFL("to:\n")); FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ADDTSRESPONSE), pBuf, nBuf); @@ -32254,25 +32731,25 @@ tANI_U32 dot11fPackAssocRequest(tpAniSirGlobal pCtx, tDot11fAssocRequest *pFrm, FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCREQUEST), FRFL("num_data: %d.\n"), pFrm->WAPIOpaque.num_data); FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCREQUEST), ( tANI_U8* ) pFrm->WAPIOpaque.data, pFrm->WAPIOpaque.num_data); } - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCREQUEST), FRFL("CCXRadMgmtCap:\n")); - if (!pFrm->CCXRadMgmtCap.present) + FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCREQUEST), FRFL("ESERadMgmtCap:\n")); + if (!pFrm->ESERadMgmtCap.present) { FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCREQUEST), FRFL("Not present.\n")); } else { - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCREQUEST), ( tANI_U8* )&pFrm->CCXRadMgmtCap.mgmt_state, 1); - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCREQUEST), FRFL("mbssid_mask (3): %d\n"), pFrm->CCXRadMgmtCap.mbssid_mask); - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCREQUEST), FRFL("reserved (5): %d\n"), pFrm->CCXRadMgmtCap.reserved); + FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCREQUEST), ( tANI_U8* )&pFrm->ESERadMgmtCap.mgmt_state, 1); + FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCREQUEST), FRFL("mbssid_mask (3): %d\n"), pFrm->ESERadMgmtCap.mbssid_mask); + FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCREQUEST), FRFL("reserved (5): %d\n"), pFrm->ESERadMgmtCap.reserved); } - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCREQUEST), FRFL("CCXVersion:\n")); - if (!pFrm->CCXVersion.present) + FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCREQUEST), FRFL("ESEVersion:\n")); + if (!pFrm->ESEVersion.present) { FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCREQUEST), FRFL("Not present.\n")); } else { - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCREQUEST), ( tANI_U8* )&pFrm->CCXVersion.version, 1); + FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCREQUEST), ( tANI_U8* )&pFrm->ESEVersion.version, 1); } FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCREQUEST), FRFL("P2PIEOpaque:\n")); if (!pFrm->P2PIEOpaque.present) @@ -32399,6 +32876,16 @@ tANI_U32 dot11fPackAssocRequest(tpAniSirGlobal pCtx, tDot11fAssocRequest *pFrm, FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCREQUEST), FRFL("rxNSS (3): %d\n"), pFrm->OperatingMode.rxNSS); FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCREQUEST), FRFL("rxNSSType (1): %d\n"), pFrm->OperatingMode.rxNSSType); } + FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCREQUEST), FRFL("QosMapSet:\n")); + if (!pFrm->QosMapSet.present) + { + FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCREQUEST), FRFL("Not present.\n")); + } + else + { + FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCREQUEST), FRFL("num_dscp_exceptions: %d.\n"), pFrm->QosMapSet.num_dscp_exceptions); + FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCREQUEST), ( tANI_U8* ) pFrm->QosMapSet.dscp_exceptions, pFrm->QosMapSet.num_dscp_exceptions); + } FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCREQUEST), FRFL("to:\n")); FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCREQUEST), pBuf, nBuf); } @@ -32906,6 +33393,16 @@ tANI_U32 dot11fPackAssocResponse(tpAniSirGlobal pCtx, tDot11fAssocResponse *pFrm FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCRESPONSE), ( tANI_U8* ) pFrm->WPA.auth_suites, 4 * pFrm->WPA.auth_suite_count); FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCRESPONSE), ( tANI_U8* )&pFrm->WPA.caps, 2); } + FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCRESPONSE), FRFL("TimeoutInterval:\n")); + if (!pFrm->TimeoutInterval.present) + { + FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCRESPONSE), FRFL("Not present.\n")); + } + else + { + FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCRESPONSE), ( tANI_U8* )&pFrm->TimeoutInterval.timeoutType, 1); + FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCRESPONSE), ( tANI_U8* )&pFrm->TimeoutInterval.timeoutValue, 4); + } FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCRESPONSE), FRFL("HTCaps:\n")); if (!pFrm->HTCaps.present) { @@ -33045,37 +33542,37 @@ tANI_U32 dot11fPackAssocResponse(tpAniSirGlobal pCtx, tDot11fAssocResponse *pFrm FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCRESPONSE), FRFL("txop_request (1): %d\n"), pFrm->WMMCaps.txop_request); FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCRESPONSE), FRFL("more_ack (1): %d\n"), pFrm->WMMCaps.more_ack); } - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCRESPONSE), FRFL("CCXRadMgmtCap:\n")); - if (!pFrm->CCXRadMgmtCap.present) + FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCRESPONSE), FRFL("ESERadMgmtCap:\n")); + if (!pFrm->ESERadMgmtCap.present) { FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCRESPONSE), FRFL("Not present.\n")); } else { - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCRESPONSE), ( tANI_U8* )&pFrm->CCXRadMgmtCap.mgmt_state, 1); - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCRESPONSE), FRFL("mbssid_mask (3): %d\n"), pFrm->CCXRadMgmtCap.mbssid_mask); - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCRESPONSE), FRFL("reserved (5): %d\n"), pFrm->CCXRadMgmtCap.reserved); + FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCRESPONSE), ( tANI_U8* )&pFrm->ESERadMgmtCap.mgmt_state, 1); + FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCRESPONSE), FRFL("mbssid_mask (3): %d\n"), pFrm->ESERadMgmtCap.mbssid_mask); + FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCRESPONSE), FRFL("reserved (5): %d\n"), pFrm->ESERadMgmtCap.reserved); } - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCRESPONSE), FRFL("CCXTrafStrmMet:\n")); - if (!pFrm->CCXTrafStrmMet.present) + FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCRESPONSE), FRFL("ESETrafStrmMet:\n")); + if (!pFrm->ESETrafStrmMet.present) { FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCRESPONSE), FRFL("Not present.\n")); } else { - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCRESPONSE), ( tANI_U8* )&pFrm->CCXTrafStrmMet.tsid, 1); - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCRESPONSE), ( tANI_U8* )&pFrm->CCXTrafStrmMet.state, 1); - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCRESPONSE), ( tANI_U8* )&pFrm->CCXTrafStrmMet.msmt_interval, 2); + FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCRESPONSE), ( tANI_U8* )&pFrm->ESETrafStrmMet.tsid, 1); + FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCRESPONSE), ( tANI_U8* )&pFrm->ESETrafStrmMet.state, 1); + FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCRESPONSE), ( tANI_U8* )&pFrm->ESETrafStrmMet.msmt_interval, 2); } - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCRESPONSE), FRFL("CCXTxmitPower:\n")); - if (!pFrm->CCXTxmitPower.present) + FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCRESPONSE), FRFL("ESETxmitPower:\n")); + if (!pFrm->ESETxmitPower.present) { FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCRESPONSE), FRFL("Not present.\n")); } else { - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCRESPONSE), ( tANI_U8* )&pFrm->CCXTxmitPower.power_limit, 1); - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCRESPONSE), ( tANI_U8* )&pFrm->CCXTxmitPower.reserved, 1); + FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCRESPONSE), ( tANI_U8* )&pFrm->ESETxmitPower.power_limit, 1); + FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCRESPONSE), ( tANI_U8* )&pFrm->ESETxmitPower.reserved, 1); } for (i = 0; i < pFrm->num_WMMTSPEC; ++i) { @@ -33522,6 +34019,31 @@ tANI_U32 dot11fPackAssocResponse(tpAniSirGlobal pCtx, tDot11fAssocResponse *pFrm FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCRESPONSE), FRFL("operModeNotification (1): %d\n"), pFrm->ExtCap.operModeNotification); FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCRESPONSE), FRFL("reserved7 (1): %d\n"), pFrm->ExtCap.reserved7); } + FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCRESPONSE), FRFL("OBSSScanParameters:\n")); + if (!pFrm->OBSSScanParameters.present) + { + FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCRESPONSE), FRFL("Not present.\n")); + } + else + { + FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCRESPONSE), ( tANI_U8* )&pFrm->OBSSScanParameters.obssScanPassiveDwell, 2); + FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCRESPONSE), ( tANI_U8* )&pFrm->OBSSScanParameters.obssScanActiveDwell, 2); + FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCRESPONSE), ( tANI_U8* )&pFrm->OBSSScanParameters.bssChannelWidthTriggerScanInterval, 2); + FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCRESPONSE), ( tANI_U8* )&pFrm->OBSSScanParameters.obssScanPassiveTotalPerChannel, 2); + FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCRESPONSE), ( tANI_U8* )&pFrm->OBSSScanParameters.obssScanActiveTotalPerChannel, 2); + FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCRESPONSE), ( tANI_U8* )&pFrm->OBSSScanParameters.bssWidthChannelTransitionDelayFactor, 2); + FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCRESPONSE), ( tANI_U8* )&pFrm->OBSSScanParameters.obssScanActivityThreshold, 2); + } + FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCRESPONSE), FRFL("QosMapSet:\n")); + if (!pFrm->QosMapSet.present) + { + FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCRESPONSE), FRFL("Not present.\n")); + } + else + { + FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCRESPONSE), FRFL("num_dscp_exceptions: %d.\n"), pFrm->QosMapSet.num_dscp_exceptions); + FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCRESPONSE), ( tANI_U8* ) pFrm->QosMapSet.dscp_exceptions, pFrm->QosMapSet.num_dscp_exceptions); + } FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCRESPONSE), FRFL("to:\n")); FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCRESPONSE), pBuf, nBuf); } @@ -33638,15 +34160,15 @@ tANI_U32 dot11fPackAuthentication(tpAniSirGlobal pCtx, tDot11fAuthentication *pF FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_AUTHENTICATION), ( tANI_U8* )&pFrm->FTInfo.IGTK.key, 24); } } - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_AUTHENTICATION), FRFL("FTTimeoutInterval:\n")); - if (!pFrm->FTTimeoutInterval.present) + FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_AUTHENTICATION), FRFL("TimeoutInterval:\n")); + if (!pFrm->TimeoutInterval.present) { FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_AUTHENTICATION), FRFL("Not present.\n")); } else { - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_AUTHENTICATION), ( tANI_U8* )&pFrm->FTTimeoutInterval.timeoutType, 1); - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_AUTHENTICATION), ( tANI_U8* )&pFrm->FTTimeoutInterval.timeoutValue, 4); + FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_AUTHENTICATION), ( tANI_U8* )&pFrm->TimeoutInterval.timeoutType, 1); + FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_AUTHENTICATION), ( tANI_U8* )&pFrm->TimeoutInterval.timeoutValue, 4); } for (i = 0; i < pFrm->num_RICDataDesc; ++i) { @@ -34464,37 +34986,37 @@ tANI_U32 dot11fPackBeacon(tpAniSirGlobal pCtx, tDot11fBeacon *pFrm, tANI_U8 *pBu FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON), ( tANI_U8* )&pFrm->WAPI.bkid_count, 2); FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON), ( tANI_U8* ) pFrm->WAPI.bkid, 16 * pFrm->WAPI.bkid_count); } - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON), FRFL("CCXRadMgmtCap:\n")); - if (!pFrm->CCXRadMgmtCap.present) + FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON), FRFL("ESERadMgmtCap:\n")); + if (!pFrm->ESERadMgmtCap.present) { FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON), FRFL("Not present.\n")); } else { - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON), ( tANI_U8* )&pFrm->CCXRadMgmtCap.mgmt_state, 1); - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON), FRFL("mbssid_mask (3): %d\n"), pFrm->CCXRadMgmtCap.mbssid_mask); - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON), FRFL("reserved (5): %d\n"), pFrm->CCXRadMgmtCap.reserved); + FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON), ( tANI_U8* )&pFrm->ESERadMgmtCap.mgmt_state, 1); + FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON), FRFL("mbssid_mask (3): %d\n"), pFrm->ESERadMgmtCap.mbssid_mask); + FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON), FRFL("reserved (5): %d\n"), pFrm->ESERadMgmtCap.reserved); } - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON), FRFL("CCXTrafStrmMet:\n")); - if (!pFrm->CCXTrafStrmMet.present) + FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON), FRFL("ESETrafStrmMet:\n")); + if (!pFrm->ESETrafStrmMet.present) { FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON), FRFL("Not present.\n")); } else { - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON), ( tANI_U8* )&pFrm->CCXTrafStrmMet.tsid, 1); - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON), ( tANI_U8* )&pFrm->CCXTrafStrmMet.state, 1); - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON), ( tANI_U8* )&pFrm->CCXTrafStrmMet.msmt_interval, 2); + FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON), ( tANI_U8* )&pFrm->ESETrafStrmMet.tsid, 1); + FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON), ( tANI_U8* )&pFrm->ESETrafStrmMet.state, 1); + FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON), ( tANI_U8* )&pFrm->ESETrafStrmMet.msmt_interval, 2); } - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON), FRFL("CCXTxmitPower:\n")); - if (!pFrm->CCXTxmitPower.present) + FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON), FRFL("ESETxmitPower:\n")); + if (!pFrm->ESETxmitPower.present) { FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON), FRFL("Not present.\n")); } else { - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON), ( tANI_U8* )&pFrm->CCXTxmitPower.power_limit, 1); - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON), ( tANI_U8* )&pFrm->CCXTxmitPower.reserved, 1); + FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON), ( tANI_U8* )&pFrm->ESETxmitPower.power_limit, 1); + FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON), ( tANI_U8* )&pFrm->ESETxmitPower.reserved, 1); } FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON), FRFL("Airgo:\n")); if (!pFrm->Airgo.present) @@ -35005,6 +35527,21 @@ tANI_U32 dot11fPackBeacon(tpAniSirGlobal pCtx, tDot11fBeacon *pFrm, tANI_U8 *pBu FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON), ( tANI_U8* )&pFrm->WiderBWChanSwitchAnn.newCenterChanFreq0, 1); FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON), ( tANI_U8* )&pFrm->WiderBWChanSwitchAnn.newCenterChanFreq1, 1); } + FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON), FRFL("OBSSScanParameters:\n")); + if (!pFrm->OBSSScanParameters.present) + { + FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON), FRFL("Not present.\n")); + } + else + { + FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON), ( tANI_U8* )&pFrm->OBSSScanParameters.obssScanPassiveDwell, 2); + FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON), ( tANI_U8* )&pFrm->OBSSScanParameters.obssScanActiveDwell, 2); + FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON), ( tANI_U8* )&pFrm->OBSSScanParameters.bssChannelWidthTriggerScanInterval, 2); + FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON), ( tANI_U8* )&pFrm->OBSSScanParameters.obssScanPassiveTotalPerChannel, 2); + FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON), ( tANI_U8* )&pFrm->OBSSScanParameters.obssScanActiveTotalPerChannel, 2); + FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON), ( tANI_U8* )&pFrm->OBSSScanParameters.bssWidthChannelTransitionDelayFactor, 2); + FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON), ( tANI_U8* )&pFrm->OBSSScanParameters.obssScanActivityThreshold, 2); + } FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON), FRFL("to:\n")); FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON), pBuf, nBuf); } @@ -35809,37 +36346,37 @@ tANI_U32 dot11fPackBeacon2(tpAniSirGlobal pCtx, tDot11fBeacon2 *pFrm, tANI_U8 *p FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON2), ( tANI_U8* )&pFrm->WAPI.bkid_count, 2); FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON2), ( tANI_U8* ) pFrm->WAPI.bkid, 16 * pFrm->WAPI.bkid_count); } - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON2), FRFL("CCXRadMgmtCap:\n")); - if (!pFrm->CCXRadMgmtCap.present) + FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON2), FRFL("ESERadMgmtCap:\n")); + if (!pFrm->ESERadMgmtCap.present) { FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON2), FRFL("Not present.\n")); } else { - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON2), ( tANI_U8* )&pFrm->CCXRadMgmtCap.mgmt_state, 1); - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON2), FRFL("mbssid_mask (3): %d\n"), pFrm->CCXRadMgmtCap.mbssid_mask); - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON2), FRFL("reserved (5): %d\n"), pFrm->CCXRadMgmtCap.reserved); + FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON2), ( tANI_U8* )&pFrm->ESERadMgmtCap.mgmt_state, 1); + FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON2), FRFL("mbssid_mask (3): %d\n"), pFrm->ESERadMgmtCap.mbssid_mask); + FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON2), FRFL("reserved (5): %d\n"), pFrm->ESERadMgmtCap.reserved); } - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON2), FRFL("CCXTrafStrmMet:\n")); - if (!pFrm->CCXTrafStrmMet.present) + FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON2), FRFL("ESETrafStrmMet:\n")); + if (!pFrm->ESETrafStrmMet.present) { FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON2), FRFL("Not present.\n")); } else { - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON2), ( tANI_U8* )&pFrm->CCXTrafStrmMet.tsid, 1); - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON2), ( tANI_U8* )&pFrm->CCXTrafStrmMet.state, 1); - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON2), ( tANI_U8* )&pFrm->CCXTrafStrmMet.msmt_interval, 2); + FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON2), ( tANI_U8* )&pFrm->ESETrafStrmMet.tsid, 1); + FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON2), ( tANI_U8* )&pFrm->ESETrafStrmMet.state, 1); + FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON2), ( tANI_U8* )&pFrm->ESETrafStrmMet.msmt_interval, 2); } - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON2), FRFL("CCXTxmitPower:\n")); - if (!pFrm->CCXTxmitPower.present) + FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON2), FRFL("ESETxmitPower:\n")); + if (!pFrm->ESETxmitPower.present) { FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON2), FRFL("Not present.\n")); } else { - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON2), ( tANI_U8* )&pFrm->CCXTxmitPower.power_limit, 1); - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON2), ( tANI_U8* )&pFrm->CCXTxmitPower.reserved, 1); + FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON2), ( tANI_U8* )&pFrm->ESETxmitPower.power_limit, 1); + FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON2), ( tANI_U8* )&pFrm->ESETxmitPower.reserved, 1); } FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON2), FRFL("P2PBeacon:\n")); if (!pFrm->P2PBeacon.present) @@ -36548,46 +37085,46 @@ tANI_U32 dot11fPackBeaconIEs(tpAniSirGlobal pCtx, tDot11fBeaconIEs *pFrm, tANI_U FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACONIES), ( tANI_U8* )&pFrm->WAPI.bkid_count, 2); FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACONIES), ( tANI_U8* ) pFrm->WAPI.bkid, 16 * pFrm->WAPI.bkid_count); } - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACONIES), FRFL("CCXVersion:\n")); - if (!pFrm->CCXVersion.present) + FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACONIES), FRFL("ESEVersion:\n")); + if (!pFrm->ESEVersion.present) { FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACONIES), FRFL("Not present.\n")); } else { - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACONIES), ( tANI_U8* )&pFrm->CCXVersion.version, 1); + FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACONIES), ( tANI_U8* )&pFrm->ESEVersion.version, 1); } - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACONIES), FRFL("CCXRadMgmtCap:\n")); - if (!pFrm->CCXRadMgmtCap.present) + FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACONIES), FRFL("ESERadMgmtCap:\n")); + if (!pFrm->ESERadMgmtCap.present) { FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACONIES), FRFL("Not present.\n")); } else { - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACONIES), ( tANI_U8* )&pFrm->CCXRadMgmtCap.mgmt_state, 1); - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACONIES), FRFL("mbssid_mask (3): %d\n"), pFrm->CCXRadMgmtCap.mbssid_mask); - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACONIES), FRFL("reserved (5): %d\n"), pFrm->CCXRadMgmtCap.reserved); + FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACONIES), ( tANI_U8* )&pFrm->ESERadMgmtCap.mgmt_state, 1); + FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACONIES), FRFL("mbssid_mask (3): %d\n"), pFrm->ESERadMgmtCap.mbssid_mask); + FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACONIES), FRFL("reserved (5): %d\n"), pFrm->ESERadMgmtCap.reserved); } - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACONIES), FRFL("CCXTrafStrmMet:\n")); - if (!pFrm->CCXTrafStrmMet.present) + FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACONIES), FRFL("ESETrafStrmMet:\n")); + if (!pFrm->ESETrafStrmMet.present) { FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACONIES), FRFL("Not present.\n")); } else { - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACONIES), ( tANI_U8* )&pFrm->CCXTrafStrmMet.tsid, 1); - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACONIES), ( tANI_U8* )&pFrm->CCXTrafStrmMet.state, 1); - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACONIES), ( tANI_U8* )&pFrm->CCXTrafStrmMet.msmt_interval, 2); + FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACONIES), ( tANI_U8* )&pFrm->ESETrafStrmMet.tsid, 1); + FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACONIES), ( tANI_U8* )&pFrm->ESETrafStrmMet.state, 1); + FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACONIES), ( tANI_U8* )&pFrm->ESETrafStrmMet.msmt_interval, 2); } - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACONIES), FRFL("CCXTxmitPower:\n")); - if (!pFrm->CCXTxmitPower.present) + FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACONIES), FRFL("ESETxmitPower:\n")); + if (!pFrm->ESETxmitPower.present) { FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACONIES), FRFL("Not present.\n")); } else { - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACONIES), ( tANI_U8* )&pFrm->CCXTxmitPower.power_limit, 1); - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACONIES), ( tANI_U8* )&pFrm->CCXTxmitPower.reserved, 1); + FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACONIES), ( tANI_U8* )&pFrm->ESETxmitPower.power_limit, 1); + FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACONIES), ( tANI_U8* )&pFrm->ESETxmitPower.reserved, 1); } FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACONIES), FRFL("Airgo:\n")); if (!pFrm->Airgo.present) @@ -37218,6 +37755,21 @@ tANI_U32 dot11fPackBeaconIEs(tpAniSirGlobal pCtx, tDot11fBeaconIEs *pFrm, tANI_U FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACONIES), ( tANI_U8* )&pFrm->WiderBWChanSwitchAnn.newCenterChanFreq0, 1); FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACONIES), ( tANI_U8* )&pFrm->WiderBWChanSwitchAnn.newCenterChanFreq1, 1); } + FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACONIES), FRFL("OBSSScanParameters:\n")); + if (!pFrm->OBSSScanParameters.present) + { + FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACONIES), FRFL("Not present.\n")); + } + else + { + FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACONIES), ( tANI_U8* )&pFrm->OBSSScanParameters.obssScanPassiveDwell, 2); + FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACONIES), ( tANI_U8* )&pFrm->OBSSScanParameters.obssScanActiveDwell, 2); + FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACONIES), ( tANI_U8* )&pFrm->OBSSScanParameters.bssChannelWidthTriggerScanInterval, 2); + FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACONIES), ( tANI_U8* )&pFrm->OBSSScanParameters.obssScanPassiveTotalPerChannel, 2); + FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACONIES), ( tANI_U8* )&pFrm->OBSSScanParameters.obssScanActiveTotalPerChannel, 2); + FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACONIES), ( tANI_U8* )&pFrm->OBSSScanParameters.bssWidthChannelTransitionDelayFactor, 2); + FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACONIES), ( tANI_U8* )&pFrm->OBSSScanParameters.obssScanActivityThreshold, 2); + } FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACONIES), FRFL("to:\n")); FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACONIES), pBuf, nBuf); } @@ -39683,37 +40235,37 @@ tANI_U32 dot11fPackProbeResponse(tpAniSirGlobal pCtx, tDot11fProbeResponse *pFrm FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_PROBERESPONSE), ( tANI_U8* )&pFrm->WAPI.bkid_count, 2); FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_PROBERESPONSE), ( tANI_U8* ) pFrm->WAPI.bkid, 16 * pFrm->WAPI.bkid_count); } - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_PROBERESPONSE), FRFL("CCXRadMgmtCap:\n")); - if (!pFrm->CCXRadMgmtCap.present) + FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_PROBERESPONSE), FRFL("ESERadMgmtCap:\n")); + if (!pFrm->ESERadMgmtCap.present) { FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_PROBERESPONSE), FRFL("Not present.\n")); } else { - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_PROBERESPONSE), ( tANI_U8* )&pFrm->CCXRadMgmtCap.mgmt_state, 1); - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_PROBERESPONSE), FRFL("mbssid_mask (3): %d\n"), pFrm->CCXRadMgmtCap.mbssid_mask); - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_PROBERESPONSE), FRFL("reserved (5): %d\n"), pFrm->CCXRadMgmtCap.reserved); + FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_PROBERESPONSE), ( tANI_U8* )&pFrm->ESERadMgmtCap.mgmt_state, 1); + FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_PROBERESPONSE), FRFL("mbssid_mask (3): %d\n"), pFrm->ESERadMgmtCap.mbssid_mask); + FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_PROBERESPONSE), FRFL("reserved (5): %d\n"), pFrm->ESERadMgmtCap.reserved); } - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_PROBERESPONSE), FRFL("CCXTrafStrmMet:\n")); - if (!pFrm->CCXTrafStrmMet.present) + FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_PROBERESPONSE), FRFL("ESETrafStrmMet:\n")); + if (!pFrm->ESETrafStrmMet.present) { FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_PROBERESPONSE), FRFL("Not present.\n")); } else { - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_PROBERESPONSE), ( tANI_U8* )&pFrm->CCXTrafStrmMet.tsid, 1); - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_PROBERESPONSE), ( tANI_U8* )&pFrm->CCXTrafStrmMet.state, 1); - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_PROBERESPONSE), ( tANI_U8* )&pFrm->CCXTrafStrmMet.msmt_interval, 2); + FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_PROBERESPONSE), ( tANI_U8* )&pFrm->ESETrafStrmMet.tsid, 1); + FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_PROBERESPONSE), ( tANI_U8* )&pFrm->ESETrafStrmMet.state, 1); + FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_PROBERESPONSE), ( tANI_U8* )&pFrm->ESETrafStrmMet.msmt_interval, 2); } - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_PROBERESPONSE), FRFL("CCXTxmitPower:\n")); - if (!pFrm->CCXTxmitPower.present) + FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_PROBERESPONSE), FRFL("ESETxmitPower:\n")); + if (!pFrm->ESETxmitPower.present) { FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_PROBERESPONSE), FRFL("Not present.\n")); } else { - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_PROBERESPONSE), ( tANI_U8* )&pFrm->CCXTxmitPower.power_limit, 1); - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_PROBERESPONSE), ( tANI_U8* )&pFrm->CCXTxmitPower.reserved, 1); + FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_PROBERESPONSE), ( tANI_U8* )&pFrm->ESETxmitPower.power_limit, 1); + FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_PROBERESPONSE), ( tANI_U8* )&pFrm->ESETxmitPower.reserved, 1); } FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_PROBERESPONSE), FRFL("Airgo:\n")); if (!pFrm->Airgo.present) @@ -40312,6 +40864,21 @@ tANI_U32 dot11fPackProbeResponse(tpAniSirGlobal pCtx, tDot11fProbeResponse *pFrm FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_PROBERESPONSE), FRFL("operModeNotification (1): %d\n"), pFrm->ExtCap.operModeNotification); FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_PROBERESPONSE), FRFL("reserved7 (1): %d\n"), pFrm->ExtCap.reserved7); } + FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_PROBERESPONSE), FRFL("OBSSScanParameters:\n")); + if (!pFrm->OBSSScanParameters.present) + { + FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_PROBERESPONSE), FRFL("Not present.\n")); + } + else + { + FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_PROBERESPONSE), ( tANI_U8* )&pFrm->OBSSScanParameters.obssScanPassiveDwell, 2); + FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_PROBERESPONSE), ( tANI_U8* )&pFrm->OBSSScanParameters.obssScanActiveDwell, 2); + FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_PROBERESPONSE), ( tANI_U8* )&pFrm->OBSSScanParameters.bssChannelWidthTriggerScanInterval, 2); + FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_PROBERESPONSE), ( tANI_U8* )&pFrm->OBSSScanParameters.obssScanPassiveTotalPerChannel, 2); + FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_PROBERESPONSE), ( tANI_U8* )&pFrm->OBSSScanParameters.obssScanActiveTotalPerChannel, 2); + FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_PROBERESPONSE), ( tANI_U8* )&pFrm->OBSSScanParameters.bssWidthChannelTransitionDelayFactor, 2); + FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_PROBERESPONSE), ( tANI_U8* )&pFrm->OBSSScanParameters.obssScanActivityThreshold, 2); + } FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_PROBERESPONSE), FRFL("to:\n")); FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_PROBERESPONSE), pBuf, nBuf); } @@ -40447,6 +41014,40 @@ tANI_U32 dot11fPackProvisionDiscoveryRes(tpAniSirGlobal pCtx, tDot11fProvisionDi } /* End dot11fUnpackProvisionDiscoveryRes. */ +tANI_U32 dot11fPackQosMapConfigure(tpAniSirGlobal pCtx, tDot11fQosMapConfigure *pFrm, tANI_U8 *pBuf, tANI_U32 nBuf, tANI_U32 *pnConsumed) +{ + tANI_U32 i = 0; + tANI_U32 status = 0; + (void)i; + *pnConsumed = 0U; + status = PackCore(pCtx, (tANI_U8*)pFrm, pBuf, nBuf, pnConsumed, FFS_QosMapConfigure, IES_QosMapConfigure); + +# ifdef DOT11F_DUMP_FRAMES + if (!DOT11F_FAILED(status)) + { + FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_QOSMAPCONFIGURE), FRFL("Packed the QosMapConfigure:\n")); + FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_QOSMAPCONFIGURE), FRFL("Category:\n")); + FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_QOSMAPCONFIGURE), ( tANI_U8* )&pFrm->Category.category, 1); + FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_QOSMAPCONFIGURE), FRFL("Action:\n")); + FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_QOSMAPCONFIGURE), ( tANI_U8* )&pFrm->Action.action, 1); + FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_QOSMAPCONFIGURE), FRFL("QosMapSet:\n")); + if (!pFrm->QosMapSet.present) + { + FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_QOSMAPCONFIGURE), FRFL("Not present.\n")); + } + else + { + FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_QOSMAPCONFIGURE), FRFL("num_dscp_exceptions: %d.\n"), pFrm->QosMapSet.num_dscp_exceptions); + FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_QOSMAPCONFIGURE), ( tANI_U8* ) pFrm->QosMapSet.dscp_exceptions, pFrm->QosMapSet.num_dscp_exceptions); + } + FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_QOSMAPCONFIGURE), FRFL("to:\n")); + FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_QOSMAPCONFIGURE), pBuf, nBuf); + } +# endif // DOT11F_DUMP_FRAMES + return status; + +} /* End dot11fUnpackQosMapConfigure. */ + tANI_U32 dot11fPackRadioMeasurementReport(tpAniSirGlobal pCtx, tDot11fRadioMeasurementReport *pFrm, tANI_U8 *pBuf, tANI_U32 nBuf, tANI_U32 *pnConsumed) { tANI_U32 i = 0; @@ -41420,35 +42021,35 @@ tANI_U32 dot11fPackReAssocRequest(tpAniSirGlobal pCtx, tDot11fReAssocRequest *pF FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCREQUEST), FRFL("num_data: %d.\n"), pFrm->WAPIOpaque.num_data); FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCREQUEST), ( tANI_U8* ) pFrm->WAPIOpaque.data, pFrm->WAPIOpaque.num_data); } - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCREQUEST), FRFL("CCXRadMgmtCap:\n")); - if (!pFrm->CCXRadMgmtCap.present) + FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCREQUEST), FRFL("ESERadMgmtCap:\n")); + if (!pFrm->ESERadMgmtCap.present) { FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCREQUEST), FRFL("Not present.\n")); } else { - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCREQUEST), ( tANI_U8* )&pFrm->CCXRadMgmtCap.mgmt_state, 1); - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCREQUEST), FRFL("mbssid_mask (3): %d\n"), pFrm->CCXRadMgmtCap.mbssid_mask); - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCREQUEST), FRFL("reserved (5): %d\n"), pFrm->CCXRadMgmtCap.reserved); + FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCREQUEST), ( tANI_U8* )&pFrm->ESERadMgmtCap.mgmt_state, 1); + FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCREQUEST), FRFL("mbssid_mask (3): %d\n"), pFrm->ESERadMgmtCap.mbssid_mask); + FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCREQUEST), FRFL("reserved (5): %d\n"), pFrm->ESERadMgmtCap.reserved); } - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCREQUEST), FRFL("CCXVersion:\n")); - if (!pFrm->CCXVersion.present) + FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCREQUEST), FRFL("ESEVersion:\n")); + if (!pFrm->ESEVersion.present) { FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCREQUEST), FRFL("Not present.\n")); } else { - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCREQUEST), ( tANI_U8* )&pFrm->CCXVersion.version, 1); + FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCREQUEST), ( tANI_U8* )&pFrm->ESEVersion.version, 1); } - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCREQUEST), FRFL("CCXCckmOpaque:\n")); - if (!pFrm->CCXCckmOpaque.present) + FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCREQUEST), FRFL("ESECckmOpaque:\n")); + if (!pFrm->ESECckmOpaque.present) { FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCREQUEST), FRFL("Not present.\n")); } else { - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCREQUEST), FRFL("num_data: %d.\n"), pFrm->CCXCckmOpaque.num_data); - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCREQUEST), ( tANI_U8* ) pFrm->CCXCckmOpaque.data, pFrm->CCXCckmOpaque.num_data); + FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCREQUEST), FRFL("num_data: %d.\n"), pFrm->ESECckmOpaque.num_data); + FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCREQUEST), ( tANI_U8* ) pFrm->ESECckmOpaque.data, pFrm->ESECckmOpaque.num_data); } for (i = 0; i < pFrm->num_WMMTSPEC; ++i) { @@ -41488,16 +42089,16 @@ tANI_U32 dot11fPackReAssocRequest(tpAniSirGlobal pCtx, tDot11fReAssocRequest *pF FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCREQUEST), ( tANI_U8* )&pFrm->WMMTSPEC[i].medium_time, 2); } } - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCREQUEST), FRFL("CCXTrafStrmRateSet:\n")); - if (!pFrm->CCXTrafStrmRateSet.present) + FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCREQUEST), FRFL("ESETrafStrmRateSet:\n")); + if (!pFrm->ESETrafStrmRateSet.present) { FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCREQUEST), FRFL("Not present.\n")); } else { - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCREQUEST), ( tANI_U8* )&pFrm->CCXTrafStrmRateSet.tsid, 1); - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCREQUEST), FRFL("num_tsrates: %d.\n"), pFrm->CCXTrafStrmRateSet.num_tsrates); - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCREQUEST), ( tANI_U8* ) pFrm->CCXTrafStrmRateSet.tsrates, pFrm->CCXTrafStrmRateSet.num_tsrates); + FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCREQUEST), ( tANI_U8* )&pFrm->ESETrafStrmRateSet.tsid, 1); + FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCREQUEST), FRFL("num_tsrates: %d.\n"), pFrm->ESETrafStrmRateSet.num_tsrates); + FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCREQUEST), ( tANI_U8* ) pFrm->ESETrafStrmRateSet.tsrates, pFrm->ESETrafStrmRateSet.num_tsrates); } FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCREQUEST), FRFL("P2PIEOpaque:\n")); if (!pFrm->P2PIEOpaque.present) @@ -41624,6 +42225,16 @@ tANI_U32 dot11fPackReAssocRequest(tpAniSirGlobal pCtx, tDot11fReAssocRequest *pF FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCREQUEST), FRFL("rxNSS (3): %d\n"), pFrm->OperatingMode.rxNSS); FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCREQUEST), FRFL("rxNSSType (1): %d\n"), pFrm->OperatingMode.rxNSSType); } + FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCREQUEST), FRFL("QosMapSet:\n")); + if (!pFrm->QosMapSet.present) + { + FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCREQUEST), FRFL("Not present.\n")); + } + else + { + FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCREQUEST), FRFL("num_dscp_exceptions: %d.\n"), pFrm->QosMapSet.num_dscp_exceptions); + FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCREQUEST), ( tANI_U8* ) pFrm->QosMapSet.dscp_exceptions, pFrm->QosMapSet.num_dscp_exceptions); + } FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCREQUEST), FRFL("to:\n")); FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCREQUEST), pBuf, nBuf); } @@ -42141,6 +42752,16 @@ tANI_U32 dot11fPackReAssocResponse(tpAniSirGlobal pCtx, tDot11fReAssocResponse * FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCRESPONSE), ( tANI_U8* ) pFrm->WPA.auth_suites, 4 * pFrm->WPA.auth_suite_count); FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCRESPONSE), ( tANI_U8* )&pFrm->WPA.caps, 2); } + FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCRESPONSE), FRFL("TimeoutInterval:\n")); + if (!pFrm->TimeoutInterval.present) + { + FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCRESPONSE), FRFL("Not present.\n")); + } + else + { + FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCRESPONSE), ( tANI_U8* )&pFrm->TimeoutInterval.timeoutType, 1); + FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCRESPONSE), ( tANI_U8* )&pFrm->TimeoutInterval.timeoutValue, 4); + } FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCRESPONSE), FRFL("HTCaps:\n")); if (!pFrm->HTCaps.present) { @@ -42266,37 +42887,37 @@ tANI_U32 dot11fPackReAssocResponse(tpAniSirGlobal pCtx, tDot11fReAssocResponse * FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCRESPONSE), FRFL("acvo_acwmax (4): %d\n"), pFrm->WMMParams.acvo_acwmax); FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCRESPONSE), ( tANI_U8* )&pFrm->WMMParams.acvo_txoplimit, 2); } - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCRESPONSE), FRFL("CCXRadMgmtCap:\n")); - if (!pFrm->CCXRadMgmtCap.present) + FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCRESPONSE), FRFL("ESERadMgmtCap:\n")); + if (!pFrm->ESERadMgmtCap.present) { FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCRESPONSE), FRFL("Not present.\n")); } else { - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCRESPONSE), ( tANI_U8* )&pFrm->CCXRadMgmtCap.mgmt_state, 1); - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCRESPONSE), FRFL("mbssid_mask (3): %d\n"), pFrm->CCXRadMgmtCap.mbssid_mask); - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCRESPONSE), FRFL("reserved (5): %d\n"), pFrm->CCXRadMgmtCap.reserved); + FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCRESPONSE), ( tANI_U8* )&pFrm->ESERadMgmtCap.mgmt_state, 1); + FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCRESPONSE), FRFL("mbssid_mask (3): %d\n"), pFrm->ESERadMgmtCap.mbssid_mask); + FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCRESPONSE), FRFL("reserved (5): %d\n"), pFrm->ESERadMgmtCap.reserved); } - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCRESPONSE), FRFL("CCXTrafStrmMet:\n")); - if (!pFrm->CCXTrafStrmMet.present) + FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCRESPONSE), FRFL("ESETrafStrmMet:\n")); + if (!pFrm->ESETrafStrmMet.present) { FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCRESPONSE), FRFL("Not present.\n")); } else { - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCRESPONSE), ( tANI_U8* )&pFrm->CCXTrafStrmMet.tsid, 1); - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCRESPONSE), ( tANI_U8* )&pFrm->CCXTrafStrmMet.state, 1); - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCRESPONSE), ( tANI_U8* )&pFrm->CCXTrafStrmMet.msmt_interval, 2); + FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCRESPONSE), ( tANI_U8* )&pFrm->ESETrafStrmMet.tsid, 1); + FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCRESPONSE), ( tANI_U8* )&pFrm->ESETrafStrmMet.state, 1); + FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCRESPONSE), ( tANI_U8* )&pFrm->ESETrafStrmMet.msmt_interval, 2); } - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCRESPONSE), FRFL("CCXTxmitPower:\n")); - if (!pFrm->CCXTxmitPower.present) + FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCRESPONSE), FRFL("ESETxmitPower:\n")); + if (!pFrm->ESETxmitPower.present) { FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCRESPONSE), FRFL("Not present.\n")); } else { - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCRESPONSE), ( tANI_U8* )&pFrm->CCXTxmitPower.power_limit, 1); - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCRESPONSE), ( tANI_U8* )&pFrm->CCXTxmitPower.reserved, 1); + FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCRESPONSE), ( tANI_U8* )&pFrm->ESETxmitPower.power_limit, 1); + FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCRESPONSE), ( tANI_U8* )&pFrm->ESETxmitPower.reserved, 1); } for (i = 0; i < pFrm->num_WMMTSPEC; ++i) { @@ -42336,16 +42957,16 @@ tANI_U32 dot11fPackReAssocResponse(tpAniSirGlobal pCtx, tDot11fReAssocResponse * FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCRESPONSE), ( tANI_U8* )&pFrm->WMMTSPEC[i].medium_time, 2); } } - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCRESPONSE), FRFL("CCXTrafStrmRateSet:\n")); - if (!pFrm->CCXTrafStrmRateSet.present) + FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCRESPONSE), FRFL("ESETrafStrmRateSet:\n")); + if (!pFrm->ESETrafStrmRateSet.present) { FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCRESPONSE), FRFL("Not present.\n")); } else { - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCRESPONSE), ( tANI_U8* )&pFrm->CCXTrafStrmRateSet.tsid, 1); - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCRESPONSE), FRFL("num_tsrates: %d.\n"), pFrm->CCXTrafStrmRateSet.num_tsrates); - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCRESPONSE), ( tANI_U8* ) pFrm->CCXTrafStrmRateSet.tsrates, pFrm->CCXTrafStrmRateSet.num_tsrates); + FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCRESPONSE), ( tANI_U8* )&pFrm->ESETrafStrmRateSet.tsid, 1); + FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCRESPONSE), FRFL("num_tsrates: %d.\n"), pFrm->ESETrafStrmRateSet.num_tsrates); + FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCRESPONSE), ( tANI_U8* ) pFrm->ESETrafStrmRateSet.tsrates, pFrm->ESETrafStrmRateSet.num_tsrates); } FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCRESPONSE), FRFL("Airgo:\n")); if (!pFrm->Airgo.present) @@ -42754,6 +43375,31 @@ tANI_U32 dot11fPackReAssocResponse(tpAniSirGlobal pCtx, tDot11fReAssocResponse * FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCRESPONSE), FRFL("operModeNotification (1): %d\n"), pFrm->ExtCap.operModeNotification); FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCRESPONSE), FRFL("reserved7 (1): %d\n"), pFrm->ExtCap.reserved7); } + FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCRESPONSE), FRFL("OBSSScanParameters:\n")); + if (!pFrm->OBSSScanParameters.present) + { + FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCRESPONSE), FRFL("Not present.\n")); + } + else + { + FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCRESPONSE), ( tANI_U8* )&pFrm->OBSSScanParameters.obssScanPassiveDwell, 2); + FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCRESPONSE), ( tANI_U8* )&pFrm->OBSSScanParameters.obssScanActiveDwell, 2); + FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCRESPONSE), ( tANI_U8* )&pFrm->OBSSScanParameters.bssChannelWidthTriggerScanInterval, 2); + FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCRESPONSE), ( tANI_U8* )&pFrm->OBSSScanParameters.obssScanPassiveTotalPerChannel, 2); + FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCRESPONSE), ( tANI_U8* )&pFrm->OBSSScanParameters.obssScanActiveTotalPerChannel, 2); + FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCRESPONSE), ( tANI_U8* )&pFrm->OBSSScanParameters.bssWidthChannelTransitionDelayFactor, 2); + FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCRESPONSE), ( tANI_U8* )&pFrm->OBSSScanParameters.obssScanActivityThreshold, 2); + } + FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCRESPONSE), FRFL("QosMapSet:\n")); + if (!pFrm->QosMapSet.present) + { + FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCRESPONSE), FRFL("Not present.\n")); + } + else + { + FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCRESPONSE), FRFL("num_dscp_exceptions: %d.\n"), pFrm->QosMapSet.num_dscp_exceptions); + FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCRESPONSE), ( tANI_U8* ) pFrm->QosMapSet.dscp_exceptions, pFrm->QosMapSet.num_dscp_exceptions); + } FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCRESPONSE), FRFL("to:\n")); FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCRESPONSE), pBuf, nBuf); } @@ -42790,6 +43436,32 @@ tANI_U32 dot11fPackSMPowerSave(tpAniSirGlobal pCtx, tDot11fSMPowerSave *pFrm, tA } /* End dot11fUnpackSMPowerSave. */ +tANI_U32 dot11fPackSaQueryReq(tpAniSirGlobal pCtx, tDot11fSaQueryReq *pFrm, tANI_U8 *pBuf, tANI_U32 nBuf, tANI_U32 *pnConsumed) +{ + tANI_U32 i = 0; + tANI_U32 status = 0; + (void)i; + *pnConsumed = 0U; + status = PackCore(pCtx, (tANI_U8*)pFrm, pBuf, nBuf, pnConsumed, FFS_SaQueryReq, IES_SaQueryReq); + +# ifdef DOT11F_DUMP_FRAMES + if (!DOT11F_FAILED(status)) + { + FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_SAQUERYREQ), FRFL("Packed the SaQueryReq:\n")); + FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_SAQUERYREQ), FRFL("Category:\n")); + FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_SAQUERYREQ), ( tANI_U8* )&pFrm->Category.category, 1); + FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_SAQUERYREQ), FRFL("Action:\n")); + FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_SAQUERYREQ), ( tANI_U8* )&pFrm->Action.action, 1); + FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_SAQUERYREQ), FRFL("TransactionId:\n")); + FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_SAQUERYREQ), ( tANI_U8* )&pFrm->TransactionId.transId, 2); + FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_SAQUERYREQ), FRFL("to:\n")); + FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_SAQUERYREQ), pBuf, nBuf); + } +# endif // DOT11F_DUMP_FRAMES + return status; + +} /* End dot11fUnpackSaQueryReq. */ + tANI_U32 dot11fPackSaQueryRsp(tpAniSirGlobal pCtx, tDot11fSaQueryRsp *pFrm, tANI_U8 *pBuf, tANI_U32 nBuf, tANI_U32 *pnConsumed) { tANI_U32 i = 0; @@ -42918,6 +43590,16 @@ tANI_U32 dot11fPackTDLSDisRsp(tpAniSirGlobal pCtx, tDot11fTDLSDisRsp *pFrm, tANI FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSDISRSP), FRFL("num_bands: %d.\n"), pFrm->SuppChannels.num_bands); FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSDISRSP), ( tANI_U8* ) pFrm->SuppChannels.bands, 2 * pFrm->SuppChannels.num_bands); } + FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSDISRSP), FRFL("SuppOperatingClasses:\n")); + if (!pFrm->SuppOperatingClasses.present) + { + FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSDISRSP), FRFL("Not present.\n")); + } + else + { + FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSDISRSP), FRFL("num_classes: %d.\n"), pFrm->SuppOperatingClasses.num_classes); + FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSDISRSP), ( tANI_U8* ) pFrm->SuppOperatingClasses.classes, pFrm->SuppOperatingClasses.num_classes); + } FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSDISRSP), FRFL("RSN:\n")); if (!pFrm->RSN.present) { @@ -43053,15 +43735,15 @@ tANI_U32 dot11fPackTDLSDisRsp(tpAniSirGlobal pCtx, tDot11fTDLSDisRsp *pFrm, tANI FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSDISRSP), ( tANI_U8* )&pFrm->FTInfo.IGTK.key, 24); } } - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSDISRSP), FRFL("FTTimeoutInterval:\n")); - if (!pFrm->FTTimeoutInterval.present) + FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSDISRSP), FRFL("TimeoutInterval:\n")); + if (!pFrm->TimeoutInterval.present) { FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSDISRSP), FRFL("Not present.\n")); } else { - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSDISRSP), ( tANI_U8* )&pFrm->FTTimeoutInterval.timeoutType, 1); - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSDISRSP), ( tANI_U8* )&pFrm->FTTimeoutInterval.timeoutValue, 4); + FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSDISRSP), ( tANI_U8* )&pFrm->TimeoutInterval.timeoutType, 1); + FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSDISRSP), ( tANI_U8* )&pFrm->TimeoutInterval.timeoutValue, 4); } FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSDISRSP), FRFL("RICData:\n")); if (!pFrm->RICData.present) @@ -43415,15 +44097,15 @@ tANI_U32 dot11fPackTDLSSetupCnf(tpAniSirGlobal pCtx, tDot11fTDLSSetupCnf *pFrm, FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSSETUPCNF), ( tANI_U8* )&pFrm->FTInfo.IGTK.key, 24); } } - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSSETUPCNF), FRFL("FTTimeoutInterval:\n")); - if (!pFrm->FTTimeoutInterval.present) + FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSSETUPCNF), FRFL("TimeoutInterval:\n")); + if (!pFrm->TimeoutInterval.present) { FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSSETUPCNF), FRFL("Not present.\n")); } else { - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSSETUPCNF), ( tANI_U8* )&pFrm->FTTimeoutInterval.timeoutType, 1); - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSSETUPCNF), ( tANI_U8* )&pFrm->FTTimeoutInterval.timeoutValue, 4); + FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSSETUPCNF), ( tANI_U8* )&pFrm->TimeoutInterval.timeoutType, 1); + FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSSETUPCNF), ( tANI_U8* )&pFrm->TimeoutInterval.timeoutValue, 4); } FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSSETUPCNF), FRFL("HTInfo:\n")); if (!pFrm->HTInfo.present) @@ -43666,6 +44348,16 @@ tANI_U32 dot11fPackTDLSSetupReq(tpAniSirGlobal pCtx, tDot11fTDLSSetupReq *pFrm, FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSSETUPREQ), FRFL("operModeNotification (1): %d\n"), pFrm->ExtCap.operModeNotification); FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSSETUPREQ), FRFL("reserved7 (1): %d\n"), pFrm->ExtCap.reserved7); } + FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSSETUPREQ), FRFL("SuppOperatingClasses:\n")); + if (!pFrm->SuppOperatingClasses.present) + { + FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSSETUPREQ), FRFL("Not present.\n")); + } + else + { + FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSSETUPREQ), FRFL("num_classes: %d.\n"), pFrm->SuppOperatingClasses.num_classes); + FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSSETUPREQ), ( tANI_U8* ) pFrm->SuppOperatingClasses.classes, pFrm->SuppOperatingClasses.num_classes); + } FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSSETUPREQ), FRFL("QOSCapsStation:\n")); if (!pFrm->QOSCapsStation.present) { @@ -43739,15 +44431,15 @@ tANI_U32 dot11fPackTDLSSetupReq(tpAniSirGlobal pCtx, tDot11fTDLSSetupReq *pFrm, FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSSETUPREQ), ( tANI_U8* )&pFrm->FTInfo.IGTK.key, 24); } } - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSSETUPREQ), FRFL("FTTimeoutInterval:\n")); - if (!pFrm->FTTimeoutInterval.present) + FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSSETUPREQ), FRFL("TimeoutInterval:\n")); + if (!pFrm->TimeoutInterval.present) { FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSSETUPREQ), FRFL("Not present.\n")); } else { - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSSETUPREQ), ( tANI_U8* )&pFrm->FTTimeoutInterval.timeoutType, 1); - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSSETUPREQ), ( tANI_U8* )&pFrm->FTTimeoutInterval.timeoutValue, 4); + FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSSETUPREQ), ( tANI_U8* )&pFrm->TimeoutInterval.timeoutType, 1); + FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSSETUPREQ), ( tANI_U8* )&pFrm->TimeoutInterval.timeoutValue, 4); } FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSSETUPREQ), FRFL("RICData:\n")); if (!pFrm->RICData.present) @@ -44050,6 +44742,16 @@ tANI_U32 dot11fPackTDLSSetupRsp(tpAniSirGlobal pCtx, tDot11fTDLSSetupRsp *pFrm, FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSSETUPRSP), FRFL("operModeNotification (1): %d\n"), pFrm->ExtCap.operModeNotification); FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSSETUPRSP), FRFL("reserved7 (1): %d\n"), pFrm->ExtCap.reserved7); } + FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSSETUPRSP), FRFL("SuppOperatingClasses:\n")); + if (!pFrm->SuppOperatingClasses.present) + { + FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSSETUPRSP), FRFL("Not present.\n")); + } + else + { + FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSSETUPRSP), FRFL("num_classes: %d.\n"), pFrm->SuppOperatingClasses.num_classes); + FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSSETUPRSP), ( tANI_U8* ) pFrm->SuppOperatingClasses.classes, pFrm->SuppOperatingClasses.num_classes); + } FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSSETUPRSP), FRFL("QOSCapsStation:\n")); if (!pFrm->QOSCapsStation.present) { @@ -44123,15 +44825,15 @@ tANI_U32 dot11fPackTDLSSetupRsp(tpAniSirGlobal pCtx, tDot11fTDLSSetupRsp *pFrm, FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSSETUPRSP), ( tANI_U8* )&pFrm->FTInfo.IGTK.key, 24); } } - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSSETUPRSP), FRFL("FTTimeoutInterval:\n")); - if (!pFrm->FTTimeoutInterval.present) + FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSSETUPRSP), FRFL("TimeoutInterval:\n")); + if (!pFrm->TimeoutInterval.present) { FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSSETUPRSP), FRFL("Not present.\n")); } else { - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSSETUPRSP), ( tANI_U8* )&pFrm->FTTimeoutInterval.timeoutType, 1); - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSSETUPRSP), ( tANI_U8* )&pFrm->FTTimeoutInterval.timeoutValue, 4); + FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSSETUPRSP), ( tANI_U8* )&pFrm->TimeoutInterval.timeoutType, 1); + FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSSETUPRSP), ( tANI_U8* )&pFrm->TimeoutInterval.timeoutValue, 4); } FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSSETUPRSP), FRFL("RICData:\n")); if (!pFrm->RICData.present) @@ -44539,16 +45241,16 @@ tANI_U32 dot11fPackWMMAddTSRequest(tpAniSirGlobal pCtx, tDot11fWMMAddTSRequest * FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_WMMADDTSREQUEST), ( tANI_U8* )&pFrm->WMMTSPEC.surplus_bw_allowance, 2); FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_WMMADDTSREQUEST), ( tANI_U8* )&pFrm->WMMTSPEC.medium_time, 2); } - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_WMMADDTSREQUEST), FRFL("CCXTrafStrmRateSet:\n")); - if (!pFrm->CCXTrafStrmRateSet.present) + FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_WMMADDTSREQUEST), FRFL("ESETrafStrmRateSet:\n")); + if (!pFrm->ESETrafStrmRateSet.present) { FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_WMMADDTSREQUEST), FRFL("Not present.\n")); } else { - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_WMMADDTSREQUEST), ( tANI_U8* )&pFrm->CCXTrafStrmRateSet.tsid, 1); - FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_WMMADDTSREQUEST), FRFL("num_tsrates: %d.\n"), pFrm->CCXTrafStrmRateSet.num_tsrates); - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_WMMADDTSREQUEST), ( tANI_U8* ) pFrm->CCXTrafStrmRateSet.tsrates, pFrm->CCXTrafStrmRateSet.num_tsrates); + FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_WMMADDTSREQUEST), ( tANI_U8* )&pFrm->ESETrafStrmRateSet.tsid, 1); + FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_WMMADDTSREQUEST), FRFL("num_tsrates: %d.\n"), pFrm->ESETrafStrmRateSet.num_tsrates); + FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_WMMADDTSREQUEST), ( tANI_U8* ) pFrm->ESETrafStrmRateSet.tsrates, pFrm->ESETrafStrmRateSet.num_tsrates); } FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_WMMADDTSREQUEST), FRFL("to:\n")); FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_WMMADDTSREQUEST), pBuf, nBuf); @@ -44613,16 +45315,16 @@ tANI_U32 dot11fPackWMMAddTSResponse(tpAniSirGlobal pCtx, tDot11fWMMAddTSResponse FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_WMMADDTSRESPONSE), ( tANI_U8* )&pFrm->WMMTSPEC.surplus_bw_allowance, 2); FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_WMMADDTSRESPONSE), ( tANI_U8* )&pFrm->WMMTSPEC.medium_time, 2); } - FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_WMMADDTSRESPONSE), FRFL("CCXTrafStrmMet:\n")); - if (!pFrm->CCXTrafStrmMet.present) + FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_WMMADDTSRESPONSE), FRFL("ESETrafStrmMet:\n")); + if (!pFrm->ESETrafStrmMet.present) { FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_WMMADDTSRESPONSE), FRFL("Not present.\n")); } else { - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_WMMADDTSRESPONSE), ( tANI_U8* )&pFrm->CCXTrafStrmMet.tsid, 1); - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_WMMADDTSRESPONSE), ( tANI_U8* )&pFrm->CCXTrafStrmMet.state, 1); - FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_WMMADDTSRESPONSE), ( tANI_U8* )&pFrm->CCXTrafStrmMet.msmt_interval, 2); + FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_WMMADDTSRESPONSE), ( tANI_U8* )&pFrm->ESETrafStrmMet.tsid, 1); + FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_WMMADDTSRESPONSE), ( tANI_U8* )&pFrm->ESETrafStrmMet.state, 1); + FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_WMMADDTSRESPONSE), ( tANI_U8* )&pFrm->ESETrafStrmMet.msmt_interval, 2); } FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_WMMADDTSRESPONSE), FRFL("to:\n")); FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_WMMADDTSRESPONSE), pBuf, nBuf); @@ -45013,24 +45715,6 @@ static tANI_U32 PackCore(tpAniSirGlobal pCtx, case SigIeAirgo: status |= dot11fPackIeAirgo(pCtx, ( tDot11fIEAirgo* )(pSrc + pIe->offset + sizeof(tDot11fIEAirgo) * i ), pBufRemaining, nBufRemaining, &len); break; - case SigIeCCXCckmOpaque: - status |= dot11fPackIeCCXCckmOpaque(pCtx, ( tDot11fIECCXCckmOpaque* )(pSrc + pIe->offset + sizeof(tDot11fIECCXCckmOpaque) * i ), pBufRemaining, nBufRemaining, &len); - break; - case SigIeCCXRadMgmtCap: - status |= dot11fPackIeCCXRadMgmtCap(pCtx, ( tDot11fIECCXRadMgmtCap* )(pSrc + pIe->offset + sizeof(tDot11fIECCXRadMgmtCap) * i ), pBufRemaining, nBufRemaining, &len); - break; - case SigIeCCXTrafStrmMet: - status |= dot11fPackIeCCXTrafStrmMet(pCtx, ( tDot11fIECCXTrafStrmMet* )(pSrc + pIe->offset + sizeof(tDot11fIECCXTrafStrmMet) * i ), pBufRemaining, nBufRemaining, &len); - break; - case SigIeCCXTrafStrmRateSet: - status |= dot11fPackIeCCXTrafStrmRateSet(pCtx, ( tDot11fIECCXTrafStrmRateSet* )(pSrc + pIe->offset + sizeof(tDot11fIECCXTrafStrmRateSet) * i ), pBufRemaining, nBufRemaining, &len); - break; - case SigIeCCXTxmitPower: - status |= dot11fPackIeCCXTxmitPower(pCtx, ( tDot11fIECCXTxmitPower* )(pSrc + pIe->offset + sizeof(tDot11fIECCXTxmitPower) * i ), pBufRemaining, nBufRemaining, &len); - break; - case SigIeCCXVersion: - status |= dot11fPackIeCCXVersion(pCtx, ( tDot11fIECCXVersion* )(pSrc + pIe->offset + sizeof(tDot11fIECCXVersion) * i ), pBufRemaining, nBufRemaining, &len); - break; case SigIeCFParams: status |= dot11fPackIeCFParams(pCtx, ( tDot11fIECFParams* )(pSrc + pIe->offset + sizeof(tDot11fIECFParams) * i ), pBufRemaining, nBufRemaining, &len); break; @@ -45052,6 +45736,24 @@ static tANI_U32 PackCore(tpAniSirGlobal pCtx, case SigIeERPInfo: status |= dot11fPackIeERPInfo(pCtx, ( tDot11fIEERPInfo* )(pSrc + pIe->offset + sizeof(tDot11fIEERPInfo) * i ), pBufRemaining, nBufRemaining, &len); break; + case SigIeESECckmOpaque: + status |= dot11fPackIeESECckmOpaque(pCtx, ( tDot11fIEESECckmOpaque* )(pSrc + pIe->offset + sizeof(tDot11fIEESECckmOpaque) * i ), pBufRemaining, nBufRemaining, &len); + break; + case SigIeESERadMgmtCap: + status |= dot11fPackIeESERadMgmtCap(pCtx, ( tDot11fIEESERadMgmtCap* )(pSrc + pIe->offset + sizeof(tDot11fIEESERadMgmtCap) * i ), pBufRemaining, nBufRemaining, &len); + break; + case SigIeESETrafStrmMet: + status |= dot11fPackIeESETrafStrmMet(pCtx, ( tDot11fIEESETrafStrmMet* )(pSrc + pIe->offset + sizeof(tDot11fIEESETrafStrmMet) * i ), pBufRemaining, nBufRemaining, &len); + break; + case SigIeESETrafStrmRateSet: + status |= dot11fPackIeESETrafStrmRateSet(pCtx, ( tDot11fIEESETrafStrmRateSet* )(pSrc + pIe->offset + sizeof(tDot11fIEESETrafStrmRateSet) * i ), pBufRemaining, nBufRemaining, &len); + break; + case SigIeESETxmitPower: + status |= dot11fPackIeESETxmitPower(pCtx, ( tDot11fIEESETxmitPower* )(pSrc + pIe->offset + sizeof(tDot11fIEESETxmitPower) * i ), pBufRemaining, nBufRemaining, &len); + break; + case SigIeESEVersion: + status |= dot11fPackIeESEVersion(pCtx, ( tDot11fIEESEVersion* )(pSrc + pIe->offset + sizeof(tDot11fIEESEVersion) * i ), pBufRemaining, nBufRemaining, &len); + break; case SigIeExtCap: status |= dot11fPackIeExtCap(pCtx, ( tDot11fIEExtCap* )(pSrc + pIe->offset + sizeof(tDot11fIEExtCap) * i ), pBufRemaining, nBufRemaining, &len); break; @@ -45073,9 +45775,6 @@ static tANI_U32 PackCore(tpAniSirGlobal pCtx, case SigIeFTInfo: status |= dot11fPackIeFTInfo(pCtx, ( tDot11fIEFTInfo* )(pSrc + pIe->offset + sizeof(tDot11fIEFTInfo) * i ), pBufRemaining, nBufRemaining, &len); break; - case SigIeFTTimeoutInterval: - status |= dot11fPackIeFTTimeoutInterval(pCtx, ( tDot11fIEFTTimeoutInterval* )(pSrc + pIe->offset + sizeof(tDot11fIEFTTimeoutInterval) * i ), pBufRemaining, nBufRemaining, &len); - break; case SigIeHTCaps: status |= dot11fPackIeHTCaps(pCtx, ( tDot11fIEHTCaps* )(pSrc + pIe->offset + sizeof(tDot11fIEHTCaps) * i ), pBufRemaining, nBufRemaining, &len); break; @@ -45100,6 +45799,9 @@ static tANI_U32 PackCore(tpAniSirGlobal pCtx, case SigIeNeighborReport: status |= dot11fPackIeNeighborReport(pCtx, ( tDot11fIENeighborReport* )(pSrc + pIe->offset + sizeof(tDot11fIENeighborReport) * i ), pBufRemaining, nBufRemaining, &len); break; + case SigIeOBSSScanParameters: + status |= dot11fPackIeOBSSScanParameters(pCtx, ( tDot11fIEOBSSScanParameters* )(pSrc + pIe->offset + sizeof(tDot11fIEOBSSScanParameters) * i ), pBufRemaining, nBufRemaining, &len); + break; case SigIeOperatingMode: status |= dot11fPackIeOperatingMode(pCtx, ( tDot11fIEOperatingMode* )(pSrc + pIe->offset + sizeof(tDot11fIEOperatingMode) * i ), pBufRemaining, nBufRemaining, &len); break; @@ -45187,6 +45889,9 @@ static tANI_U32 PackCore(tpAniSirGlobal pCtx, case SigIeQOSCapsStation: status |= dot11fPackIeQOSCapsStation(pCtx, ( tDot11fIEQOSCapsStation* )(pSrc + pIe->offset + sizeof(tDot11fIEQOSCapsStation) * i ), pBufRemaining, nBufRemaining, &len); break; + case SigIeQosMapSet: + status |= dot11fPackIeQosMapSet(pCtx, ( tDot11fIEQosMapSet* )(pSrc + pIe->offset + sizeof(tDot11fIEQosMapSet) * i ), pBufRemaining, nBufRemaining, &len); + break; case SigIeQuiet: status |= dot11fPackIeQuiet(pCtx, ( tDot11fIEQuiet* )(pSrc + pIe->offset + sizeof(tDot11fIEQuiet) * i ), pBufRemaining, nBufRemaining, &len); break; @@ -45208,6 +45913,9 @@ static tANI_U32 PackCore(tpAniSirGlobal pCtx, case SigIeSuppChannels: status |= dot11fPackIeSuppChannels(pCtx, ( tDot11fIESuppChannels* )(pSrc + pIe->offset + sizeof(tDot11fIESuppChannels) * i ), pBufRemaining, nBufRemaining, &len); break; + case SigIeSuppOperatingClasses: + status |= dot11fPackIeSuppOperatingClasses(pCtx, ( tDot11fIESuppOperatingClasses* )(pSrc + pIe->offset + sizeof(tDot11fIESuppOperatingClasses) * i ), pBufRemaining, nBufRemaining, &len); + break; case SigIeSuppRates: status |= dot11fPackIeSuppRates(pCtx, ( tDot11fIESuppRates* )(pSrc + pIe->offset + sizeof(tDot11fIESuppRates) * i ), pBufRemaining, nBufRemaining, &len); break; @@ -45220,6 +45928,9 @@ static tANI_U32 PackCore(tpAniSirGlobal pCtx, case SigIeTPCRequest: status |= dot11fPackIeTPCRequest(pCtx, ( tDot11fIETPCRequest* )(pSrc + pIe->offset + sizeof(tDot11fIETPCRequest) * i ), pBufRemaining, nBufRemaining, &len); break; + case SigIeTimeoutInterval: + status |= dot11fPackIeTimeoutInterval(pCtx, ( tDot11fIETimeoutInterval* )(pSrc + pIe->offset + sizeof(tDot11fIETimeoutInterval) * i ), pBufRemaining, nBufRemaining, &len); + break; case SigIeVHTCaps: status |= dot11fPackIeVHTCaps(pCtx, ( tDot11fIEVHTCaps* )(pSrc + pIe->offset + sizeof(tDot11fIEVHTCaps) * i ), pBufRemaining, nBufRemaining, &len); break; diff --git a/CORE/SYS/legacy/src/utils/src/macTrace.c b/CORE/SYS/legacy/src/utils/src/macTrace.c index dcf2eb52f39e..68f962720f9e 100644 --- a/CORE/SYS/legacy/src/utils/src/macTrace.c +++ b/CORE/SYS/legacy/src/utils/src/macTrace.c @@ -495,8 +495,8 @@ tANI_U8* macTraceGetSmeMsgString( tANI_U16 smeMsg ) CASE_RETURN_STRING(eWNI_SME_FT_AGGR_QOS_REQ); CASE_RETURN_STRING(eWNI_SME_FT_AGGR_QOS_RSP); #endif -#if defined FEATURE_WLAN_CCX - CASE_RETURN_STRING(eWNI_SME_CCX_ADJACENT_AP_REPORT); +#if defined FEATURE_WLAN_ESE + CASE_RETURN_STRING(eWNI_SME_ESE_ADJACENT_AP_REPORT); #endif CASE_RETURN_STRING(eWNI_SME_REGISTER_MGMT_FRAME_REQ); CASE_RETURN_STRING(eWNI_SME_COEX_IND); @@ -670,7 +670,7 @@ tANI_U8* macTraceGetWdaMsgString( tANI_U16 wdaMsg ) CASE_RETURN_STRING(WDA_TIMER_CHIP_MONITOR_TIMEOUT); CASE_RETURN_STRING(WDA_TIMER_TRAFFIC_ACTIVITY_REQ); CASE_RETURN_STRING(WDA_TIMER_ADC_RSSI_STATS); -#ifdef FEATURE_WLAN_CCX +#ifdef FEATURE_WLAN_ESE CASE_RETURN_STRING(WDA_TSM_STATS_REQ); CASE_RETURN_STRING(WDA_TSM_STATS_RSP); #endif @@ -786,7 +786,7 @@ tANI_U8* macTraceGetWdaMsgString( tANI_U16 wdaMsg ) #ifndef REMOVE_PKT_LOG CASE_RETURN_STRING(WDA_PKTLOG_ENABLE_REQ); #endif -#if defined(FEATURE_WLAN_CCX) && defined(FEATURE_WLAN_CCX_UPLOAD) +#if defined(FEATURE_WLAN_ESE) && defined(FEATURE_WLAN_ESE_UPLOAD) CASE_RETURN_STRING(WDA_SET_PLM_REQ); #endif CASE_RETURN_STRING(WDA_CONFIG_PARAM_UPDATE_REQ); @@ -864,8 +864,8 @@ tANI_U8* macTraceGetLimMsgString( tANI_U16 limMsg ) #endif CASE_RETURN_STRING(SIR_LIM_BEACON_GEN_IND ); CASE_RETURN_STRING(SIR_LIM_PERIODIC_PROBE_REQ_TIMEOUT); -#ifdef FEATURE_WLAN_CCX - CASE_RETURN_STRING(SIR_LIM_CCX_TSM_TIMEOUT); +#ifdef FEATURE_WLAN_ESE + CASE_RETURN_STRING(SIR_LIM_ESE_TSM_TIMEOUT); #endif CASE_RETURN_STRING(SIR_LIM_DISASSOC_ACK_TIMEOUT); CASE_RETURN_STRING(SIR_LIM_DEAUTH_ACK_TIMEOUT); diff --git a/CORE/SYS/legacy/src/utils/src/parserApi.c b/CORE/SYS/legacy/src/utils/src/parserApi.c index 2b13bcb5d3c1..4fd5d4405ad1 100644 --- a/CORE/SYS/legacy/src/utils/src/parserApi.c +++ b/CORE/SYS/legacy/src/utils/src/parserApi.c @@ -1622,14 +1622,14 @@ void PopulateDot11fWMMCaps(tDot11fIEWMMCaps *pCaps) pCaps->present = 1; } // End PopulateDot11fWmmCaps. -#ifdef FEATURE_WLAN_CCX +#ifdef FEATURE_WLAN_ESE void PopulateDot11fReAssocTspec(tpAniSirGlobal pMac, tDot11fReAssocRequest *pReassoc, tpPESession psessionEntry) { tANI_U8 numTspecs = 0, idx; tTspecInfo *pTspec = NULL; - numTspecs = psessionEntry->pLimReAssocReq->ccxTspecInfo.numTspecs; - pTspec = &psessionEntry->pLimReAssocReq->ccxTspecInfo.tspec[0]; + numTspecs = psessionEntry->pLimReAssocReq->eseTspecInfo.numTspecs; + pTspec = &psessionEntry->pLimReAssocReq->eseTspecInfo.tspec[0]; pReassoc->num_WMMTSPEC = numTspecs; if (numTspecs) { for (idx=0; idx<numTspecs; idx++) { @@ -2154,7 +2154,7 @@ tSirRetStatus sirConvertProbeFrame2Struct(tpAniSirGlobal pMac, } #endif -#if defined FEATURE_WLAN_CCX +#if defined FEATURE_WLAN_ESE if (pr->QBSSLoad.present) { vos_mem_copy(&pProbeResp->QBSSLoad, &pr->QBSSLoad, sizeof(tDot11fIEQBSSLoad)); @@ -2515,7 +2515,7 @@ sirConvertAssocRespFrame2Struct(tpAniSirGlobal pMac, } #endif -#ifdef FEATURE_WLAN_CCX +#ifdef FEATURE_WLAN_ESE if (ar.num_WMMTSPEC) { pAssocRsp->num_tspecs = ar.num_WMMTSPEC; for (cnt=0; cnt < ar.num_WMMTSPEC; cnt++) { @@ -2525,11 +2525,11 @@ sirConvertAssocRespFrame2Struct(tpAniSirGlobal pMac, pAssocRsp->tspecPresent = TRUE; } - if(ar.CCXTrafStrmMet.present) + if(ar.ESETrafStrmMet.present) { pAssocRsp->tsmPresent = 1; vos_mem_copy(&pAssocRsp->tsmIE.tsid, - &ar.CCXTrafStrmMet.tsid,sizeof(tSirMacCCXTSMIE)); + &ar.ESETrafStrmMet.tsid,sizeof(tSirMacESETSMIE)); } #endif @@ -2747,9 +2747,9 @@ sirConvertReassocReqFrame2Struct(tpAniSirGlobal pMac, } // End sirConvertReassocReqFrame2Struct. -#if defined(FEATURE_WLAN_CCX_UPLOAD) +#if defined(FEATURE_WLAN_ESE_UPLOAD) tSirRetStatus -sirFillBeaconMandatoryIEforCcxBcnReport(tpAniSirGlobal pMac, +sirFillBeaconMandatoryIEforEseBcnReport(tpAniSirGlobal pMac, tANI_U8 *pPayload, const tANI_U32 nPayload, tANI_U8 **outIeBuf, @@ -2758,7 +2758,7 @@ sirFillBeaconMandatoryIEforCcxBcnReport(tpAniSirGlobal pMac, tDot11fBeaconIEs *pBies = NULL; tANI_U32 status = eHAL_STATUS_SUCCESS; tSirRetStatus retStatus = eSIR_SUCCESS; - tSirCcxBcnReportMandatoryIe ccxBcnReportMandatoryIe; + tSirEseBcnReportMandatoryIe eseBcnReportMandatoryIe; /* To store how many bytes are required to be allocated for Bcn report mandatory Ies */ @@ -2766,7 +2766,7 @@ sirFillBeaconMandatoryIEforCcxBcnReport(tpAniSirGlobal pMac, tANI_U8 *pos = NULL; // Zero-init our [out] parameter, - vos_mem_set( (tANI_U8*)&ccxBcnReportMandatoryIe, sizeof(ccxBcnReportMandatoryIe), 0 ); + vos_mem_set( (tANI_U8*)&eseBcnReportMandatoryIe, sizeof(eseBcnReportMandatoryIe), 0 ); pBies = vos_mem_malloc(sizeof(tDot11fBeaconIEs)); if ( NULL == pBies ) status = eHAL_STATUS_FAILURE; @@ -2794,17 +2794,17 @@ sirFillBeaconMandatoryIEforCcxBcnReport(tpAniSirGlobal pMac, PELOG2(sirDumpBuf(pMac, SIR_DBG_MODULE_ID, LOG2, pPayload, nPayload);) } - // & "transliterate" from a 'tDot11fBeaconIEs' to a 'ccxBcnReportMandatoryIe'... + // & "transliterate" from a 'tDot11fBeaconIEs' to a 'eseBcnReportMandatoryIe'... if ( !pBies->SSID.present ) { PELOGW(limLog(pMac, LOGW, FL("Mandatory IE SSID not present!\n"));) } else { - ccxBcnReportMandatoryIe.ssidPresent = 1; - ConvertSSID( pMac, &ccxBcnReportMandatoryIe.ssId, &pBies->SSID ); + eseBcnReportMandatoryIe.ssidPresent = 1; + ConvertSSID( pMac, &eseBcnReportMandatoryIe.ssId, &pBies->SSID ); /* 1 for EID, 1 for length and length bytes */ - numBytes += 1 + 1 + ccxBcnReportMandatoryIe.ssId.length; + numBytes += 1 + 1 + eseBcnReportMandatoryIe.ssId.length; } if ( !pBies->SuppRates.present ) @@ -2813,53 +2813,53 @@ sirFillBeaconMandatoryIEforCcxBcnReport(tpAniSirGlobal pMac, } else { - ccxBcnReportMandatoryIe.suppRatesPresent = 1; - ConvertSuppRates( pMac, &ccxBcnReportMandatoryIe.supportedRates, &pBies->SuppRates ); - numBytes += 1 + 1 + ccxBcnReportMandatoryIe.supportedRates.numRates; + eseBcnReportMandatoryIe.suppRatesPresent = 1; + ConvertSuppRates( pMac, &eseBcnReportMandatoryIe.supportedRates, &pBies->SuppRates ); + numBytes += 1 + 1 + eseBcnReportMandatoryIe.supportedRates.numRates; } if ( pBies->FHParamSet.present) { - ccxBcnReportMandatoryIe.fhParamPresent = 1; - ConvertFHParams( pMac, &ccxBcnReportMandatoryIe.fhParamSet, &pBies->FHParamSet ); + eseBcnReportMandatoryIe.fhParamPresent = 1; + ConvertFHParams( pMac, &eseBcnReportMandatoryIe.fhParamSet, &pBies->FHParamSet ); numBytes += 1 + 1 + SIR_MAC_FH_PARAM_SET_EID_MAX; } if ( pBies->DSParams.present ) { - ccxBcnReportMandatoryIe.dsParamsPresent = 1; - ccxBcnReportMandatoryIe.dsParamSet.channelNumber = pBies->DSParams.curr_channel; + eseBcnReportMandatoryIe.dsParamsPresent = 1; + eseBcnReportMandatoryIe.dsParamSet.channelNumber = pBies->DSParams.curr_channel; numBytes += 1 + 1 + SIR_MAC_DS_PARAM_SET_EID_MAX; } if ( pBies->CFParams.present ) { - ccxBcnReportMandatoryIe.cfPresent = 1; - ConvertCFParams( pMac, &ccxBcnReportMandatoryIe.cfParamSet, &pBies->CFParams ); + eseBcnReportMandatoryIe.cfPresent = 1; + ConvertCFParams( pMac, &eseBcnReportMandatoryIe.cfParamSet, &pBies->CFParams ); numBytes += 1 + 1 + SIR_MAC_CF_PARAM_SET_EID_MAX; } if ( pBies->IBSSParams.present ) { - ccxBcnReportMandatoryIe.ibssParamPresent = 1; - ccxBcnReportMandatoryIe.ibssParamSet.atim = pBies->IBSSParams.atim; + eseBcnReportMandatoryIe.ibssParamPresent = 1; + eseBcnReportMandatoryIe.ibssParamSet.atim = pBies->IBSSParams.atim; numBytes += 1 + 1 + SIR_MAC_IBSS_PARAM_SET_EID_MAX; } if ( pBies->TIM.present ) { - ccxBcnReportMandatoryIe.timPresent = 1; - ccxBcnReportMandatoryIe.tim.dtimCount = pBies->TIM.dtim_count; - ccxBcnReportMandatoryIe.tim.dtimPeriod = pBies->TIM.dtim_period; - ccxBcnReportMandatoryIe.tim.bitmapControl = pBies->TIM.bmpctl; - /* As per the CCX spec, May truncate and report first 4 octets only */ + eseBcnReportMandatoryIe.timPresent = 1; + eseBcnReportMandatoryIe.tim.dtimCount = pBies->TIM.dtim_count; + eseBcnReportMandatoryIe.tim.dtimPeriod = pBies->TIM.dtim_period; + eseBcnReportMandatoryIe.tim.bitmapControl = pBies->TIM.bmpctl; + /* As per the ESE spec, May truncate and report first 4 octets only */ numBytes += 1 + 1 + SIR_MAC_TIM_EID_MIN; } if ( pBies->RRMEnabledCap.present ) { - ccxBcnReportMandatoryIe.rrmPresent = 1; - vos_mem_copy( &ccxBcnReportMandatoryIe.rmEnabledCapabilities, &pBies->RRMEnabledCap, sizeof( tDot11fIERRMEnabledCap ) ); + eseBcnReportMandatoryIe.rrmPresent = 1; + vos_mem_copy( &eseBcnReportMandatoryIe.rmEnabledCapabilities, &pBies->RRMEnabledCap, sizeof( tDot11fIERRMEnabledCap ) ); numBytes += 1 + 1 + SIR_MAC_RM_ENABLED_CAPABILITY_EID_MAX; } @@ -2876,9 +2876,9 @@ sirFillBeaconMandatoryIEforCcxBcnReport(tpAniSirGlobal pMac, /* Start filling the output Ie with Mandatory IE information */ /* Fill SSID IE */ - if (ccxBcnReportMandatoryIe.ssidPresent) + if (eseBcnReportMandatoryIe.ssidPresent) { - if (freeBytes < (1 + 1 + ccxBcnReportMandatoryIe.ssId.length)) + if (freeBytes < (1 + 1 + eseBcnReportMandatoryIe.ssId.length)) { limLog(pMac, LOGP, FL("Insufficient memory to copy SSID")); retStatus = eSIR_FAILURE; @@ -2886,19 +2886,19 @@ sirFillBeaconMandatoryIEforCcxBcnReport(tpAniSirGlobal pMac, } *pos = SIR_MAC_SSID_EID; pos++; - *pos = ccxBcnReportMandatoryIe.ssId.length; + *pos = eseBcnReportMandatoryIe.ssId.length; pos++; vos_mem_copy(pos, - (tANI_U8*)ccxBcnReportMandatoryIe.ssId.ssId, - ccxBcnReportMandatoryIe.ssId.length); - pos += ccxBcnReportMandatoryIe.ssId.length; - freeBytes -= (1 + 1 + ccxBcnReportMandatoryIe.ssId.length); + (tANI_U8*)eseBcnReportMandatoryIe.ssId.ssId, + eseBcnReportMandatoryIe.ssId.length); + pos += eseBcnReportMandatoryIe.ssId.length; + freeBytes -= (1 + 1 + eseBcnReportMandatoryIe.ssId.length); } /* Fill Supported Rates IE */ - if (ccxBcnReportMandatoryIe.suppRatesPresent) + if (eseBcnReportMandatoryIe.suppRatesPresent) { - if (freeBytes < (1 + 1 + ccxBcnReportMandatoryIe.supportedRates.numRates)) + if (freeBytes < (1 + 1 + eseBcnReportMandatoryIe.supportedRates.numRates)) { limLog(pMac, LOGP, FL("Insufficient memory to copy Rates IE")); retStatus = eSIR_FAILURE; @@ -2906,17 +2906,17 @@ sirFillBeaconMandatoryIEforCcxBcnReport(tpAniSirGlobal pMac, } *pos = SIR_MAC_RATESET_EID; pos++; - *pos = ccxBcnReportMandatoryIe.supportedRates.numRates; + *pos = eseBcnReportMandatoryIe.supportedRates.numRates; pos++; vos_mem_copy(pos, - (tANI_U8*)ccxBcnReportMandatoryIe.supportedRates.rate, - ccxBcnReportMandatoryIe.supportedRates.numRates); - pos += ccxBcnReportMandatoryIe.supportedRates.numRates; - freeBytes -= (1 + 1 + ccxBcnReportMandatoryIe.supportedRates.numRates); + (tANI_U8*)eseBcnReportMandatoryIe.supportedRates.rate, + eseBcnReportMandatoryIe.supportedRates.numRates); + pos += eseBcnReportMandatoryIe.supportedRates.numRates; + freeBytes -= (1 + 1 + eseBcnReportMandatoryIe.supportedRates.numRates); } /* Fill FH Parameter set IE */ - if (ccxBcnReportMandatoryIe.fhParamPresent) + if (eseBcnReportMandatoryIe.fhParamPresent) { if (freeBytes < (1 + 1 + SIR_MAC_FH_PARAM_SET_EID_MAX)) { @@ -2929,14 +2929,14 @@ sirFillBeaconMandatoryIEforCcxBcnReport(tpAniSirGlobal pMac, *pos = SIR_MAC_FH_PARAM_SET_EID_MAX; pos++; vos_mem_copy(pos, - (tANI_U8*)&ccxBcnReportMandatoryIe.fhParamSet, + (tANI_U8*)&eseBcnReportMandatoryIe.fhParamSet, SIR_MAC_FH_PARAM_SET_EID_MAX); pos += SIR_MAC_FH_PARAM_SET_EID_MAX; freeBytes -= (1 + 1 + SIR_MAC_FH_PARAM_SET_EID_MAX); } /* Fill DS Parameter set IE */ - if (ccxBcnReportMandatoryIe.dsParamsPresent) + if (eseBcnReportMandatoryIe.dsParamsPresent) { if (freeBytes < (1 + 1 + SIR_MAC_DS_PARAM_SET_EID_MAX)) { @@ -2948,13 +2948,13 @@ sirFillBeaconMandatoryIEforCcxBcnReport(tpAniSirGlobal pMac, pos++; *pos = SIR_MAC_DS_PARAM_SET_EID_MAX; pos++; - *pos = ccxBcnReportMandatoryIe.dsParamSet.channelNumber; + *pos = eseBcnReportMandatoryIe.dsParamSet.channelNumber; pos += SIR_MAC_DS_PARAM_SET_EID_MAX; freeBytes -= (1 + 1 + SIR_MAC_DS_PARAM_SET_EID_MAX); } /* Fill CF Parameter set */ - if (ccxBcnReportMandatoryIe.cfPresent) + if (eseBcnReportMandatoryIe.cfPresent) { if (freeBytes < (1 + 1 + SIR_MAC_CF_PARAM_SET_EID_MAX)) { @@ -2967,14 +2967,14 @@ sirFillBeaconMandatoryIEforCcxBcnReport(tpAniSirGlobal pMac, *pos = SIR_MAC_CF_PARAM_SET_EID_MAX; pos++; vos_mem_copy(pos, - (tANI_U8*)&ccxBcnReportMandatoryIe.cfParamSet, + (tANI_U8*)&eseBcnReportMandatoryIe.cfParamSet, SIR_MAC_CF_PARAM_SET_EID_MAX); pos += SIR_MAC_CF_PARAM_SET_EID_MAX; freeBytes -= (1 + 1 + SIR_MAC_CF_PARAM_SET_EID_MAX); } /* Fill IBSS Parameter set IE */ - if (ccxBcnReportMandatoryIe.ibssParamPresent) + if (eseBcnReportMandatoryIe.ibssParamPresent) { if (freeBytes < (1 + 1 + SIR_MAC_IBSS_PARAM_SET_EID_MAX)) { @@ -2987,14 +2987,14 @@ sirFillBeaconMandatoryIEforCcxBcnReport(tpAniSirGlobal pMac, *pos = SIR_MAC_IBSS_PARAM_SET_EID_MAX; pos++; vos_mem_copy(pos, - (tANI_U8*)&ccxBcnReportMandatoryIe.ibssParamSet.atim, + (tANI_U8*)&eseBcnReportMandatoryIe.ibssParamSet.atim, SIR_MAC_IBSS_PARAM_SET_EID_MAX); pos += SIR_MAC_IBSS_PARAM_SET_EID_MAX; freeBytes -= (1 + 1 + SIR_MAC_IBSS_PARAM_SET_EID_MAX); } /* Fill TIM IE */ - if (ccxBcnReportMandatoryIe.timPresent) + if (eseBcnReportMandatoryIe.timPresent) { if (freeBytes < (1 + 1 + SIR_MAC_TIM_EID_MIN)) { @@ -3007,14 +3007,14 @@ sirFillBeaconMandatoryIEforCcxBcnReport(tpAniSirGlobal pMac, *pos = SIR_MAC_TIM_EID_MIN; pos++; vos_mem_copy(pos, - (tANI_U8*)&ccxBcnReportMandatoryIe.tim, + (tANI_U8*)&eseBcnReportMandatoryIe.tim, SIR_MAC_TIM_EID_MIN); pos += SIR_MAC_TIM_EID_MIN; freeBytes -= (1 + 1 + SIR_MAC_TIM_EID_MIN); } /* Fill RM Capability IE */ - if (ccxBcnReportMandatoryIe.rrmPresent) + if (eseBcnReportMandatoryIe.rrmPresent) { if (freeBytes < (1 + 1 + SIR_MAC_RM_ENABLED_CAPABILITY_EID_MAX)) { @@ -3027,7 +3027,7 @@ sirFillBeaconMandatoryIEforCcxBcnReport(tpAniSirGlobal pMac, *pos = SIR_MAC_RM_ENABLED_CAPABILITY_EID_MAX; pos++; vos_mem_copy(pos, - (tANI_U8*)&ccxBcnReportMandatoryIe.rmEnabledCapabilities, + (tANI_U8*)&eseBcnReportMandatoryIe.rmEnabledCapabilities, SIR_MAC_RM_ENABLED_CAPABILITY_EID_MAX); freeBytes -= (1 + 1 + SIR_MAC_RM_ENABLED_CAPABILITY_EID_MAX); } @@ -3055,7 +3055,7 @@ err_bcnrep: return retStatus; } -#endif /* FEATURE_WLAN_CCX_UPLOAD */ +#endif /* FEATURE_WLAN_ESE_UPLOAD */ tSirRetStatus sirParseBeaconIE(tpAniSirGlobal pMac, @@ -3158,11 +3158,11 @@ sirParseBeaconIE(tpAniSirGlobal pMac, &pBies->PowerConstraints, sizeof(tDot11fIEPowerConstraints)); } -#ifdef FEATURE_WLAN_CCX - if(pBies->CCXTxmitPower.present) +#ifdef FEATURE_WLAN_ESE + if(pBies->ESETxmitPower.present) { - pBeaconStruct->ccxTxPwr.present = 1; - pBeaconStruct->ccxTxPwr.power_limit = pBies->CCXTxmitPower.power_limit; + pBeaconStruct->eseTxPwr.present = 1; + pBeaconStruct->eseTxPwr.power_limit = pBies->ESETxmitPower.power_limit; } if (pBies->QBSSLoad.present) { @@ -3553,14 +3553,14 @@ sirConvertBeaconFrame2Struct(tpAniSirGlobal pMac, } #endif -#ifdef FEATURE_WLAN_CCX - if (pBeacon->CCXTxmitPower.present) +#ifdef FEATURE_WLAN_ESE + if (pBeacon->ESETxmitPower.present) { - /* copy CCX TPC info element */ - pBeaconStruct->ccxTxPwr.present = 1; - vos_mem_copy( &pBeaconStruct->ccxTxPwr, - &pBeacon->CCXTxmitPower, - sizeof(tDot11fIECCXTxmitPower)); + /* copy ESE TPC info element */ + pBeaconStruct->eseTxPwr.present = 1; + vos_mem_copy( &pBeaconStruct->eseTxPwr, + &pBeacon->ESETxmitPower, + sizeof(tDot11fIEESETxmitPower)); } if (pBeacon->QBSSLoad.present) { @@ -3903,12 +3903,12 @@ sirConvertAddtsRsp2Struct(tpAniSirGlobal pMac, pAddTs->tclasProcPresent = 1; pAddTs->tclasProc = addts.TCLASSPROC.processing; } -#ifdef FEATURE_WLAN_CCX - if(addts.CCXTrafStrmMet.present) +#ifdef FEATURE_WLAN_ESE + if(addts.ESETrafStrmMet.present) { pAddTs->tsmPresent = 1; vos_mem_copy(&pAddTs->tsmIE.tsid, - &addts.CCXTrafStrmMet.tsid,sizeof(tSirMacCCXTSMIE)); + &addts.ESETrafStrmMet.tsid,sizeof(tSirMacESETSMIE)); } #endif if ( addts.Schedule.present ) @@ -3973,12 +3973,12 @@ sirConvertAddtsRsp2Struct(tpAniSirGlobal pMac, return eSIR_FAILURE; } -#ifdef FEATURE_WLAN_CCX - if(wmmaddts.CCXTrafStrmMet.present) +#ifdef FEATURE_WLAN_ESE + if(wmmaddts.ESETrafStrmMet.present) { pAddTs->tsmPresent = 1; vos_mem_copy(&pAddTs->tsmIE.tsid, - &wmmaddts.CCXTrafStrmMet.tsid,sizeof(tSirMacCCXTSMIE)); + &wmmaddts.ESETrafStrmMet.tsid,sizeof(tSirMacESETSMIE)); } #endif @@ -4269,32 +4269,32 @@ PopulateDot11fWMMTSPEC(tSirMacTspecIE *pOld, } // End PopulateDot11fWMMTSPEC. -#if defined(FEATURE_WLAN_CCX) -// Fill the CCX version currently supported -void PopulateDot11fCCXVersion(tDot11fIECCXVersion *pCCXVersion) +#if defined(FEATURE_WLAN_ESE) +// Fill the ESE version currently supported +void PopulateDot11fESEVersion(tDot11fIEESEVersion *pESEVersion) { - pCCXVersion->present = 1; - pCCXVersion->version = CCX_VERSION_SUPPORTED; + pESEVersion->present = 1; + pESEVersion->version = ESE_VERSION_SUPPORTED; } -// Fill the CCX ie for the station. +// Fill the ESE ie for the station. // The State is Normal (1) // The MBSSID for station is set to 0. -void PopulateDot11fCCXRadMgmtCap(tDot11fIECCXRadMgmtCap *pCCXRadMgmtCap) +void PopulateDot11fESERadMgmtCap(tDot11fIEESERadMgmtCap *pESERadMgmtCap) { - pCCXRadMgmtCap->present = 1; - pCCXRadMgmtCap->mgmt_state = RM_STATE_NORMAL; - pCCXRadMgmtCap->mbssid_mask = 0; - pCCXRadMgmtCap->reserved = 0; + pESERadMgmtCap->present = 1; + pESERadMgmtCap->mgmt_state = RM_STATE_NORMAL; + pESERadMgmtCap->mbssid_mask = 0; + pESERadMgmtCap->reserved = 0; } -tSirRetStatus PopulateDot11fCCXCckmOpaque( tpAniSirGlobal pMac, +tSirRetStatus PopulateDot11fESECckmOpaque( tpAniSirGlobal pMac, tpSirCCKMie pCCKMie, - tDot11fIECCXCckmOpaque *pDot11f ) + tDot11fIEESECckmOpaque *pDot11f ) { int idx; if ( pCCKMie->length ) { if( 0 <= ( idx = FindIELocation( pMac, (tpSirRSNie)pCCKMie, - DOT11F_EID_CCXCCKMOPAQUE ) ) ) + DOT11F_EID_ESECCKMOPAQUE ) ) ) { pDot11f->present = 1; // Dont include OUI @@ -4305,11 +4305,11 @@ tSirRetStatus PopulateDot11fCCXCckmOpaque( tpAniSirGlobal pMac, } } return eSIR_SUCCESS; -} // End PopulateDot11fCCXCckmOpaque. +} // End PopulateDot11fESECckmOpaque. void PopulateDot11TSRSIE(tpAniSirGlobal pMac, - tSirMacCCXTSRSIE *pOld, - tDot11fIECCXTrafStrmRateSet *pDot11f, + tSirMacESETSRSIE *pOld, + tDot11fIEESETrafStrmRateSet *pDot11f, tANI_U8 rate_length) { pDot11f->tsid = pOld->tsid; diff --git a/CORE/TL/inc/wlan_qct_tl.h b/CORE/TL/inc/wlan_qct_tl.h index bb09685b8321..1edec996fb48 100644 --- a/CORE/TL/inc/wlan_qct_tl.h +++ b/CORE/TL/inc/wlan_qct_tl.h @@ -275,9 +275,9 @@ typedef struct /*Flag to indicate if STA is a WAPI STA*/ v_U8_t ucIsWapiSta; -#ifdef FEATURE_WLAN_CCX - /*Flag to indicate if STA is a CCX STA*/ - v_U8_t ucIsCcxSta; +#ifdef FEATURE_WLAN_ESE + /*Flag to indicate if STA is a ESE STA*/ + v_U8_t ucIsEseSta; #endif /*DPU Signature used for broadcast data - used for data caching*/ diff --git a/CORE/TL/src/wlan_qct_tl.c b/CORE/TL/src/wlan_qct_tl.c index 38247e51dde8..2585f2b722c8 100644 --- a/CORE/TL/src/wlan_qct_tl.c +++ b/CORE/TL/src/wlan_qct_tl.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. * @@ -155,10 +155,10 @@ extern tVOS_CON_MODE hdd_get_conparam ( void ); /*LLC header value*/ static v_U8_t WLANTL_LLC_HEADER[] = {0xAA, 0xAA, 0x03, 0x00, 0x00, 0x00 }; -#ifdef FEATURE_WLAN_CCX +#ifdef FEATURE_WLAN_ESE /*Aironet SNAP header value*/ static v_U8_t WLANTL_AIRONET_SNAP_HEADER[] = {0xAA, 0xAA, 0x03, 0x00, 0x40, 0x96, 0x00, 0x00 }; -#endif //FEATURE_WLAN_CCX +#endif //FEATURE_WLAN_ESE /*BT-AMP packet LLC OUI value*/ const v_U8_t WLANTL_BT_AMP_OUI[] = {0x00, 0x19, 0x58 }; @@ -1230,16 +1230,16 @@ WLANTL_RegisterSTAClient pClientSTA->wSTADesc.ucProtectedFrame = pwSTADescType->ucProtectedFrame; -#ifdef FEATURE_WLAN_CCX - pClientSTA->wSTADesc.ucIsCcxSta = pwSTADescType->ucIsCcxSta; +#ifdef FEATURE_WLAN_ESE + pClientSTA->wSTADesc.ucIsEseSta = pwSTADescType->ucIsEseSta; TLLOG2(VOS_TRACE( VOS_MODULE_ID_TL, VOS_TRACE_LEVEL_INFO_HIGH, - "WLAN TL:Registering STA Client ID: %d QoS %d Add LLC %d ProtFrame %d CcxSta %d", + "WLAN TL:Registering STA Client ID: %d QoS %d Add LLC %d ProtFrame %d EseSta %d", pwSTADescType->ucSTAId, pwSTADescType->ucQosEnabled, pwSTADescType->ucAddRmvLLC, pwSTADescType->ucProtectedFrame, - pwSTADescType->ucIsCcxSta)); + pwSTADescType->ucIsEseSta)); #else TLLOG2(VOS_TRACE( VOS_MODULE_ID_TL, VOS_TRACE_LEVEL_INFO_HIGH, @@ -1249,7 +1249,7 @@ WLANTL_RegisterSTAClient pwSTADescType->ucAddRmvLLC, pwSTADescType->ucProtectedFrame)); -#endif //FEATURE_WLAN_CCX +#endif //FEATURE_WLAN_ESE #ifdef WLAN_SOFTAP_VSTA_FEATURE // if this station was not allocated resources to perform HW-based // TX frame translation then force SW-based TX frame translation @@ -3266,7 +3266,7 @@ WLANTL_TxMgmtFrm return vosStatus; } - /* CCX IAPP/TDLS Frame which are data frames but technically used + /* ESE IAPP/TDLS Frame which are data frames but technically used * for management functionality comes through route. */ if (WLANTL_IS_QOS_DATA_FRAME(wFrmType)) \ @@ -4941,13 +4941,13 @@ done: }/*WLANTL_ForwardSTAFrames*/ -#if defined(FEATURE_WLAN_CCX) || defined(FEATURE_WLAN_CCX_UPLOAD) +#if defined(FEATURE_WLAN_ESE) || defined(FEATURE_WLAN_ESE_UPLOAD) /*========================================================================== FUNCTION WLANTL_IsIAPPFrame DESCRIPTION - Internal utility function for detecting incoming CCX IAPP frames + Internal utility function for detecting incoming ESE IAPP frames DEPENDENCIES @@ -5026,7 +5026,7 @@ WLANTL_IsIAPPFrame return VOS_TRUE; } -#endif //FEATURE_WLAN_CCX +#endif //FEATURE_WLAN_ESE /*========================================================================== @@ -5781,11 +5781,11 @@ WLANTL_RxFrames continue; } -#ifdef FEATURE_WLAN_CCX_UPLOAD - if ((pClientSTA->wSTADesc.ucIsCcxSta)|| broadcast) +#ifdef FEATURE_WLAN_ESE_UPLOAD + if ((pClientSTA->wSTADesc.ucIsEseSta)|| broadcast) { /*-------------------------------------------------------------------- - Filter the IAPP frames for CCX connection; + Filter the IAPP frames for ESE connection; if data it will return false and it will be routed through the regular data path --------------------------------------------------------------------*/ @@ -5796,11 +5796,11 @@ WLANTL_RxFrames } } #endif -#if defined(FEATURE_WLAN_CCX) && !defined(FEATURE_WLAN_CCX_UPLOAD) - if ((pClientSTA->wSTADesc.ucIsCcxSta)|| broadcast) +#if defined(FEATURE_WLAN_ESE) && !defined(FEATURE_WLAN_ESE_UPLOAD) + if ((pClientSTA->wSTADesc.ucIsEseSta)|| broadcast) { /*-------------------------------------------------------------------- - Filter the IAPP frames for CCX connection; + Filter the IAPP frames for ESE connection; if data it will return false and it will be routed through the regular data path --------------------------------------------------------------------*/ @@ -5816,7 +5816,7 @@ WLANTL_RxFrames } else { TLLOGE(VOS_TRACE( VOS_MODULE_ID_TL, VOS_TRACE_LEVEL_INFO, - "WLAN TL: Received CCX IAPP Frame")); + "WLAN TL: Received ESE IAPP Frame")); pTLCb->tlMgmtFrmClient.pfnTlMgmtFrmRx( pvosGCtx, vosTempBuff); } @@ -5824,7 +5824,7 @@ WLANTL_RxFrames continue; } } -#endif /* defined(FEATURE_WLAN_CCX) && !defined(FEATURE_WLAN_CCX_UPLOAD) */ +#endif /* defined(FEATURE_WLAN_ESE) && !defined(FEATURE_WLAN_ESE_UPLOAD) */ if ( WLAN_STA_BT_AMP == pClientSTA->wSTADesc.wSTAType ) { @@ -9143,7 +9143,7 @@ WLANTL_Translate8023To80211Header WLANTL_STAClientType* pClientSTA = NULL; v_U8_t ucQoSOffset = WLAN80211_MANDATORY_HEADER_SIZE; v_U8_t ucStaId; -#ifdef FEATURE_WLAN_CCX_UPLOAD +#ifdef FEATURE_WLAN_ESE_UPLOAD v_BOOL_t bIAPPTxwithLLC = VOS_FALSE; v_SIZE_t wIAPPSnapSize = WLANTL_LLC_HEADER_LEN; v_U8_t wIAPPSnap[WLANTL_LLC_HEADER_LEN] = {0}; @@ -9207,8 +9207,8 @@ WLANTL_Translate8023To80211Header } #endif -#ifdef FEATURE_WLAN_CCX_UPLOAD - if ((0 == w8023Header.usLenType) && (pClientSTA->wSTADesc.ucIsCcxSta)) +#ifdef FEATURE_WLAN_ESE_UPLOAD + if ((0 == w8023Header.usLenType) && (pClientSTA->wSTADesc.ucIsEseSta)) { vos_pkt_extract_data(vosDataBuff,0,&wIAPPSnap[0],&wIAPPSnapSize); if (vos_mem_compare(wIAPPSnap, @@ -9227,12 +9227,12 @@ WLANTL_Translate8023To80211Header bIAPPTxwithLLC = VOS_FALSE; } } -#endif /* FEATURE_WLAN_CCX_UPLOAD */ +#endif /* FEATURE_WLAN_ESE_UPLOAD */ if ((0 != pClientSTA->wSTADesc.ucAddRmvLLC) -#ifdef FEATURE_WLAN_CCX_UPLOAD +#ifdef FEATURE_WLAN_ESE_UPLOAD && (!bIAPPTxwithLLC) -#endif /* FEATURE_WLAN_CCX_UPLOAD */ +#endif /* FEATURE_WLAN_ESE_UPLOAD */ ) { /* Push the length */ @@ -9278,12 +9278,12 @@ WLANTL_Translate8023To80211Header }/*If add LLC is enabled*/ else { -#ifdef FEATURE_WLAN_CCX_UPLOAD +#ifdef FEATURE_WLAN_ESE_UPLOAD bIAPPTxwithLLC = VOS_FALSE; /* * Reset the Flag here to start afresh * with the next TX pkt */ -#endif /* FEATURE_WLAN_CCX_UPLOAD */ +#endif /* FEATURE_WLAN_ESE_UPLOAD */ TLLOG2(VOS_TRACE( VOS_MODULE_ID_TL, VOS_TRACE_LEVEL_INFO_HIGH, "WLAN TL: STA Client registered to not remove LLC" " WLANTL_Translate8023To80211Header")); @@ -9643,9 +9643,9 @@ WLANTL_Translate80211To8023Header } if ( 0 != pTLCb->atlSTAClients[ucSTAId]->wSTADesc.ucAddRmvLLC -#ifdef FEATURE_WLAN_CCX_UPLOAD +#ifdef FEATURE_WLAN_ESE_UPLOAD && (!bForwardIAPPwithLLC) -#endif /* FEATURE_WLAN_CCX_UPLOAD */ +#endif /* FEATURE_WLAN_ESE_UPLOAD */ ) { // Extract the LLC header diff --git a/CORE/WDA/inc/legacy/halMsgApi.h b/CORE/WDA/inc/legacy/halMsgApi.h index cbffb16ce481..16b9b7b83034 100644 --- a/CORE/WDA/inc/legacy/halMsgApi.h +++ b/CORE/WDA/inc/legacy/halMsgApi.h @@ -1033,7 +1033,7 @@ typedef struct tSirMacTspecIE tspec; eHalStatus status; tANI_U8 sessionId; //PE session id for PE<->HAL interface -#ifdef FEATURE_WLAN_CCX +#ifdef FEATURE_WLAN_ESE tANI_U16 tsm_interval; // TSM interval period passed from lim to wda #endif } tAddTsParams, *tpAddTsParams; @@ -1334,7 +1334,7 @@ typedef struct sEnterBmpsParams //if association is based on ProbeRsp instead of beacon. tANI_U8 dtimPeriod; - // For CCX and 11R Roaming + // For ESE and 11R Roaming tANI_U8 bRssiFilterEnable; tANI_U32 rssiFilterPeriod; tANI_U32 numBeaconPerRssiAverage; diff --git a/CORE/WDA/inc/wlan_qct_wda.h b/CORE/WDA/inc/wlan_qct_wda.h index 6aa98677253e..cb044f570a87 100644 --- a/CORE/WDA/inc/wlan_qct_wda.h +++ b/CORE/WDA/inc/wlan_qct_wda.h @@ -1110,7 +1110,7 @@ tSirRetStatus uMacPostCtrlMsg(void* pSirGlobal, tSirMbMsg* pMb); #define WDA_EXCLUDE_UNENCRYPTED_IND SIR_HAL_EXCLUDE_UNENCRYPTED_IND #endif -#ifdef FEATURE_WLAN_CCX +#ifdef FEATURE_WLAN_ESE #define WDA_TSM_STATS_REQ SIR_HAL_TSM_STATS_REQ #define WDA_TSM_STATS_RSP SIR_HAL_TSM_STATS_RSP #endif @@ -1226,7 +1226,7 @@ tSirRetStatus uMacPostCtrlMsg(void* pSirGlobal, tSirMbMsg* pMb); #define WDA_SET_PNO_CHANGED_IND SIR_HAL_SET_PNO_CHANGED_IND #endif // FEATURE_WLAN_SCAN_PNO -#if defined(FEATURE_WLAN_CCX) && defined(FEATURE_WLAN_CCX_UPLOAD) +#if defined(FEATURE_WLAN_ESE) && defined(FEATURE_WLAN_ESE_UPLOAD) #define WDA_SET_PLM_REQ SIR_HAL_SET_PLM_REQ #endif diff --git a/CORE/WDA/src/wlan_qct_wda.c b/CORE/WDA/src/wlan_qct_wda.c index 7f53abcd122b..b5ec5ec942ce 100644 --- a/CORE/WDA/src/wlan_qct_wda.c +++ b/CORE/WDA/src/wlan_qct_wda.c @@ -5147,7 +5147,7 @@ VOS_STATUS WDA_ProcessGetStatsReq(tWDA_CbContext *pWDA, return CONVERT_WDI2VOS_STATUS(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) /* * FUNCTION: WDA_GetGetRssiReqRoamRssiReqParamsCallback * send the response to PE with roam Rssi received from WDI @@ -6075,7 +6075,7 @@ VOS_STATUS WDA_ProcessUpdateBeaconParams(tWDA_CbContext *pWDA, } return CONVERT_WDI2VOS_STATUS(status) ; } -#ifdef FEATURE_WLAN_CCX +#ifdef FEATURE_WLAN_ESE /* * FUNCTION: WDA_TSMStatsReqCallback * send TSM Stats RSP back to PE @@ -6322,7 +6322,7 @@ VOS_STATUS WDA_ProcessUpdateProbeRspTemplate(tWDA_CbContext *pWDA, vos_mem_free(wdiSendProbeRspParam); return CONVERT_WDI2VOS_STATUS(status); } -#if defined(WLAN_FEATURE_VOWIFI) || defined(FEATURE_WLAN_CCX) +#if defined(WLAN_FEATURE_VOWIFI) || defined(FEATURE_WLAN_ESE) /* * FUNCTION: WDA_SetMaxTxPowerCallBack * send the response to PE with power value received from WDI @@ -7188,7 +7188,7 @@ VOS_STATUS WDA_ProcessEnterBmpsReq(tWDA_CbContext *pWDA, wdiEnterBmpsReqParams->wdiEnterBmpsInfo.ucDtimCount = pEnterBmpsReqParams->dtimCount; wdiEnterBmpsReqParams->wdiEnterBmpsInfo.ucDtimPeriod = pEnterBmpsReqParams->dtimPeriod; wdiEnterBmpsReqParams->wdiEnterBmpsInfo.uTbtt = pEnterBmpsReqParams->tbtt; - // For CCX and 11R Roaming + // For ESE and 11R Roaming wdiEnterBmpsReqParams->wdiEnterBmpsInfo.rssiFilterPeriod = (wpt_uint32)pEnterBmpsReqParams->rssiFilterPeriod; wdiEnterBmpsReqParams->wdiEnterBmpsInfo.numBeaconPerRssiAverage = (wpt_uint32)pEnterBmpsReqParams->numBeaconPerRssiAverage; wdiEnterBmpsReqParams->wdiEnterBmpsInfo.bRssiFilterEnable = (wpt_uint8)pEnterBmpsReqParams->bRssiFilterEnable; @@ -11157,7 +11157,7 @@ VOS_STATUS WDA_TxPacket(void *pWDA_handle, systemRole = wdaGetGlobalSystemRole(pMac); if (( eSYSTEM_UNKNOWN_ROLE == systemRole ) || (( eSYSTEM_STA_ROLE == systemRole ) -#if defined FEATURE_WLAN_CCX || defined FEATURE_WLAN_TDLS +#if defined FEATURE_WLAN_ESE || defined FEATURE_WLAN_TDLS && frmType == HAL_TXRX_FRM_802_11_MGMT #endif )) @@ -11483,7 +11483,7 @@ VOS_STATUS WDA_McProcessMsg( v_CONTEXT_t pVosContext, vos_msg_t *pMsg ) handling this request when UMAC supports */ break; } -#ifdef FEATURE_WLAN_CCX +#ifdef FEATURE_WLAN_ESE case WDA_TSM_STATS_REQ: { WDA_ProcessTsmStatsReq(pWDA, (tpAniGetTsmStatsReq)pMsg->bodyptr); @@ -11525,7 +11525,7 @@ VOS_STATUS WDA_McProcessMsg( v_CONTEXT_t pVosContext, vos_msg_t *pMsg ) WDA_ProcessGetStatsReq(pWDA, (tAniGetPEStatsReq *)pMsg->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_REQ: { WDA_ProcessGetRoamRssiReq(pWDA, (tAniGetRssiReq *)pMsg->bodyptr); @@ -11779,7 +11779,7 @@ VOS_STATUS WDA_McProcessMsg( v_CONTEXT_t pVosContext, vos_msg_t *pMsg ) (tSendProbeRespParams *)pMsg->bodyptr); break; } -#if defined(WLAN_FEATURE_VOWIFI) || defined(FEATURE_WLAN_CCX) +#if defined(WLAN_FEATURE_VOWIFI) || defined(FEATURE_WLAN_ESE) case WDA_SET_MAX_TX_POWER_REQ: { WDA_ProcessSetMaxTxPowerReq(pWDA, @@ -13362,7 +13362,7 @@ void WDA_ConvertSirAuthToWDIAuth(WDI_AuthType *AuthType, v_U8_t csrAuthType) case eCSR_AUTH_TYPE_OPEN_SYSTEM: *AuthType = eWDA_AUTH_TYPE_OPEN_SYSTEM; break; -#ifdef FEATURE_WLAN_CCX +#ifdef FEATURE_WLAN_ESE case eCSR_AUTH_TYPE_CCKM_WPA: *AuthType = eWDA_AUTH_TYPE_CCKM_WPA; break; @@ -13373,7 +13373,7 @@ void WDA_ConvertSirAuthToWDIAuth(WDI_AuthType *AuthType, v_U8_t csrAuthType) case eCSR_AUTH_TYPE_WPA_PSK: *AuthType = eWDA_AUTH_TYPE_WPA_PSK; break; -#ifdef FEATURE_WLAN_CCX +#ifdef FEATURE_WLAN_ESE case eCSR_AUTH_TYPE_CCKM_RSN: *AuthType = eWDA_AUTH_TYPE_CCKM_RSN; break; @@ -13529,8 +13529,8 @@ VOS_STATUS WDA_ProcessRoamScanOffloadReq(tWDA_CbContext *pWDA, pRoamOffloadScanReqParams->NeighborScanChannelMaxTime ; pwdiRoamOffloadScanInfo->EmptyRefreshScanPeriod = pRoamOffloadScanReqParams->EmptyRefreshScanPeriod ; - pwdiRoamOffloadScanInfo->IsCCXEnabled = - pRoamOffloadScanReqParams->IsCCXEnabled ; + pwdiRoamOffloadScanInfo->IsESEEnabled = + pRoamOffloadScanReqParams->IsESEEnabled ; vos_mem_copy(&pwdiRoamNetworkType->ssId.sSSID, &pRoamOffloadScanReqParams->ConnectedNetwork.ssId.ssId, pRoamOffloadScanReqParams->ConnectedNetwork.ssId.length); diff --git a/CORE/WDI/CP/inc/wlan_qct_wdi.h b/CORE/WDI/CP/inc/wlan_qct_wdi.h index 20779df96981..48ea00ba9eaa 100644 --- a/CORE/WDI/CP/inc/wlan_qct_wdi.h +++ b/CORE/WDI/CP/inc/wlan_qct_wdi.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. * @@ -2918,7 +2918,7 @@ typedef struct * structure depending on statsMask.*/ }WDI_GetStatsRspParamsType; -#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) /*--------------------------------------------------------------------------- WDI_GetRoamRssiParamsInfoType ---------------------------------------------------------------------------*/ @@ -2968,7 +2968,7 @@ typedef struct }WDI_GetRoamRssiRspParamsType; #endif -#ifdef FEATURE_WLAN_CCX +#ifdef FEATURE_WLAN_ESE /*--------------------------------------------------------------------------- WDI_TSMStatsParamsInfoType ---------------------------------------------------------------------------*/ @@ -3514,7 +3514,7 @@ typedef struct DXE when DXE wakes up from power save*/ unsigned int dxePhyAddr; - // For CCX and 11R Roaming + // For ESE and 11R Roaming wpt_uint32 rssiFilterPeriod; wpt_uint32 numBeaconPerRssiAverage; wpt_uint8 bRssiFilterEnable; @@ -4959,7 +4959,7 @@ typedef struct wpt_uint16 EmptyRefreshScanPeriod; wpt_uint8 ValidChannelCount; wpt_uint8 ValidChannelList[WDI_ROAM_SCAN_MAX_CHANNELS]; - wpt_boolean IsCCXEnabled; + wpt_boolean IsESEEnabled; /*Probe template for 2.4GHz band*/ wpt_uint16 us24GProbeSize; wpt_uint8 a24GProbeTemplate[WDI_ROAM_SCAN_MAX_PROBE_SIZE]; @@ -5749,7 +5749,7 @@ typedef void (*WDI_RemoveSTAKeyRspCb)(WDI_Status wdiStatus, void* pUserData); -#ifdef FEATURE_WLAN_CCX +#ifdef FEATURE_WLAN_ESE /*--------------------------------------------------------------------------- WDI_TsmRspCb @@ -5973,7 +5973,7 @@ typedef void (*WDI_SetLinkStateRspCb)( WDI_Status wdiStatus, typedef void (*WDI_GetStatsRspCb)(WDI_GetStatsRspParamsType* pwdiGetStatsRsp, void* pUserData); -#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) /*--------------------------------------------------------------------------- WDI_GetRoamRssiRspCb @@ -8011,7 +8011,7 @@ WDI_SetMaxTxPowerPerBandReq void* pUserData ); -#ifdef FEATURE_WLAN_CCX +#ifdef FEATURE_WLAN_ESE /** @brief WDI_TSMStatsReq will be called by the upper MAC to fetch Traffic Stream metrics. @@ -9273,7 +9273,7 @@ WDI_GetStatsReq void* pUserData ); -#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) /** @brief WDI_GetRoamRssiReq will be called when the upper MAC wants to get roam rssi from the device. Upon diff --git a/CORE/WDI/CP/inc/wlan_qct_wdi_i.h b/CORE/WDI/CP/inc/wlan_qct_wdi_i.h index 869c5a05da34..8d8c00b670ff 100644 --- a/CORE/WDI/CP/inc/wlan_qct_wdi_i.h +++ b/CORE/WDI/CP/inc/wlan_qct_wdi_i.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. * @@ -1974,7 +1974,7 @@ WDI_ProcessDelBAReq WDI_EventInfoType* pEventData ); -#ifdef FEATURE_WLAN_CCX +#ifdef FEATURE_WLAN_ESE /** @brief Process TSM Stats Request function (called when Main FSM allows it) @@ -2063,7 +2063,7 @@ WDI_ProcessGetStatsReq WDI_EventInfoType* pEventData ); -#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) /** @brief Process Get Roam rssi Request function (called when Main FSM allows it) @@ -3418,7 +3418,7 @@ WDI_ProcessDelBARsp WDI_EventInfoType* pEventData ); -#ifdef FEATURE_WLAN_CCX +#ifdef FEATURE_WLAN_ESE /** @brief Process TSM stats Rsp function (called when a response is being received over the bus from HAL) diff --git a/CORE/WDI/CP/src/wlan_qct_wdi.c b/CORE/WDI/CP/src/wlan_qct_wdi.c index 9bbc41ba525a..21bd70444bdd 100644 --- a/CORE/WDI/CP/src/wlan_qct_wdi.c +++ b/CORE/WDI/CP/src/wlan_qct_wdi.c @@ -335,7 +335,7 @@ WDI_ReqProcFuncType pfnReqProcTbl[WDI_MAX_UMAC_IND] = WDI_ProcessShutdownReq, /* WDI_SHUTDOWN_REQ */ WDI_ProcessSetPowerParamsReq, /*WDI_SET_POWER_PARAMS_REQ*/ -#ifdef FEATURE_WLAN_CCX +#ifdef FEATURE_WLAN_ESE WDI_ProcessTSMStatsReq, /* WDI_TSM_STATS_REQ */ #else NULL, @@ -356,7 +356,7 @@ WDI_ReqProcFuncType pfnReqProcTbl[WDI_MAX_UMAC_IND] = #else NULL, #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) WDI_ProcessGetRoamRssiReq, /* WDI_GET_ROAM_RSSI_REQ */ #else NULL, @@ -549,7 +549,7 @@ WDI_RspProcFuncType pfnRspProcTbl[WDI_MAX_RESP] = WDI_ProcessShutdownRsp, /* WDI_SHUTDOWN_RESP */ WDI_ProcessSetPowerParamsRsp, /*WDI_SET_POWER_PARAMS_RESP*/ -#ifdef FEATURE_WLAN_CCX +#ifdef FEATURE_WLAN_ESE WDI_ProcessTsmStatsRsp, /* WDI_TSM_STATS_RESP */ #else NULL, @@ -569,7 +569,7 @@ WDI_RspProcFuncType pfnRspProcTbl[WDI_MAX_RESP] = #else NULL, #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) WDI_ProcessGetRoamRssiRsp, /* WDI_GET_ROAM_RSSI_RESP */ #else NULL, @@ -3017,7 +3017,7 @@ WDI_SetTxPowerReq return WDI_PostMainEvent(&gWDICb, WDI_REQUEST_EVENT, &wdiEventData); } -#ifdef FEATURE_WLAN_CCX +#ifdef FEATURE_WLAN_ESE WDI_Status WDI_TSMStatsReq ( @@ -4976,7 +4976,7 @@ WDI_GetStatsReq }/*WDI_GetStatsReq*/ -#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) /** @brief WDI_GetRoamRssiReq will be called when the upper MAC wants to get roam rssi from the device. Upon @@ -10192,7 +10192,7 @@ WDI_ProcessDelBAReq wdiDelBARspCb, pEventData->pUserData, WDI_DEL_BA_RESP); }/*WDI_ProcessDelBAReq*/ -#ifdef FEATURE_WLAN_CCX +#ifdef FEATURE_WLAN_ESE WDI_Status WDI_ProcessTSMStatsReq @@ -11738,7 +11738,7 @@ WDI_ProcessGetStatsReq wdiGetStatsRspCb, pEventData->pUserData, WDI_GET_STATS_RESP); }/*WDI_ProcessGetStatsReq*/ -#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) /** @brief Process Get Roam Rssi Request function (called when Main FSM allows it) @@ -13297,7 +13297,7 @@ WDI_ProcessEnterBmpsReq enterBmpsReq.dtimCount = pwdiEnterBmpsReqParams->wdiEnterBmpsInfo.ucDtimCount; enterBmpsReq.dtimPeriod = pwdiEnterBmpsReqParams->wdiEnterBmpsInfo.ucDtimPeriod; - // For CCX and 11R Roaming + // For ESE and 11R Roaming enterBmpsReq.rssiFilterPeriod = pwdiEnterBmpsReqParams->wdiEnterBmpsInfo.rssiFilterPeriod; enterBmpsReq.numBeaconPerRssiAverage = pwdiEnterBmpsReqParams->wdiEnterBmpsInfo.numBeaconPerRssiAverage; enterBmpsReq.bRssiFilterEnable = pwdiEnterBmpsReqParams->wdiEnterBmpsInfo.bRssiFilterEnable; @@ -16902,7 +16902,7 @@ WDI_ProcessDelBARsp return WDI_STATUS_SUCCESS; }/*WDI_ProcessDelBARsp*/ -#ifdef FEATURE_WLAN_CCX +#ifdef FEATURE_WLAN_ESE /** @brief Process TSM Stats Rsp function (called when a response is being received over the bus from HAL) @@ -17721,7 +17721,7 @@ WDI_ProcessGetStatsRsp return WDI_STATUS_SUCCESS; }/*WDI_ProcessGetStatsRsp*/ -#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) /** @brief Process Get Roam Rssi Rsp function (called when a response is being received over the bus from HAL) @@ -22655,7 +22655,7 @@ WDI_2_HAL_REQ_TYPE return WLAN_HAL_ADD_BA_REQ; case WDI_DEL_BA_REQ: return WLAN_HAL_DEL_BA_REQ; -#ifdef FEATURE_WLAN_CCX +#ifdef FEATURE_WLAN_ESE case WDI_TSM_STATS_REQ: return WLAN_HAL_TSM_STATS_REQ; #endif @@ -22894,7 +22894,7 @@ HAL_2_WDI_RSP_TYPE return WDI_ADD_BA_RESP; case WLAN_HAL_DEL_BA_RSP: return WDI_DEL_BA_RESP; -#ifdef FEATURE_WLAN_CCX +#ifdef FEATURE_WLAN_ESE case WLAN_HAL_TSM_STATS_RSP: return WDI_TSM_STATS_RESP; #endif @@ -23064,7 +23064,7 @@ case WLAN_HAL_DEL_STA_SELF_RSP: case WLAN_HAL_UPDATE_VHT_OP_MODE_RSP: return WDI_UPDATE_VHT_OP_MODE_RESP; #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 WLAN_HAL_GET_ROAM_RSSI_RSP: return WDI_GET_ROAM_RSSI_RESP; #endif @@ -23919,7 +23919,7 @@ WDI_ExtractRequestCBFromEvent *ppfnReqCB = ((WDI_DelBAReqParamsType*)pEvent->pEventData)->wdiReqStatusCB; *ppUserData = ((WDI_DelBAReqParamsType*)pEvent->pEventData)->pUserData; break; -#ifdef FEATURE_WLAN_CCX +#ifdef FEATURE_WLAN_ESE case WDI_TSM_STATS_REQ: *ppfnReqCB = ((WDI_TSMStatsReqParamsType*)pEvent->pEventData)->wdiReqStatusCB; *ppUserData = ((WDI_TSMStatsReqParamsType*)pEvent->pEventData)->pUserData; @@ -23941,7 +23941,7 @@ WDI_ExtractRequestCBFromEvent *ppfnReqCB = ((WDI_GetStatsReqParamsType*)pEvent->pEventData)->wdiReqStatusCB; *ppUserData = ((WDI_GetStatsReqParamsType*)pEvent->pEventData)->pUserData; 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 WDI_GET_ROAM_RSSI_REQ: *ppfnReqCB = ((WDI_GetRoamRssiReqParamsType*)pEvent->pEventData)->wdiReqStatusCB; *ppUserData = ((WDI_GetRoamRssiReqParamsType*)pEvent->pEventData)->pUserData; @@ -24901,7 +24901,7 @@ WDI_PackRoamScanOffloadParams pRoamCandidateListParams->NeighborScanChannelMinTime = pwdiRoamScanOffloadReqParams->wdiRoamOffloadScanInfo.NeighborScanChannelMinTime ; pRoamCandidateListParams->NeighborScanChannelMaxTime = pwdiRoamScanOffloadReqParams->wdiRoamOffloadScanInfo.NeighborScanChannelMaxTime ; pRoamCandidateListParams->EmptyRefreshScanPeriod = pwdiRoamScanOffloadReqParams->wdiRoamOffloadScanInfo.EmptyRefreshScanPeriod ; - pRoamCandidateListParams->IsCCXEnabled = pwdiRoamScanOffloadReqParams->wdiRoamOffloadScanInfo.IsCCXEnabled ; + pRoamCandidateListParams->IsESEEnabled = pwdiRoamScanOffloadReqParams->wdiRoamOffloadScanInfo.IsESEEnabled ; wpalMemoryCopy(pRoamCandidateListParams->ValidChannelList, pwdiRoamScanOffloadReqParams->wdiRoamOffloadScanInfo.ValidChannelList, pwdiRoamScanOffloadReqParams->wdiRoamOffloadScanInfo.ValidChannelCount); @@ -50,9 +50,10 @@ ifeq ($(KERNEL_BUILD), 0) endif -# To enable CCX upload, dependent config -# CONFIG_QCOM_CCX must be enabled. -CONFIG_QCOM_CCX_UPLOAD := n +# To enable ESE upload, dependent config +# CONFIG_QCOM_ESE must be enabled. +CONFIG_QCOM_ESE := n +CONFIG_QCOM_ESE_UPLOAD := n # Feature flags which are not (currently) configurable via Kconfig @@ -332,9 +333,9 @@ MAC_LIM_OBJS := $(MAC_SRC_DIR)/pe/lim/limAIDmgmt.o \ $(MAC_SRC_DIR)/pe/lim/limTrace.o \ $(MAC_SRC_DIR)/pe/lim/limUtils.o -ifeq ($(CONFIG_QCOM_CCX),y) -ifneq ($(CONFIG_QCOM_CCX_UPLOAD),y) -MAC_LIM_OBJS += $(MAC_SRC_DIR)/pe/lim/limProcessCcxFrame.o +ifeq ($(CONFIG_QCOM_ESE),y) +ifneq ($(CONFIG_QCOM_ESE_UPLOAD),y) +MAC_LIM_OBJS += $(MAC_SRC_DIR)/pe/lim/limProcessEseFrame.o endif endif @@ -413,9 +414,9 @@ SME_CSR_OBJS := $(SME_SRC_DIR)/csr/csrApiRoam.o \ $(SME_SRC_DIR)/csr/csrNeighborRoam.o \ $(SME_SRC_DIR)/csr/csrUtil.o -ifeq ($(CONFIG_QCOM_CCX),y) -ifneq ($(CONFIG_QCOM_CCX_UPLOAD),y) -SME_CSR_OBJS += $(SME_SRC_DIR)/csr/csrCcx.o +ifeq ($(CONFIG_QCOM_ESE),y) +ifneq ($(CONFIG_QCOM_ESE_UPLOAD),y) +SME_CSR_OBJS += $(SME_SRC_DIR)/csr/csrEse.o endif endif @@ -871,6 +872,7 @@ CDEFINES := -DANI_LITTLE_BYTE_ENDIAN \ -DFEATURE_WLAN_PAL_MEM_DISABLE \ -DQCA_SUPPORT_TXRX_VDEV_PAUSE_LL \ -DQCA_SUPPORT_TX_THROTTLE_LL \ + -DWMI_INTERFACE_EVENT_LOGGING\ ifeq ($(CONFIG_ARCH_MSM), y) CDEFINES += -DMSM_PLATFORM @@ -919,12 +921,12 @@ CDEFINES += -DUSE_80211_WMMTSPEC_FOR_RIC endif endif -ifeq ($(CONFIG_QCOM_CCX),y) -CDEFINES += -DFEATURE_WLAN_CCX +ifeq ($(CONFIG_QCOM_ESE),y) +CDEFINES += -DFEATURE_WLAN_ESE CDEFINES += -DQCA_COMPUTE_TX_DELAY CDEFINES += -DQCA_COMPUTE_TX_DELAY_PER_TID -ifeq ($(CONFIG_QCOM_CCX_UPLOAD),y) -CDEFINES += -DFEATURE_WLAN_CCX_UPLOAD +ifeq ($(CONFIG_QCOM_ESE_UPLOAD),y) +CDEFINES += -DFEATURE_WLAN_ESE_UPLOAD endif endif diff --git a/firmware_bin/WCNSS_qcom_cfg.ini b/firmware_bin/WCNSS_qcom_cfg.ini index d620b70f93c2..f4902ead5951 100755 --- a/firmware_bin/WCNSS_qcom_cfg.ini +++ b/firmware_bin/WCNSS_qcom_cfg.ini @@ -163,8 +163,8 @@ g11dSupportEnabled=1 g11hSupportEnabled=1 -# CCX Support and fast transition -CcxEnabled=0 +# ESE Support and fast transition +EseEnabled=0 FastTransitionEnabled=1 ImplicitQosIsEnabled=0 gNeighborScanTimerPeriod=200 @@ -176,7 +176,7 @@ gNeighborScanChannelMinTime=20 gNeighborScanChannelMaxTime=30 gMaxNeighborReqTries=3 -# Legacy (non-CCX, non-802.11r) Fast Roaming Support +# Legacy (non-ESE, non-802.11r) Fast Roaming Support # To enable, set FastRoamEnabled=1 # To disable, set FastRoamEnabled=0 FastRoamEnabled=1 diff --git a/wcnss/inc/wlan_hal_msg.h b/wcnss/inc/wlan_hal_msg.h index f556cca71394..bcf3760bc131 100644 --- a/wcnss/inc/wlan_hal_msg.h +++ b/wcnss/inc/wlan_hal_msg.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. * @@ -3112,8 +3112,6 @@ typedef PACKED_PRE struct PACKED_POST } tDelBARspMsg, *tpDelBARspMsg; -#ifdef FEATURE_WLAN_CCX - /*--------------------------------------------------------------------------- * WLAN_HAL_TSM_STATS_REQ *--------------------------------------------------------------------------*/ @@ -3169,8 +3167,6 @@ typedef PACKED_PRE struct PACKED_POST } tTsmStatsRspMsg, *tpTsmStatsRspMsg; -#endif - /*--------------------------------------------------------------------------- * WLAN_HAL_SET_KEYDONE_MSG *--------------------------------------------------------------------------*/ @@ -3707,7 +3703,7 @@ typedef PACKED_PRE struct PACKED_POST //if association is based on ProbeRsp instead of beacon. tANI_U8 dtimPeriod; - // For CCX and 11R Roaming + // For ESE and 11R Roaming tANI_U32 rssiFilterPeriod; tANI_U32 numBeaconPerRssiAverage; tANI_U8 bRssiFilterEnable; @@ -5612,7 +5608,7 @@ typedef PACKED_PRE struct PACKED_POST { tANI_U16 EmptyRefreshScanPeriod; tANI_U8 ValidChannelCount; tANI_U8 ValidChannelList[WLAN_HAL_ROAM_SCAN_MAX_CHANNELS]; - eAniBoolean IsCCXEnabled; + eAniBoolean IsESEEnabled; tANI_U16 us24GProbeSize; tANI_U8 a24GProbeTemplate[WLAN_HAL_ROAM_SCAN_MAX_PROBE_SIZE]; |