diff --git a/core/mac/inc/ani_global.h b/core/mac/inc/ani_global.h index f1c580312a1f..0838c75c6ae0 100644 --- a/core/mac/inc/ani_global.h +++ b/core/mac/inc/ani_global.h @@ -47,9 +47,7 @@ typedef struct sAniSirGlobal *tpAniSirGlobal; #include "sir_api.h" #include "csr_api.h" -#ifdef WLAN_FEATURE_VOWIFI_11R #include "sme_ft_api.h" -#endif #include "csr_support.h" #include "sme_internal.h" #include "sap_api.h" @@ -65,9 +63,7 @@ typedef struct sAniSirGlobal *tpAniSirGlobal; #endif #include "p2p_api.h" -#if defined WLAN_FEATURE_VOWIFI_11R #include -#endif /* Check if this definition can actually move here from halInternal.h even for Volans. In that case */ /* this featurization can be removed. */ @@ -313,9 +309,7 @@ typedef struct sLimTimers { /* quiet duration */ TX_TIMER gLimQuietBssTimer; -#ifdef WLAN_FEATURE_VOWIFI_11R TX_TIMER gLimFTPreAuthRspTimer; -#endif #ifdef FEATURE_WLAN_ESE TX_TIMER gLimEseTsmTimer; diff --git a/core/mac/inc/ani_system_defs.h b/core/mac/inc/ani_system_defs.h index ebaa1311bc85..4d5796ec82d4 100644 --- a/core/mac/inc/ani_system_defs.h +++ b/core/mac/inc/ani_system_defs.h @@ -73,9 +73,7 @@ typedef enum eAniBool { typedef enum eAniAuthType { eSIR_OPEN_SYSTEM, eSIR_SHARED_KEY, -#if defined WLAN_FEATURE_VOWIFI_11R eSIR_FT_AUTH, -#endif #if defined FEATURE_WLAN_ESE eSIR_LEAP_AUTH = 0x80, #endif diff --git a/core/mac/inc/sir_api.h b/core/mac/inc/sir_api.h index e0aa3801b0b8..7e4c033d2da4 100644 --- a/core/mac/inc/sir_api.h +++ b/core/mac/inc/sir_api.h @@ -677,11 +677,9 @@ typedef struct sSirBssDescription { uint32_t parentTSF; uint32_t startTSF[2]; #endif -#ifdef WLAN_FEATURE_VOWIFI_11R uint8_t mdiePresent; /* MDIE for 11r, picked from the beacons */ uint8_t mdie[SIR_MDIE_SIZE]; -#endif #ifdef FEATURE_WLAN_ESE uint16_t QBSSLoad_present; uint16_t QBSSLoad_avail; @@ -990,9 +988,7 @@ typedef struct sSirSmeJoinReq { tAniEdType MgmtEncryptionType; #endif -#ifdef WLAN_FEATURE_VOWIFI_11R tAniBool is11Rconnection; -#endif #ifdef FEATURE_WLAN_ESE tAniBool isESEFeatureIniEnabled; tAniBool isESEconnection; @@ -1045,9 +1041,7 @@ typedef struct sSirSmeJoinRsp { uint32_t beaconLength; uint32_t assocReqLength; uint32_t assocRspLength; -#ifdef WLAN_FEATURE_VOWIFI_11R uint32_t parsedRicRspLen; -#endif #ifdef FEATURE_WLAN_ESE uint32_t tspecIeLen; #endif diff --git a/core/mac/inc/wni_api.h b/core/mac/inc/wni_api.h index 64235814b2e9..c71c8069a694 100644 --- a/core/mac/inc/wni_api.h +++ b/core/mac/inc/wni_api.h @@ -129,13 +129,11 @@ enum eWniMsgTypes { eWNI_SME_ADD_STA_SELF_RSP, eWNI_SME_DEL_STA_SELF_RSP, -#if defined WLAN_FEATURE_VOWIFI_11R eWNI_SME_FT_PRE_AUTH_REQ, eWNI_SME_FT_PRE_AUTH_RSP, eWNI_SME_FT_UPDATE_KEY, eWNI_SME_FT_AGGR_QOS_REQ, eWNI_SME_FT_AGGR_QOS_RSP, -#endif #if defined FEATURE_WLAN_ESE eWNI_SME_ESE_ADJACENT_AP_REPORT, diff --git a/core/mac/src/include/parser_api.h b/core/mac/src/include/parser_api.h index 42f016a09163..687fc3c93fcf 100644 --- a/core/mac/src/include/parser_api.h +++ b/core/mac/src/include/parser_api.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012-2015 The Linux Foundation. All rights reserved. + * Copyright (c) 2012-2016 The Linux Foundation. All rights reserved. * * Previously licensed under the ISC license by Qualcomm Atheros, Inc. * @@ -41,9 +41,7 @@ #include #include "sir_mac_prop_exts.h" #include "dot11f.h" -#ifdef WLAN_FEATURE_VOWIFI_11R #include "lim_ft_defs.h" -#endif #include "lim_session.h" #define COUNTRY_STRING_LENGTH (3) @@ -115,9 +113,7 @@ typedef struct sSirProbeRespBeacon { tDot11fIEHTCaps HTCaps; tDot11fIEHTInfo HTInfo; tDot11fIEP2PProbeRes P2PProbeRes; -#ifdef WLAN_FEATURE_VOWIFI_11R uint8_t mdie[SIR_MDIE_SIZE]; -#endif #ifdef FEATURE_WLAN_ESE tDot11fIEESETxmitPower eseTxPwr; tDot11fIEQBSSLoad QBSSLoad; @@ -147,9 +143,7 @@ typedef struct sSirProbeRespBeacon { uint8_t tpcReportPresent; uint8_t powerConstraintPresent; -#ifdef WLAN_FEATURE_VOWIFI_11R uint8_t mdiePresent; -#endif #ifdef WLAN_FEATURE_11AC tDot11fIEVHTCaps VHTCaps; @@ -256,12 +250,10 @@ typedef struct sSirAssocRsp { tSirAddtsRspInfo addtsRsp; tDot11fIEHTCaps HTCaps; tDot11fIEHTInfo HTInfo; -#if defined WLAN_FEATURE_VOWIFI_11R tDot11fIEFTInfo FTInfo; uint8_t mdie[SIR_MDIE_SIZE]; uint8_t num_RICData; tDot11fIERICDataDesc RICData[2]; -#endif #ifdef FEATURE_WLAN_ESE uint8_t num_tspecs; @@ -276,11 +268,9 @@ typedef struct sSirAssocRsp { uint8_t wmeEdcaPresent; uint8_t addtsPresent; uint8_t wsmCapablePresent; -#if defined WLAN_FEATURE_VOWIFI_11R uint8_t ftinfoPresent; uint8_t mdiePresent; uint8_t ricPresent; -#endif #ifdef FEATURE_WLAN_ESE uint8_t tspecPresent; uint8_t tsmPresent; @@ -907,11 +897,9 @@ tSirRetStatus populate_dot11f_rrm_ie(tpAniSirGlobal pMac, tpPESession psessionEntry); #endif -#if defined WLAN_FEATURE_VOWIFI_11R void populate_mdie(tpAniSirGlobal pMac, tDot11fIEMobilityDomain * pDot11f, uint8_t mdie[]); void populate_ft_info(tpAniSirGlobal pMac, tDot11fIEFTInfo *pDot11f); -#endif void populate_dot11f_assoc_rsp_rates(tpAniSirGlobal pMac, tDot11fIESuppRates *pSupp, diff --git a/core/mac/src/include/sir_params.h b/core/mac/src/include/sir_params.h index ff6f339154e8..affd556d5cf3 100644 --- a/core/mac/src/include/sir_params.h +++ b/core/mac/src/include/sir_params.h @@ -336,12 +336,10 @@ typedef struct sSirMbMsgP2p { #define SIR_HAL_CFG_RXP_FILTER_REQ (SIR_HAL_ITC_MSG_TYPES_BEGIN + 106) -#ifdef WLAN_FEATURE_VOWIFI_11R #define SIR_HAL_AGGR_ADD_TS_REQ (SIR_HAL_ITC_MSG_TYPES_BEGIN + 107) #define SIR_HAL_AGGR_ADD_TS_RSP (SIR_HAL_ITC_MSG_TYPES_BEGIN + 108) #define SIR_HAL_AGGR_QOS_REQ (SIR_HAL_ITC_MSG_TYPES_BEGIN + 109) #define SIR_HAL_AGGR_QOS_RSP (SIR_HAL_ITC_MSG_TYPES_BEGIN + 110) -#endif /* WLAN_FEATURE_VOWIFI_11R */ /* P2P <-> HAL P2P msg */ #define SIR_HAL_SET_P2P_GO_NOA_REQ (SIR_HAL_ITC_MSG_TYPES_BEGIN + 111) @@ -678,9 +676,7 @@ typedef struct sSirMbMsgP2p { #define SIR_LIM_QUIET_BSS_TIMEOUT (SIR_LIM_TIMEOUT_MSG_START + 0x1C) #define SIR_LIM_WPS_OVERLAP_TIMEOUT (SIR_LIM_TIMEOUT_MSG_START + 0x1D) -#ifdef WLAN_FEATURE_VOWIFI_11R #define SIR_LIM_FT_PREAUTH_RSP_TIMEOUT (SIR_LIM_TIMEOUT_MSG_START + 0x1E) -#endif #define SIR_LIM_REMAIN_CHN_TIMEOUT (SIR_LIM_TIMEOUT_MSG_START + 0x1F) #define SIR_LIM_INSERT_SINGLESHOT_NOA_TIMEOUT (SIR_LIM_TIMEOUT_MSG_START + 0x20) diff --git a/core/mac/src/pe/include/lim_ft.h b/core/mac/src/pe/include/lim_ft.h index 9c8dd36a2baf..3f514877282c 100644 --- a/core/mac/src/pe/include/lim_ft.h +++ b/core/mac/src/pe/include/lim_ft.h @@ -25,7 +25,6 @@ * to the Linux Foundation. */ -#if defined WLAN_FEATURE_VOWIFI_11R /**========================================================================= Macros and Function prototypes FT and 802.11R purposes @@ -84,5 +83,3 @@ tSirRetStatus lim_ft_prepare_add_bss_req(tpAniSirGlobal pMac, QDF_STATUS lim_send_preauth_scan_offload(tpAniSirGlobal mac_ctx, uint8_t session_id, tSirFTPreAuthReq *ft_preauth_req); #endif /* __LIMFT_H__ */ - -#endif /* WLAN_FEATURE_VOWIFI_11R */ diff --git a/core/mac/src/pe/include/lim_ft_defs.h b/core/mac/src/pe/include/lim_ft_defs.h index 95dfa3730dfb..476d1d35616c 100644 --- a/core/mac/src/pe/include/lim_ft_defs.h +++ b/core/mac/src/pe/include/lim_ft_defs.h @@ -25,7 +25,6 @@ * to the Linux Foundation. */ -#if defined WLAN_FEATURE_VOWIFI_11R /**========================================================================= Macros and Function prototypes FT and 802.11R purposes @@ -131,5 +130,3 @@ typedef struct sFTPEContext { } tftPEContext, *tpftPEContext; #endif /* __LIMFTDEFS_H__ */ - -#endif /* WLAN_FEATURE_VOWIFI_11R */ diff --git a/core/mac/src/pe/include/lim_global.h b/core/mac/src/pe/include/lim_global.h index 657518f808b7..b61b4d8a7e4f 100644 --- a/core/mac/src/pe/include/lim_global.h +++ b/core/mac/src/pe/include/lim_global.h @@ -165,10 +165,8 @@ typedef enum eLimMlmStates { eLIM_MLM_WT_SET_STA_KEY_STATE, eLIM_MLM_WT_SET_STA_BCASTKEY_STATE, eLIM_MLM_WT_SET_MIMOPS_STATE, -#if defined WLAN_FEATURE_VOWIFI_11R eLIM_MLM_WT_ADD_BSS_RSP_FT_REASSOC_STATE, eLIM_MLM_WT_FT_REASSOC_RSP_STATE, -#endif eLIM_MLM_P2P_LISTEN_STATE, } tLimMlmStates; diff --git a/core/mac/src/pe/include/lim_session.h b/core/mac/src/pe/include/lim_session.h index c7013e18425e..5ff9dd66862e 100644 --- a/core/mac/src/pe/include/lim_session.h +++ b/core/mac/src/pe/include/lim_session.h @@ -192,10 +192,8 @@ typedef struct sPESession /* Added to Support BT-AMP */ uint8_t *assocRsp; /* Used to store association response received while associating */ tAniSirDph dph; void **parsedAssocReq; /* Used to store parsed assoc req from various requesting station */ -#ifdef WLAN_FEATURE_VOWIFI_11R uint32_t RICDataLen; /* Used to store the Ric data received in the assoc response */ uint8_t *ricData; -#endif #ifdef FEATURE_WLAN_ESE uint32_t tspecLen; /* Used to store the TSPEC IEs received in the assoc response */ uint8_t *tspecIes; @@ -281,9 +279,7 @@ typedef struct sPESession /* Added to Support BT-AMP */ int8_t txMgmtPower; #endif -#ifdef WLAN_FEATURE_VOWIFI_11R tAniBool is11Rconnection; -#endif #ifdef FEATURE_WLAN_ESE tAniBool isESEconnection; @@ -447,10 +443,8 @@ typedef struct sPESession /* Added to Support BT-AMP */ bool bRoamSynchInProgress; #endif -#if defined WLAN_FEATURE_VOWIFI_11R /* Fast Transition (FT) */ tftPEContext ftPEContext; -#endif bool isNonRoamReassoc; #ifdef WLAN_FEATURE_11W qdf_mc_timer_t pmfComebackTimer; diff --git a/core/mac/src/pe/lim/lim_aid_mgmt.c b/core/mac/src/pe/lim/lim_aid_mgmt.c index 253543d86b02..f99a8ae25197 100644 --- a/core/mac/src/pe/lim/lim_aid_mgmt.c +++ b/core/mac/src/pe/lim/lim_aid_mgmt.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011-2015 The Linux Foundation. All rights reserved. + * Copyright (c) 2011-2016 The Linux Foundation. All rights reserved. * * Previously licensed under the ISC license by Qualcomm Atheros, Inc. * @@ -43,9 +43,7 @@ #include "sir_params.h" #include "lim_utils.h" #include "lim_timer_utils.h" -#ifdef WLAN_FEATURE_VOWIFI_11R #include "lim_ft_defs.h" -#endif #include "lim_session.h" #include "lim_session_utils.h" diff --git a/core/mac/src/pe/lim/lim_api.c b/core/mac/src/pe/lim/lim_api.c index b8db70abbdec..d875899ac3cb 100644 --- a/core/mac/src/pe/lim/lim_api.c +++ b/core/mac/src/pe/lim/lim_api.c @@ -57,9 +57,7 @@ #include "lim_send_sme_rsp_messages.h" #include "wmm_apsd.h" #include "lim_trace.h" -#ifdef WLAN_FEATURE_VOWIFI_11R #include "lim_ft_defs.h" -#endif #include "lim_session.h" #include "wma_types.h" @@ -713,9 +711,7 @@ void lim_cleanup(tpAniSirGlobal pMac) rrm_cleanup(pMac); #endif -#if defined WLAN_FEATURE_VOWIFI_11R lim_ft_cleanup_all_ft_sessions(pMac); -#endif } /*** end lim_cleanup() ***/ diff --git a/core/mac/src/pe/lim/lim_assoc_utils.c b/core/mac/src/pe/lim/lim_assoc_utils.c index 8d720cb21894..9aa6e118c1fb 100644 --- a/core/mac/src/pe/lim/lim_assoc_utils.c +++ b/core/mac/src/pe/lim/lim_assoc_utils.c @@ -55,9 +55,7 @@ #include "lim_admit_control.h" #include "lim_send_messages.h" #include "lim_ibss_peer_mgmt.h" -#ifdef WLAN_FEATURE_VOWIFI_11R #include "lim_ft_defs.h" -#endif #include "lim_session.h" #include "qdf_types.h" @@ -2783,7 +2781,6 @@ lim_del_sta(tpAniSirGlobal pMac, return retCode; } -#if defined WLAN_FEATURE_VOWIFI_11R /** * lim_add_ft_sta_self()- function to add STA once we have connected with a * new AP @@ -2837,7 +2834,6 @@ tSirRetStatus lim_add_ft_sta_self(tpAniSirGlobal mac_ctx, uint16_t assoc_id, session_entry->ftPEContext.pAddStaReq = NULL; return ret_code; } -#endif /* WLAN_FEATURE_VOWIFI_11R */ /** * lim_add_sta_self() @@ -4223,11 +4219,9 @@ tSirRetStatus lim_sta_send_add_bss(tpAniSirGlobal pMac, tpSirAssocRsp pAssocRsp, pAddBssParams->bSpectrumMgtEnabled = psessionEntry->spectrumMgtEnabled; -#if defined WLAN_FEATURE_VOWIFI_11R pAddBssParams->extSetStaKeyParamValid = 0; lim_log(pMac, LOG2, FL("extSetStaKeyParamValid: %d"), pAddBssParams->extSetStaKeyParamValid); -#endif #ifdef WLAN_FEATURE_11W if (psessionEntry->limRmfEnabled) { @@ -4755,11 +4749,9 @@ tSirRetStatus lim_sta_send_add_bss_pre_assoc(tpAniSirGlobal pMac, uint8_t update pAddBssParams->bSpectrumMgtEnabled = psessionEntry->spectrumMgtEnabled; -#if defined WLAN_FEATURE_VOWIFI_11R pAddBssParams->extSetStaKeyParamValid = 0; lim_log(pMac, LOG2, FL("extSetStaKeyParamValid: %d"), pAddBssParams->extSetStaKeyParamValid); -#endif #ifdef WLAN_FEATURE_11W if (psessionEntry->limRmfEnabled) { diff --git a/core/mac/src/pe/lim/lim_assoc_utils.h b/core/mac/src/pe/lim/lim_assoc_utils.h index 941513b241fd..7686940149c0 100644 --- a/core/mac/src/pe/lim/lim_assoc_utils.h +++ b/core/mac/src/pe/lim/lim_assoc_utils.h @@ -120,10 +120,8 @@ tSirRetStatus lim_populate_matching_rate_set(tpAniSirGlobal, tSirRetStatus lim_add_sta(tpAniSirGlobal, tpDphHashNode, uint8_t, tpPESession); tSirRetStatus lim_del_bss(tpAniSirGlobal, tpDphHashNode, uint16_t, tpPESession); tSirRetStatus lim_del_sta(tpAniSirGlobal, tpDphHashNode, bool, tpPESession); -#ifdef WLAN_FEATURE_VOWIFI_11R tSirRetStatus lim_add_ft_sta_self(tpAniSirGlobal pMac, uint16_t assocId, tpPESession psessionEntry); -#endif /* WLAN_FEATURE_VOWIFI_11R */ tSirRetStatus lim_add_sta_self(tpAniSirGlobal, uint16_t, uint8_t, tpPESession); tStaRateMode lim_get_sta_rate_mode(uint8_t dot11Mode); diff --git a/core/mac/src/pe/lim/lim_ft.c b/core/mac/src/pe/lim/lim_ft.c index 98318ba6124a..82fbd8e5ced0 100644 --- a/core/mac/src/pe/lim/lim_ft.c +++ b/core/mac/src/pe/lim/lim_ft.c @@ -25,7 +25,6 @@ * to the Linux Foundation. */ -#ifdef WLAN_FEATURE_VOWIFI_11R /**========================================================================= \brief implementation for PE 11r VoWiFi FT Protocol @@ -922,9 +921,7 @@ void lim_fill_ft_session(tpAniSirGlobal pMac, pftSessionEntry->limReassocBssPropCap = pftSessionEntry->limCurrentBssPropCap; -#ifdef WLAN_FEATURE_VOWIFI_11R pftSessionEntry->is11Rconnection = psessionEntry->is11Rconnection; -#endif #ifdef FEATURE_WLAN_ESE pftSessionEntry->isESEconnection = psessionEntry->isESEconnection; pftSessionEntry->is_ese_version_ie_present = @@ -1998,4 +1995,3 @@ void lim_preauth_scan_event_handler(tpAniSirGlobal mac_ctx, } } -#endif /* WLAN_FEATURE_VOWIFI_11R */ diff --git a/core/mac/src/pe/lim/lim_ibss_peer_mgmt.c b/core/mac/src/pe/lim/lim_ibss_peer_mgmt.c index a8c26803d40c..cfd4752271cd 100644 --- a/core/mac/src/pe/lim/lim_ibss_peer_mgmt.c +++ b/core/mac/src/pe/lim/lim_ibss_peer_mgmt.c @@ -35,9 +35,7 @@ #include "sch_api.h" /* sch_set_fixed_beacon_fields for IBSS coalesce */ #include "lim_security_utils.h" #include "lim_send_messages.h" -#ifdef WLAN_FEATURE_VOWIFI_11R #include "lim_ft_defs.h" -#endif #include "lim_session.h" #include "lim_ibss_peer_mgmt.h" #include "lim_types.h" diff --git a/core/mac/src/pe/lim/lim_link_monitoring_algo.c b/core/mac/src/pe/lim/lim_link_monitoring_algo.c index 416edf1dd824..07ca20322c8b 100644 --- a/core/mac/src/pe/lim/lim_link_monitoring_algo.c +++ b/core/mac/src/pe/lim/lim_link_monitoring_algo.c @@ -51,9 +51,7 @@ #ifdef FEATURE_WLAN_DIAG_SUPPORT_LIM /* FEATURE_WLAN_DIAG_SUPPORT */ #include "host_diag_core_log.h" #endif /* FEATURE_WLAN_DIAG_SUPPORT */ -#ifdef WLAN_FEATURE_VOWIFI_11R #include "lim_ft_defs.h" -#endif #include "lim_session.h" #include "lim_ser_des_utils.h" diff --git a/core/mac/src/pe/lim/lim_process_assoc_rsp_frame.c b/core/mac/src/pe/lim/lim_process_assoc_rsp_frame.c index 510e3f2da3f2..8faefd1cf15f 100644 --- a/core/mac/src/pe/lim/lim_process_assoc_rsp_frame.c +++ b/core/mac/src/pe/lim/lim_process_assoc_rsp_frame.c @@ -363,7 +363,6 @@ void lim_update_re_assoc_globals(tpAniSirGlobal pMac, tpSirAssocRsp pAssocRsp, psessionEntry->limMlmState)); } -#ifdef WLAN_FEATURE_VOWIFI_11R /** * lim_update_ric_data() - update session with ric data * @mac_ctx: Pointer to Global MAC structure @@ -409,7 +408,6 @@ static void lim_update_ric_data(tpAniSirGlobal mac_ctx, } return; } -#endif #ifdef FEATURE_WLAN_ESE @@ -761,9 +759,7 @@ lim_process_assoc_rsp_frame(tpAniSirGlobal mac_ctx, session_entry->assocRspLen = frame_len; } -#ifdef WLAN_FEATURE_VOWIFI_11R lim_update_ric_data(mac_ctx, session_entry, assoc_rsp); -#endif #ifdef WLAN_FEATURE_ROAM_OFFLOAD roam_session = @@ -1106,12 +1102,9 @@ lim_process_assoc_rsp_frame(tpAniSirGlobal mac_ctx, assocReject: if ((subtype == LIM_ASSOC) -#ifdef WLAN_FEATURE_VOWIFI_11R || ((subtype == LIM_REASSOC) && (session_entry->limMlmState == - eLIM_MLM_WT_FT_REASSOC_RSP_STATE)) -#endif - ) { + eLIM_MLM_WT_FT_REASSOC_RSP_STATE))) { lim_log(mac_ctx, LOGE, FL("Assoc Rejected by the peer. " "mlmestate: %d sessionid %d Reason: %d MACADDR:" MAC_ADDRESS_STR), @@ -1129,14 +1122,11 @@ assocReject: if (subtype == LIM_ASSOC) { lim_post_sme_message(mac_ctx, LIM_MLM_ASSOC_CNF, (uint32_t *) &assoc_cnf); - } -#ifdef WLAN_FEATURE_VOWIFI_11R - else { + } else { assoc_cnf.resultCode = eSIR_SME_FT_REASSOC_FAILURE; lim_post_sme_message(mac_ctx, LIM_MLM_REASSOC_CNF, (uint32_t *)&assoc_cnf); } -#endif } else { lim_restore_pre_reassoc_state(mac_ctx, eSIR_SME_REASSOC_REFUSED, diff --git a/core/mac/src/pe/lim/lim_process_auth_frame.c b/core/mac/src/pe/lim/lim_process_auth_frame.c index 41b4c9cf44a7..ce612bf9d716 100644 --- a/core/mac/src/pe/lim/lim_process_auth_frame.c +++ b/core/mac/src/pe/lim/lim_process_auth_frame.c @@ -48,9 +48,7 @@ #include "lim_assoc_utils.h" #include "lim_security_utils.h" #include "lim_ser_des_utils.h" -#ifdef WLAN_FEATURE_VOWIFI_11R #include "lim_ft.h" -#endif #include "cds_utils.h" /** @@ -512,7 +510,6 @@ static void lim_process_auth_frame_type2(tpAniSirGlobal mac_ctx, /* AuthFrame 2 */ if (pe_session->limMlmState != eLIM_MLM_WT_AUTH_FRAME2_STATE) { -#ifdef WLAN_FEATURE_VOWIFI_11R /** * Check if a Reassociation is in progress and this is a * Pre-Auth frame @@ -540,9 +537,7 @@ static void lim_process_auth_frame_type2(tpAniSirGlobal mac_ctx, pe_session->ftPEContext.saved_auth_rsp_length = frame_len; } - } else -#endif - { + } else { /* * Received Auth frame2 in an unexpected state. * Log error and ignore the frame. @@ -1362,8 +1357,6 @@ lim_process_auth_frame(tpAniSirGlobal mac_ctx, uint8_t *rx_pkt_info, } } -#ifdef WLAN_FEATURE_VOWIFI_11R - /*---------------------------------------------------------------------- * * Pass the received Auth frame. This is possibly the pre-auth from the @@ -1529,5 +1522,3 @@ tSirRetStatus lim_process_auth_frame_no_session(tpAniSirGlobal pMac, uint8_t *pB return ret_status; } - -#endif /* WLAN_FEATURE_VOWIFI_11R */ diff --git a/core/mac/src/pe/lim/lim_process_message_queue.c b/core/mac/src/pe/lim/lim_process_message_queue.c index 0e715472ff84..fcbcdccffe86 100644 --- a/core/mac/src/pe/lim/lim_process_message_queue.c +++ b/core/mac/src/pe/lim/lim_process_message_queue.c @@ -51,9 +51,7 @@ #include "lim_admit_control.h" #include "lim_ibss_peer_mgmt.h" #include "sch_api.h" -#ifdef WLAN_FEATURE_VOWIFI_11R #include "lim_ft_defs.h" -#endif #include "lim_session.h" #include "lim_send_messages.h" @@ -61,9 +59,7 @@ #include "rrm_api.h" #endif -#if defined WLAN_FEATURE_VOWIFI_11R #include "lim_ft.h" -#endif #include "qdf_types.h" #include "cds_packet.h" @@ -813,7 +809,6 @@ lim_handle80211_frames(tpAniSirGlobal pMac, tpSirMsgQ limMsg, uint8_t *pDeferMsg psessionEntry = pe_find_session_by_bssid(pMac, pHdr->bssId, &sessionId); if (psessionEntry == NULL) { -#ifdef WLAN_FEATURE_VOWIFI_11R if (fc.subType == SIR_MAC_MGMT_AUTH) { lim_log(pMac, LOG1, FL("ProtVersion %d, Type %d, Subtype %d rateIndex=%d"), @@ -826,7 +821,6 @@ lim_handle80211_frames(tpAniSirGlobal pMac, tpSirMsgQ limMsg, uint8_t *pDeferMsg goto end; } } -#endif /* Public action frame can be received from non-assoc stations*/ if ((fc.subType != SIR_MAC_MGMT_PROBE_RSP) && (fc.subType != SIR_MAC_MGMT_BEACON) && @@ -1353,11 +1347,9 @@ void lim_process_messages(tpAniSirGlobal mac_ctx, tpSirMsgQ msg) #if defined FEATURE_WLAN_ESE case eWNI_SME_ESE_ADJACENT_AP_REPORT: #endif -#ifdef WLAN_FEATURE_VOWIFI_11R case eWNI_SME_FT_UPDATE_KEY: case eWNI_SME_FT_PRE_AUTH_REQ: case eWNI_SME_FT_AGGR_QOS_REQ: -#endif case eWNI_SME_REGISTER_MGMT_FRAME_REQ: case eWNI_SME_UPDATE_NOA: case eWNI_SME_CLEAR_DFS_CHANNEL_LIST: @@ -1532,9 +1524,7 @@ void lim_process_messages(tpAniSirGlobal mac_ctx, tpSirMsgQ msg) case SIR_LIM_AUTH_RSP_TIMEOUT: case SIR_LIM_ASSOC_FAIL_TIMEOUT: case SIR_LIM_REASSOC_FAIL_TIMEOUT: -#ifdef WLAN_FEATURE_VOWIFI_11R case SIR_LIM_FT_PREAUTH_RSP_TIMEOUT: -#endif case SIR_LIM_REMAIN_CHN_TIMEOUT: case SIR_LIM_INSERT_SINGLESHOT_NOA_TIMEOUT: case SIR_LIM_DISASSOC_ACK_TIMEOUT: @@ -1655,14 +1645,11 @@ void lim_process_messages(tpAniSirGlobal mac_ctx, tpSirMsgQ msg) qdf_mem_free((void *)(msg->bodyptr)); msg->bodyptr = NULL; break; -#ifdef WLAN_FEATURE_VOWIFI_11R case WMA_AGGR_QOS_RSP: lim_process_ft_aggr_qo_s_rsp(mac_ctx, msg); break; -#endif case WMA_SET_LINK_STATE_RSP: link_state_param = (tLinkStateParams *) msg->bodyptr; -#if defined WLAN_FEATURE_VOWIFI_11R session_entry = link_state_param->session; if (link_state_param->ft #if defined WLAN_FEATURE_ROAM_OFFLOAD @@ -1672,7 +1659,6 @@ void lim_process_messages(tpAniSirGlobal mac_ctx, tpSirMsgQ msg) lim_send_reassoc_req_with_ft_ies_mgmt_frame(mac_ctx, session_entry->pLimMlmReassocReq, session_entry); -#endif if (link_state_param->callback) link_state_param->callback(mac_ctx, link_state_param->callbackArg, diff --git a/core/mac/src/pe/lim/lim_process_mlm_req_messages.c b/core/mac/src/pe/lim/lim_process_mlm_req_messages.c index c26903d8ec68..ebb7f272940d 100644 --- a/core/mac/src/pe/lim/lim_process_mlm_req_messages.c +++ b/core/mac/src/pe/lim/lim_process_mlm_req_messages.c @@ -41,9 +41,7 @@ #include "lim_send_messages.h" #include "lim_send_messages.h" #include "lim_session_utils.h" -#ifdef WLAN_FEATURE_VOWIFI_11R #include -#endif #ifdef FEATURE_WLAN_DIAG_SUPPORT_LIM #include "host_diag_core_log.h" #endif @@ -138,11 +136,9 @@ void lim_process_mlm_req_messages(tpAniSirGlobal mac_ctx, tpSirMsgQ msg) case SIR_LIM_ASSOC_FAIL_TIMEOUT: lim_process_assoc_failure_timeout(mac_ctx, msg->bodyval); break; -#ifdef WLAN_FEATURE_VOWIFI_11R case SIR_LIM_FT_PREAUTH_RSP_TIMEOUT: lim_process_ft_preauth_rsp_timeout(mac_ctx); break; -#endif case SIR_LIM_REMAIN_CHN_TIMEOUT: lim_process_remain_on_chn_timeout(mac_ctx); break; @@ -687,9 +683,7 @@ lim_mlm_add_bss(tpAniSirGlobal mac_ctx, addbss_param->bSpectrumMgtEnabled = session->spectrumMgtEnabled || lim_isconnected_on_dfs_channel(mlm_start_req->channelNumber); -#if defined WLAN_FEATURE_VOWIFI_11R addbss_param->extSetStaKeyParamValid = 0; -#endif addbss_param->dot11_mode = session->dot11mode; addbss_param->nss = session->nss; diff --git a/core/mac/src/pe/lim/lim_process_mlm_rsp_messages.c b/core/mac/src/pe/lim/lim_process_mlm_rsp_messages.c index 8cc9c9371d2e..21afe39e39be 100644 --- a/core/mac/src/pe/lim/lim_process_mlm_rsp_messages.c +++ b/core/mac/src/pe/lim/lim_process_mlm_rsp_messages.c @@ -40,10 +40,8 @@ #include "lim_admit_control.h" #include "lim_send_messages.h" #include "lim_ibss_peer_mgmt.h" -#ifdef WLAN_FEATURE_VOWIFI_11R #include "lim_ft.h" #include "lim_ft_defs.h" -#endif #include "lim_session.h" #include "lim_session_utils.h" #if defined WLAN_FEATURE_VOWIFI @@ -1756,7 +1754,6 @@ void lim_process_sta_mlm_add_sta_rsp(tpAniSirGlobal mac_ctx, goto end; } if (session_entry->limSmeState == eLIM_SME_WT_REASSOC_STATE) { -#ifdef WLAN_FEATURE_VOWIFI_11R /* check if we have keys(PTK)to install in case of 11r */ tpftPEContext ft_ctx = &session_entry->ftPEContext; ft_session = pe_find_session_by_bssid(mac_ctx, @@ -1771,7 +1768,6 @@ void lim_process_sta_mlm_add_sta_rsp(tpAniSirGlobal mac_ctx, ft_ctx->PreAuthKeyInfo.extSetStaKeyParamValid = false; } -#endif } /* * Update the DPH Hash Entry for this STA @@ -2660,7 +2656,6 @@ joinFailure: } -#ifdef WLAN_FEATURE_VOWIFI_11R /*------------------------------------------------------------------------------------------ * * Function to handle WMA_ADD_BSS_RSP, in FT reassoc state. @@ -2910,7 +2905,7 @@ end: lim_post_sme_message(pMac, LIM_MLM_REASSOC_CNF, (uint32_t *) &mlmReassocCnf); } -#endif /* WLAN_FEATURE_VOWIFI_11R */ + /** * lim_process_sta_mlm_add_bss_rsp() - Process ADD BSS response * @mac_ctx: Pointer to Global MAC structure diff --git a/core/mac/src/pe/lim/lim_process_probe_req_frame.c b/core/mac/src/pe/lim/lim_process_probe_req_frame.c index 91b887da46f4..da973a0cf4fd 100644 --- a/core/mac/src/pe/lim/lim_process_probe_req_frame.c +++ b/core/mac/src/pe/lim/lim_process_probe_req_frame.c @@ -46,9 +46,7 @@ #include "lim_assoc_utils.h" #include "lim_ser_des_utils.h" #include "parser_api.h" -#ifdef WLAN_FEATURE_VOWIFI_11R #include "lim_ft_defs.h" -#endif #include "lim_session.h" void diff --git a/core/mac/src/pe/lim/lim_process_sme_req_messages.c b/core/mac/src/pe/lim/lim_process_sme_req_messages.c index e588228df023..f84cbfdf5ffa 100644 --- a/core/mac/src/pe/lim/lim_process_sme_req_messages.c +++ b/core/mac/src/pe/lim/lim_process_sme_req_messages.c @@ -61,9 +61,7 @@ #include "sap_api.h" -#if defined WLAN_FEATURE_VOWIFI_11R #include -#endif #include "cds_regdomain_common.h" /* @@ -1799,9 +1797,7 @@ __lim_process_sme_join_req(tpAniSirGlobal mac_ctx, uint32_t *msg_buf) * which inturn is dependent on the profile the user wants * to connect to, So input is coming from supplicant */ -#ifdef WLAN_FEATURE_VOWIFI_11R session->is11Rconnection = sme_join_req->is11Rconnection; -#endif #ifdef FEATURE_WLAN_ESE session->isESEconnection = sme_join_req->isESEconnection; #endif @@ -2671,10 +2667,8 @@ static void __lim_process_sme_disassoc_cnf(tpAniSirGlobal pMac, uint32_t *pMsgBu return; } -#if defined WLAN_FEATURE_VOWIFI_11R /* Delete FT session if there exists one */ lim_ft_cleanup_pre_auth_info(pMac, psessionEntry); -#endif lim_cleanup_rx_path(pMac, pStaDs, psessionEntry); lim_clean_up_disassoc_deauth_req(pMac, @@ -4866,7 +4860,6 @@ bool lim_process_sme_req_messages(tpAniSirGlobal pMac, tpSirMsgQ pMsg) break; #endif -#if defined WLAN_FEATURE_VOWIFI_11R case eWNI_SME_FT_PRE_AUTH_REQ: bufConsumed = (bool) lim_process_ft_pre_auth_req(pMac, pMsg); break; @@ -4877,7 +4870,6 @@ bool lim_process_sme_req_messages(tpAniSirGlobal pMac, tpSirMsgQ pMsg) case eWNI_SME_FT_AGGR_QOS_REQ: lim_process_ft_aggr_qos_req(pMac, pMsgBuf); break; -#endif case eWNI_SME_REGISTER_MGMT_FRAME_REQ: __lim_process_sme_register_mgmt_frame_req(pMac, pMsgBuf); diff --git a/core/mac/src/pe/lim/lim_prop_exts_utils.c b/core/mac/src/pe/lim/lim_prop_exts_utils.c index 7f966339d55e..3c8ddf4bf321 100644 --- a/core/mac/src/pe/lim/lim_prop_exts_utils.c +++ b/core/mac/src/pe/lim/lim_prop_exts_utils.c @@ -51,9 +51,7 @@ #include "lim_prop_exts_utils.h" #include "lim_ser_des_utils.h" #include "lim_trace.h" -#ifdef WLAN_FEATURE_VOWIFI_11R #include "lim_ft_defs.h" -#endif #include "lim_session.h" #include "wma.h" diff --git a/core/mac/src/pe/lim/lim_scan_result_utils.c b/core/mac/src/pe/lim/lim_scan_result_utils.c index e8a68131d938..0794cc40aa1d 100644 --- a/core/mac/src/pe/lim/lim_scan_result_utils.c +++ b/core/mac/src/pe/lim/lim_scan_result_utils.c @@ -39,9 +39,7 @@ #include "lim_utils.h" #include "lim_ser_des_utils.h" #include "lim_api.h" -#ifdef WLAN_FEATURE_VOWIFI_11R #include "lim_ft_defs.h" -#endif #include "lim_session.h" #if defined WLAN_FEATURE_VOWIFI #include "rrm_api.h" @@ -202,7 +200,6 @@ lim_collect_bss_description(tpAniSirGlobal pMac, } #endif -#ifdef WLAN_FEATURE_VOWIFI_11R /* MobilityDomain */ pBssDescr->mdie[0] = 0; pBssDescr->mdie[1] = 0; @@ -216,7 +213,6 @@ lim_collect_bss_description(tpAniSirGlobal pMac, pBssDescr->mdie[1] = pBPR->mdie[1]; pBssDescr->mdie[2] = pBPR->mdie[2]; } -#endif #ifdef FEATURE_WLAN_ESE pBssDescr->QBSSLoad_present = false; diff --git a/core/mac/src/pe/lim/lim_security_utils.c b/core/mac/src/pe/lim/lim_security_utils.c index 2283bf755b3a..77edf9ff2842 100644 --- a/core/mac/src/pe/lim/lim_security_utils.c +++ b/core/mac/src/pe/lim/lim_security_utils.c @@ -46,9 +46,7 @@ #include "utils_api.h" #include "lim_utils.h" #include "lim_security_utils.h" -#ifdef WLAN_FEATURE_VOWIFI_11R #include "lim_ft_defs.h" -#endif #include "lim_session.h" #define LIM_SEED_LENGTH 16 diff --git a/core/mac/src/pe/lim/lim_send_management_frames.c b/core/mac/src/pe/lim/lim_send_management_frames.c index 52220506ebcd..7be4311fc1ce 100644 --- a/core/mac/src/pe/lim/lim_send_management_frames.c +++ b/core/mac/src/pe/lim/lim_send_management_frames.c @@ -52,9 +52,7 @@ #include "wni_cfg.h" #endif -#ifdef WLAN_FEATURE_VOWIFI_11R #include "lim_ft_defs.h" -#endif #include "lim_session.h" #include "qdf_types.h" #include "qdf_trace.h" @@ -1809,7 +1807,6 @@ lim_send_assoc_req_mgmt_frame(tpAniSirGlobal mac_ctx, populate_dot11f_ext_cap(mac_ctx, vht_enabled, &frm->ExtCap, pe_session); -#if defined WLAN_FEATURE_VOWIFI_11R if (pe_session->pLimJoinReq->is11Rconnection) { tSirBssDescription *bssdescr; @@ -1824,7 +1821,6 @@ lim_send_assoc_req_mgmt_frame(tpAniSirGlobal mac_ctx, /* No 11r IEs dont send any MDIE */ lim_log(mac_ctx, LOG1, FL("MDIE not present")); } -#endif #ifdef FEATURE_WLAN_ESE /* @@ -2215,7 +2211,6 @@ lim_send_reassoc_req_with_ft_ies_mgmt_frame(tpAniSirGlobal mac_ctx, mac_ctx->lim.htCapabilityPresentInBeacon) { populate_dot11f_ht_caps(mac_ctx, pe_session, &frm.HTCaps); } -#if defined WLAN_FEATURE_VOWIFI_11R if (pe_session->pLimReAssocReq->bssDescription.mdiePresent && (ft_sme_context->addMDIE == true) #if defined FEATURE_WLAN_ESE @@ -2225,7 +2220,6 @@ lim_send_reassoc_req_with_ft_ies_mgmt_frame(tpAniSirGlobal mac_ctx, populate_mdie(mac_ctx, &frm.MobilityDomain, pe_session->pLimReAssocReq->bssDescription.mdie); } -#endif #ifdef WLAN_FEATURE_11AC if (pe_session->vhtCapability && @@ -2270,10 +2264,8 @@ lim_send_reassoc_req_with_ft_ies_mgmt_frame(tpAniSirGlobal mac_ctx, lim_log(mac_ctx, LOG1, FL("FT IE Reassoc Req (%d)."), ft_sme_context->reassoc_ft_ies_length); -#if defined WLAN_FEATURE_VOWIFI_11R if (pe_session->is11Rconnection) ft_ies_length = ft_sme_context->reassoc_ft_ies_length; -#endif qdf_status = cds_packet_alloc((uint16_t) bytes + ft_ies_length, (void **)&frame, (void **)&packet); @@ -2801,7 +2793,6 @@ lim_send_auth_mgmt_frame(tpAniSirGlobal mac_ctx, SIR_MAC_AUTH_CHALLENGE_OFFSET; body_len = SIR_MAC_AUTH_CHALLENGE_OFFSET; -#if defined WLAN_FEATURE_VOWIFI_11R if (auth_frame->authAlgoNumber == eSIR_FT_AUTH) { if (NULL != session->ftPEContext.pFTPreAuthReq && 0 != session->ftPEContext.pFTPreAuthReq-> @@ -2818,7 +2809,6 @@ lim_send_auth_mgmt_frame(tpAniSirGlobal mac_ctx, frame_len += (2 + SIR_MDIE_SIZE); } } -#endif break; case SIR_MAC_AUTH_FRAME_2: @@ -2960,7 +2950,6 @@ lim_send_auth_mgmt_frame(tpAniSirGlobal mac_ctx, qdf_mem_copy(body, (uint8_t *) &auth_frame->type, body_len); -#if defined WLAN_FEATURE_VOWIFI_11R if ((auth_frame->authAlgoNumber == eSIR_FT_AUTH) && (auth_frame->authTransactionSeqNumber == SIR_MAC_AUTH_FRAME_1) && @@ -2989,7 +2978,6 @@ lim_send_auth_mgmt_frame(tpAniSirGlobal mac_ctx, SIR_MDIE_SIZE); } } -#endif lim_log(mac_ctx, LOG1, FL("*** Sending Auth seq# %d status %d (%d) to " @@ -3073,39 +3061,38 @@ QDF_STATUS lim_send_deauth_cnf(tpAniSirGlobal pMac) /* / Receive path cleanup with dummy packet */ lim_ft_cleanup_pre_auth_info(pMac, psessionEntry); lim_cleanup_rx_path(pMac, pStaDs, psessionEntry); -#ifdef WLAN_FEATURE_VOWIFI_11R - if ((psessionEntry->limSystemRole == eLIM_STA_ROLE) && - ( + if ((psessionEntry->limSystemRole == eLIM_STA_ROLE) && + ( #ifdef FEATURE_WLAN_ESE - (psessionEntry->isESEconnection) || + (psessionEntry->isESEconnection) || #endif - (psessionEntry->isFastRoamIniFeatureEnabled) || - (psessionEntry->is11Rconnection))) { - PELOGE(lim_log(pMac, LOGE, - FL("FT Preauth Session (%p,%d) Cleanup Deauth reason %d Trigger = %d"), - psessionEntry, psessionEntry->peSessionId, + (psessionEntry->isFastRoamIniFeatureEnabled) || + (psessionEntry->is11Rconnection))) { + lim_log(pMac, LOGE, + FL("FT Preauth (%p,%d) Deauth rc %d src = %d"), + psessionEntry, + psessionEntry->peSessionId, + pMlmDeauthReq->reasonCode, + pMlmDeauthReq->deauthTrigger); + lim_ft_cleanup(pMac, psessionEntry); + } else { + lim_log(pMac, LOGE, + FL("No FT Preauth Session Cleanup in role %d" +#ifdef FEATURE_WLAN_ESE + " isESE %d" +#endif + " isLFR %d" + " is11r %d, Deauth reason %d Trigger = %d"), + psessionEntry->limSystemRole, +#ifdef FEATURE_WLAN_ESE + psessionEntry->isESEconnection, +#endif + psessionEntry->isFastRoamIniFeatureEnabled, + psessionEntry->is11Rconnection, pMlmDeauthReq->reasonCode, - pMlmDeauthReq->deauthTrigger);); - lim_ft_cleanup(pMac, psessionEntry); - } else { - PELOGE(lim_log(pMac, LOGE, - FL("No FT Preauth Session Cleanup in role %d" -#ifdef FEATURE_WLAN_ESE - " isESE %d" -#endif - " isLFR %d" - " is11r %d, Deauth reason %d Trigger = %d"), - psessionEntry->limSystemRole, -#ifdef FEATURE_WLAN_ESE - psessionEntry->isESEconnection, -#endif - psessionEntry->isFastRoamIniFeatureEnabled, - psessionEntry->is11Rconnection, - pMlmDeauthReq->reasonCode, - pMlmDeauthReq->deauthTrigger);); - } -#endif - /* / Free up buffer allocated for mlmDeauthReq */ + pMlmDeauthReq->deauthTrigger); + } + /* Free up buffer allocated for mlmDeauthReq */ qdf_mem_free(pMlmDeauthReq); pMac->lim.limDisassocDeauthCnfReq.pMlmDeauthReq = NULL; } @@ -3178,7 +3165,6 @@ QDF_STATUS lim_send_disassoc_cnf(tpAniSirGlobal mac_ctx) lim_log(mac_ctx, LOGE, FL("cleanup_rx_path error")); goto end; } -#ifdef WLAN_FEATURE_VOWIFI_11R if (LIM_IS_STA_ROLE(pe_session) && ( #ifdef FEATURE_WLAN_ESE (pe_session->isESEconnection) || @@ -3191,10 +3177,8 @@ QDF_STATUS lim_send_disassoc_cnf(tpAniSirGlobal mac_ctx) FL("FT Preauth Session (%p,%d) Clean up"), pe_session, pe_session->peSessionId); -#if defined WLAN_FEATURE_VOWIFI_11R /* Delete FT session if there exists one */ lim_ft_cleanup_pre_auth_info(mac_ctx, pe_session); -#endif } else { lim_log(mac_ctx, LOGE, FL("No FT Preauth Session Clean up in role %d" @@ -3211,7 +3195,6 @@ QDF_STATUS lim_send_disassoc_cnf(tpAniSirGlobal mac_ctx) pe_session->is11Rconnection, disassoc_req->reasonCode); } -#endif /* Free up buffer allocated for mlmDisassocReq */ qdf_mem_free(disassoc_req); mac_ctx->lim.limDisassocDeauthCnfReq.pMlmDisassocReq = NULL; diff --git a/core/mac/src/pe/lim/lim_send_messages.c b/core/mac/src/pe/lim/lim_send_messages.c index ad53515619b5..c4fcff20d216 100644 --- a/core/mac/src/pe/lim/lim_send_messages.c +++ b/core/mac/src/pe/lim/lim_send_messages.c @@ -527,7 +527,6 @@ tSirRetStatus lim_set_link_state(tpAniSirGlobal pMac, tSirLinkState state, return retCode; } -#ifdef WLAN_FEATURE_VOWIFI_11R extern tSirRetStatus lim_set_link_state_ft(tpAniSirGlobal pMac, tSirLinkState state, tSirMacAddr bssId, tSirMacAddr selfMacAddr, int ft, @@ -573,7 +572,6 @@ extern tSirRetStatus lim_set_link_state_ft(tpAniSirGlobal pMac, tSirLinkState } return retCode; } -#endif /** --------------------------------------------------------- \fn lim_send_beacon_filter_info diff --git a/core/mac/src/pe/lim/lim_send_messages.h b/core/mac/src/pe/lim/lim_send_messages.h index e8b4665a2962..9cf863df5361 100644 --- a/core/mac/src/pe/lim/lim_send_messages.h +++ b/core/mac/src/pe/lim/lim_send_messages.h @@ -89,12 +89,10 @@ tSirRetStatus lim_set_link_state(tpAniSirGlobal pMac, tSirLinkState state, tSirMacAddr bssId, tSirMacAddr selfMac, tpSetLinkStateCallback callback, void *callbackArg); -#ifdef WLAN_FEATURE_VOWIFI_11R extern tSirRetStatus lim_set_link_state_ft(tpAniSirGlobal pMac, tSirLinkState state, tSirMacAddr bssId, tSirMacAddr selfMacAddr, int ft, tpPESession psessionEntry); -#endif void lim_set_active_edca_params(tpAniSirGlobal pMac, tSirMacEdcaParamRecord *plocalEdcaParams, tpPESession psessionEntry); diff --git a/core/mac/src/pe/lim/lim_send_sme_rsp_messages.c b/core/mac/src/pe/lim/lim_send_sme_rsp_messages.c index 02b4329ead73..580d40bc5768 100644 --- a/core/mac/src/pe/lim/lim_send_sme_rsp_messages.c +++ b/core/mac/src/pe/lim/lim_send_sme_rsp_messages.c @@ -301,7 +301,6 @@ static void lim_handle_join_rsp_status(tpAniSirGlobal mac_ctx, session_entry->assocRsp = NULL; session_entry->assocRspLen = 0; } -#ifdef WLAN_FEATURE_VOWIFI_11R if (session_entry->ricData != NULL) { sme_join_rsp->parsedRicRspLen = session_entry->RICDataLen; @@ -317,7 +316,6 @@ static void lim_handle_join_rsp_status(tpAniSirGlobal mac_ctx, lim_log(mac_ctx, LOG1, FL("RicLength=%d"), sme_join_rsp->parsedRicRspLen); } -#endif #ifdef FEATURE_WLAN_ESE if (session_entry->tspecIes != NULL) { sme_join_rsp->tspecIeLen = @@ -379,13 +377,11 @@ static void lim_handle_join_rsp_status(tpAniSirGlobal mac_ctx, session_entry->assocRsp = NULL; session_entry->assocRspLen = 0; } -#ifdef WLAN_FEATURE_VOWIFI_11R if (session_entry->ricData != NULL) { qdf_mem_free(session_entry->ricData); session_entry->ricData = NULL; session_entry->RICDataLen = 0; } -#endif #ifdef FEATURE_WLAN_ESE if (session_entry->tspecIes != NULL) { qdf_mem_free(session_entry->tspecIes); @@ -450,9 +446,7 @@ lim_send_sme_join_reassoc_rsp(tpAniSirGlobal mac_ctx, uint16_t msg_type, } else { rsp_len = session_entry->assocReqLen + session_entry->assocRspLen + session_entry->bcnLen + -#ifdef WLAN_FEATURE_VOWIFI_11R session_entry->RICDataLen + -#endif #ifdef FEATURE_WLAN_ESE session_entry->tspecLen + #endif @@ -494,9 +488,7 @@ lim_send_sme_join_reassoc_rsp(tpAniSirGlobal mac_ctx, uint16_t msg_type, sme_join_rsp->beaconLength = 0; sme_join_rsp->assocReqLength = 0; sme_join_rsp->assocRspLength = 0; -#ifdef WLAN_FEATURE_VOWIFI_11R sme_join_rsp->parsedRicRspLen = 0; -#endif #ifdef FEATURE_WLAN_ESE sme_join_rsp->tspecIeLen = 0; #endif @@ -2245,7 +2237,6 @@ void lim_handle_delete_bss_rsp(tpAniSirGlobal pMac, tpSirMsgQ MsgQ) } -#ifdef WLAN_FEATURE_VOWIFI_11R /** ----------------------------------------------------------------- \brief lim_send_sme_aggr_qos_rsp() - sends SME FT AGGR QOS RSP \ This function sends a eWNI_SME_FT_AGGR_QOS_RSP to SME. @@ -2270,7 +2261,6 @@ lim_send_sme_aggr_qos_rsp(tpAniSirGlobal pMac, tpSirAggrQosRsp aggrQosRsp, return; } -#endif void lim_send_sme_max_assoc_exceeded_ntf(tpAniSirGlobal pMac, tSirMacAddr peerMacAddr, uint8_t smesessionId) diff --git a/core/mac/src/pe/lim/lim_send_sme_rsp_messages.h b/core/mac/src/pe/lim/lim_send_sme_rsp_messages.h index 81049bcbfb83..4e94f4246678 100644 --- a/core/mac/src/pe/lim/lim_send_sme_rsp_messages.h +++ b/core/mac/src/pe/lim/lim_send_sme_rsp_messages.h @@ -73,11 +73,9 @@ void lim_send_sme_neighbor_bss_ind(tpAniSirGlobal, tLimScanResultNode *); void lim_handle_delete_bss_rsp(tpAniSirGlobal pMac, tpSirMsgQ MsgQ); void lim_handle_csa_offload_msg(tpAniSirGlobal mac_ctx, tpSirMsgQ msg); -#ifdef WLAN_FEATURE_VOWIFI_11R void lim_send_sme_aggr_qos_rsp(tpAniSirGlobal pMac, tpSirAggrQosRsp aggrQosRsp, uint8_t smesessionId); -#endif /*WLAN_FEATURE_VOWIFI_11R */ void lim_send_sme_addts_rsp(tpAniSirGlobal pMac, uint8_t rspReqd, uint32_t status, tpPESession psessionEntry, tSirMacTspecIE tspec, diff --git a/core/mac/src/pe/lim/lim_session.c b/core/mac/src/pe/lim/lim_session.c index 7d85ec189f26..b24be5489d6c 100644 --- a/core/mac/src/pe/lim/lim_session.c +++ b/core/mac/src/pe/lim/lim_session.c @@ -40,10 +40,8 @@ ------------------------------------------------------------------------*/ #include "ani_global.h" #include "lim_debug.h" -#ifdef WLAN_FEATURE_VOWIFI_11R #include "lim_ft_defs.h" #include "lim_ft.h" -#endif #include "lim_session.h" #include "lim_utils.h" @@ -303,9 +301,7 @@ pe_create_session(tpAniSirGlobal pMac, uint8_t *bssid, uint8_t *sessionId, session_ptr->limSmeState = eLIM_SME_IDLE_STATE; session_ptr->limCurrentAuthType = eSIR_OPEN_SYSTEM; pe_init_beacon_params(pMac, &pMac->lim.gpSession[i]); -#ifdef WLAN_FEATURE_VOWIFI_11R session_ptr->is11Rconnection = false; -#endif #ifdef FEATURE_WLAN_ESE session_ptr->isESEconnection = false; #endif @@ -359,10 +355,8 @@ pe_create_session(tpAniSirGlobal pMac, uint8_t *bssid, uint8_t *sessionId, return NULL; } } -#if defined WLAN_FEATURE_VOWIFI_11R if (eSIR_INFRASTRUCTURE_MODE == bssType) lim_ft_open(pMac, &pMac->lim.gpSession[i]); -#endif if (eSIR_INFRA_AP_MODE == bssType) { session_ptr->old_protection_state = 0; session_ptr->mac_ctx = (void *)pMac; @@ -554,10 +548,8 @@ void pe_delete_session(tpAniSirGlobal mac_ctx, tpPESession session) qdf_mc_timer_destroy(&session->protection_fields_reset_timer); } -#if defined (WLAN_FEATURE_VOWIFI_11R) /* Delete FT related information */ lim_ft_cleanup(mac_ctx, session); -#endif if (session->pLimStartBssReq != NULL) { qdf_mem_free(session->pLimStartBssReq); session->pLimStartBssReq = NULL; diff --git a/core/mac/src/pe/lim/lim_session_utils.c b/core/mac/src/pe/lim/lim_session_utils.c index 49b37a12b8d4..fb9aab1443e2 100644 --- a/core/mac/src/pe/lim/lim_session_utils.c +++ b/core/mac/src/pe/lim/lim_session_utils.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011-2015 The Linux Foundation. All rights reserved. + * Copyright (c) 2011-2016 The Linux Foundation. All rights reserved. * * Previously licensed under the ISC license by Qualcomm Atheros, Inc. * @@ -37,9 +37,7 @@ ------------------------------------------------------------------------*/ #include "ani_global.h" #include "lim_debug.h" -#ifdef WLAN_FEATURE_VOWIFI_11R #include "lim_ft_defs.h" -#endif #include "lim_session.h" #include "lim_session_utils.h" #include "lim_utils.h" diff --git a/core/mac/src/pe/lim/lim_timer_utils.c b/core/mac/src/pe/lim/lim_timer_utils.c index 92fa50434fca..8f3b6605115f 100644 --- a/core/mac/src/pe/lim/lim_timer_utils.c +++ b/core/mac/src/pe/lim/lim_timer_utils.c @@ -325,7 +325,6 @@ uint32_t lim_create_timers(tpAniSirGlobal pMac) lim_log(pMac, LOGP, FL("Cannot create update OLBC cache tmr")); goto err_timer; } -#ifdef WLAN_FEATURE_VOWIFI_11R /* In future we need to use the auth timer, cause the pre auth session * will be introduced before sending Auth frame. We need to go off * channel and come back to home channel @@ -339,7 +338,6 @@ uint32_t lim_create_timers(tpAniSirGlobal pMac) lim_log(pMac, LOGP, FL("could not create Join failure timer")); goto err_timer; } -#endif cfgValue = 1000; cfgValue = SYS_MS_TO_TICKS(cfgValue); if (tx_timer_create(pMac, &pMac->lim.limTimers.gLimRemainOnChannelTimer, @@ -898,7 +896,6 @@ void lim_deactivate_and_change_timer(tpAniSirGlobal pMac, uint32_t timerId) case eLIM_LEARN_DURATION_TIMER: break; -#ifdef WLAN_FEATURE_VOWIFI_11R case eLIM_FT_PREAUTH_RSP_TIMER: if (tx_timer_deactivate (&pMac->lim.limTimers.gLimFTPreAuthRspTimer) != @@ -925,7 +922,7 @@ void lim_deactivate_and_change_timer(tpAniSirGlobal pMac, uint32_t timerId) return; } break; -#endif + case eLIM_REMAIN_CHN_TIMER: if (tx_timer_deactivate (&pMac->lim.limTimers.gLimRemainOnChannelTimer) != diff --git a/core/mac/src/pe/lim/lim_timer_utils.h b/core/mac/src/pe/lim/lim_timer_utils.h index 33b94d5505ee..1f1af1daafb5 100644 --- a/core/mac/src/pe/lim/lim_timer_utils.h +++ b/core/mac/src/pe/lim/lim_timer_utils.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011-2014 The Linux Foundation. All rights reserved. + * Copyright (c) 2011-2014, 2016 The Linux Foundation. All rights reserved. * * Previously licensed under the ISC license by Qualcomm Atheros, Inc. * @@ -60,9 +60,7 @@ enum { eLIM_QUIET_TIMER, eLIM_QUIET_BSS_TIMER, eLIM_WPS_OVERLAP_TIMER, -#ifdef WLAN_FEATURE_VOWIFI_11R eLIM_FT_PREAUTH_RSP_TIMER, -#endif eLIM_REMAIN_CHN_TIMER, eLIM_PERIODIC_PROBE_REQ_TIMER, eLIM_DISASSOC_ACK_TIMER, diff --git a/core/mac/src/pe/lim/lim_trace.c b/core/mac/src/pe/lim/lim_trace.c index 10b8232e37a7..d287ca38ea60 100644 --- a/core/mac/src/pe/lim/lim_trace.c +++ b/core/mac/src/pe/lim/lim_trace.c @@ -71,9 +71,7 @@ static uint8_t *__lim_trace_get_timer_string(uint16_t timerId) CASE_RETURN_STRING(eLIM_QUIET_TIMER); CASE_RETURN_STRING(eLIM_QUIET_BSS_TIMER); CASE_RETURN_STRING(eLIM_WPS_OVERLAP_TIMER); -#ifdef WLAN_FEATURE_VOWIFI_11R CASE_RETURN_STRING(eLIM_FT_PREAUTH_RSP_TIMER); -#endif CASE_RETURN_STRING(eLIM_REMAIN_CHN_TIMER); CASE_RETURN_STRING(eLIM_PERIODIC_PROBE_REQ_TIMER); CASE_RETURN_STRING(eLIM_DISASSOC_ACK_TIMER); diff --git a/core/mac/src/pe/lim/lim_types.h b/core/mac/src/pe/lim/lim_types.h index ed6e61c64ef6..ff0f68a06fd2 100644 --- a/core/mac/src/pe/lim/lim_types.h +++ b/core/mac/src/pe/lim/lim_types.h @@ -434,10 +434,8 @@ void lim_process_probe_req_frame_multiple_bss(tpAniSirGlobal, uint8_t *, /* Process Auth frame when we have a session in progress. */ void lim_process_auth_frame(tpAniSirGlobal, uint8_t *, tpPESession); -#ifdef WLAN_FEATURE_VOWIFI_11R tSirRetStatus lim_process_auth_frame_no_session(tpAniSirGlobal pMac, uint8_t *, void *body); -#endif void lim_process_assoc_req_frame(tpAniSirGlobal, uint8_t *, uint8_t, tpPESession); void lim_send_mlm_assoc_ind(tpAniSirGlobal pMac, tpDphHashNode pStaDs, @@ -462,11 +460,9 @@ void lim_send_auth_mgmt_frame(tpAniSirGlobal, tSirMacAuthFrameBody *, tSirMacAdd void lim_send_assoc_req_mgmt_frame(tpAniSirGlobal, tLimMlmAssocReq *, tpPESession); void lim_send_reassoc_req_mgmt_frame(tpAniSirGlobal, tLimMlmReassocReq *, tpPESession); -#ifdef WLAN_FEATURE_VOWIFI_11R void lim_send_reassoc_req_with_ft_ies_mgmt_frame(tpAniSirGlobal pMac, tLimMlmReassocReq *pMlmReassocReq, tpPESession psessionEntry); -#endif void lim_send_delts_req_action_frame(tpAniSirGlobal pMac, tSirMacAddr peer, uint8_t wmmTspecPresent, tSirMacTSInfo * pTsinfo, @@ -836,11 +832,9 @@ QDF_STATUS lim_disassoc_tx_complete_cnf(tpAniSirGlobal pMac, QDF_STATUS lim_deauth_tx_complete_cnf(tpAniSirGlobal pMac, uint32_t txCompleteSuccess); -#ifdef WLAN_FEATURE_VOWIFI_11R typedef struct sSetLinkCbackParams { void *cbackDataPtr; } tSetLinkCbackParams; -#endif void lim_process_rx_scan_event(tpAniSirGlobal mac, void *buf); diff --git a/core/mac/src/pe/lim/lim_utils.c b/core/mac/src/pe/lim/lim_utils.c index d25964681a97..b36f9e03f6a6 100644 --- a/core/mac/src/pe/lim/lim_utils.c +++ b/core/mac/src/pe/lim/lim_utils.c @@ -53,9 +53,7 @@ #endif /* FEATURE_WLAN_DIAG_SUPPORT */ #include "lim_ibss_peer_mgmt.h" #include "lim_session_utils.h" -#ifdef WLAN_FEATURE_VOWIFI_11R #include "lim_ft_defs.h" -#endif #include "lim_session.h" #include "cds_reg_service.h" @@ -378,11 +376,8 @@ char *lim_msg_str(uint32_t msgType) return "SIR_LIM_CNF_WAIT_TIMEOUT"; case SIR_LIM_RADAR_DETECT_IND: return "SIR_LIM_RADAR_DETECT_IND"; -#ifdef WLAN_FEATURE_VOWIFI_11R case SIR_LIM_FT_PREAUTH_RSP_TIMEOUT: return "SIR_LIM_FT_PREAUTH_RSP_TIMEOUT"; -#endif - case WNI_CFG_PARAM_UPDATE_IND: return "WNI_CFG_PARAM_UPDATE_IND"; case WNI_CFG_DNLD_REQ: @@ -699,11 +694,9 @@ void lim_cleanup_mlm(tpAniSirGlobal mac_ctx) tx_timer_deactivate(&lim_timer->gLimPreAuthClnupTimer); tx_timer_delete(&lim_timer->gLimPreAuthClnupTimer); -#ifdef WLAN_FEATURE_VOWIFI_11R /* Deactivate and delete FT Preauth response timer */ tx_timer_deactivate(&lim_timer->gLimFTPreAuthRspTimer); tx_timer_delete(&lim_timer->gLimFTPreAuthRspTimer); -#endif /* Deactivate and delete remain on channel timer */ tx_timer_deactivate(&lim_timer->gLimRemainOnChannelTimer); diff --git a/core/mac/src/sys/legacy/src/utils/src/mac_trace.c b/core/mac/src/sys/legacy/src/utils/src/mac_trace.c index 92c4280d8988..63a4c648f6ee 100644 --- a/core/mac/src/sys/legacy/src/utils/src/mac_trace.c +++ b/core/mac/src/sys/legacy/src/utils/src/mac_trace.c @@ -64,10 +64,8 @@ uint8_t *mac_trace_get_neighbour_roam_state(uint16_t neighbourroamstate) CASE_RETURN_STRING(eCSR_NEIGHBOR_ROAM_STATE_INIT); CASE_RETURN_STRING(eCSR_NEIGHBOR_ROAM_STATE_CONNECTED); CASE_RETURN_STRING(eCSR_NEIGHBOR_ROAM_STATE_REASSOCIATING); -#ifdef WLAN_FEATURE_VOWIFI_11R CASE_RETURN_STRING(eCSR_NEIGHBOR_ROAM_STATE_PREAUTHENTICATING); CASE_RETURN_STRING(eCSR_NEIGHBOR_ROAM_STATE_PREAUTH_DONE); -#endif /* WLAN_FEATURE_VOWIFI_11R */ CASE_RETURN_STRING(eNEIGHBOR_STATE_MAX); default: @@ -304,13 +302,11 @@ uint8_t *mac_trace_get_sme_msg_string(uint16_t sme_msg) #endif CASE_RETURN_STRING(eWNI_SME_ADD_STA_SELF_RSP); CASE_RETURN_STRING(eWNI_SME_DEL_STA_SELF_RSP); -#if defined WLAN_FEATURE_VOWIFI_11R CASE_RETURN_STRING(eWNI_SME_FT_PRE_AUTH_REQ); CASE_RETURN_STRING(eWNI_SME_FT_PRE_AUTH_RSP); CASE_RETURN_STRING(eWNI_SME_FT_UPDATE_KEY); CASE_RETURN_STRING(eWNI_SME_FT_AGGR_QOS_REQ); CASE_RETURN_STRING(eWNI_SME_FT_AGGR_QOS_RSP); -#endif #if defined FEATURE_WLAN_ESE CASE_RETURN_STRING(eWNI_SME_ESE_ADJACENT_AP_REPORT); #endif @@ -439,10 +435,8 @@ uint8_t *mac_trace_get_wma_msg_string(uint16_t wma_msg) CASE_RETURN_STRING(WMA_WLAN_SET_APP_TYPE2_PARAMS); #endif CASE_RETURN_STRING(WMA_MSG_TYPES_END); -#ifdef WLAN_FEATURE_VOWIFI_11R CASE_RETURN_STRING(WMA_AGGR_QOS_REQ); CASE_RETURN_STRING(WMA_AGGR_QOS_RSP); -#endif /* WLAN_FEATURE_VOWIFI_11R */ CASE_RETURN_STRING(WMA_FTM_CMD_REQ); CASE_RETURN_STRING(WMA_FTM_CMD_RSP); #ifdef FEATURE_WLAN_SCAN_PNO @@ -651,9 +645,7 @@ uint8_t *mac_trace_get_lim_msg_string(uint16_t lim_msg) CASE_RETURN_STRING(SIR_LIM_QUIET_TIMEOUT); CASE_RETURN_STRING(SIR_LIM_QUIET_BSS_TIMEOUT); CASE_RETURN_STRING(SIR_LIM_WPS_OVERLAP_TIMEOUT); -#ifdef WLAN_FEATURE_VOWIFI_11R CASE_RETURN_STRING(SIR_LIM_FT_PREAUTH_RSP_TIMEOUT); -#endif CASE_RETURN_STRING(SIR_LIM_REMAIN_CHN_TIMEOUT); CASE_RETURN_STRING(SIR_LIM_INSERT_SINGLESHOT_NOA_TIMEOUT); CASE_RETURN_STRING(SIR_LIM_CONVERT_ACTIVE_CHANNEL_TO_PASSIVE); diff --git a/core/mac/src/sys/legacy/src/utils/src/parser_api.c b/core/mac/src/sys/legacy/src/utils/src/parser_api.c index 7a5e691a6859..0420429e6f6e 100644 --- a/core/mac/src/sys/legacy/src/utils/src/parser_api.c +++ b/core/mac/src/sys/legacy/src/utils/src/parser_api.c @@ -2430,7 +2430,6 @@ tSirRetStatus sir_convert_probe_frame2_struct(tpAniSirGlobal pMac, pProbeResp->erpPresent = 1; convert_erp_info(pMac, &pProbeResp->erpIEInfo, &pr->ERPInfo); } -#ifdef WLAN_FEATURE_VOWIFI_11R if (pr->MobilityDomain.present) { /* MobilityDomain */ pProbeResp->mdiePresent = 1; @@ -2446,7 +2445,6 @@ tSirRetStatus sir_convert_probe_frame2_struct(tpAniSirGlobal pMac, (unsigned int)pProbeResp->mdie[1], (unsigned int)pProbeResp->mdie[2]); } -#endif #if defined FEATURE_WLAN_ESE if (pr->ESEVersion.present) @@ -2801,7 +2799,6 @@ sir_convert_assoc_resp_frame2_struct(tpAniSirGlobal pMac, qdf_mem_copy(&pAssocRsp->HTInfo, &ar.HTInfo, sizeof(tDot11fIEHTInfo)); } -#ifdef WLAN_FEATURE_VOWIFI_11R if (ar.MobilityDomain.present) { /* MobilityDomain */ pAssocRsp->mdiePresent = 1; @@ -2826,9 +2823,7 @@ sir_convert_assoc_resp_frame2_struct(tpAniSirGlobal pMac, qdf_mem_copy(&pAssocRsp->FTInfo, &ar.FTInfo, sizeof(tDot11fIEFTInfo)); } -#endif -#ifdef WLAN_FEATURE_VOWIFI_11R if (ar.num_RICDataDesc) { for (cnt = 0; cnt < ar.num_RICDataDesc; cnt++) { if (ar.RICDataDesc[cnt].present) { @@ -2840,7 +2835,6 @@ sir_convert_assoc_resp_frame2_struct(tpAniSirGlobal pMac, pAssocRsp->num_RICData = ar.num_RICDataDesc; pAssocRsp->ricPresent = true; } -#endif #ifdef FEATURE_WLAN_ESE if (ar.num_WMMTSPEC) { @@ -3904,7 +3898,6 @@ sir_convert_beacon_frame2_struct(tpAniSirGlobal pMac, convert_erp_info(pMac, &pBeaconStruct->erpIEInfo, &pBeacon->ERPInfo); } -#ifdef WLAN_FEATURE_VOWIFI_11R if (pBeacon->MobilityDomain.present) { /* MobilityDomain */ pBeaconStruct->mdiePresent = 1; @@ -3918,7 +3911,6 @@ sir_convert_beacon_frame2_struct(tpAniSirGlobal pMac, << 1)); } -#endif #ifdef FEATURE_WLAN_ESE if (pBeacon->ESEVersion.present) @@ -5596,7 +5588,6 @@ tSirRetStatus populate_dot11f_rrm_ie(tpAniSirGlobal pMac, } #endif -#if defined WLAN_FEATURE_VOWIFI_11R void populate_mdie(tpAniSirGlobal pMac, tDot11fIEMobilityDomain *pDot11f, uint8_t mdie[SIR_MDIE_SIZE]) @@ -5617,7 +5608,6 @@ void populate_ft_info(tpAniSirGlobal pMac, tDot11fIEFTInfo *pDot11f) /* All other info is zero. */ } -#endif void populate_dot11f_assoc_rsp_rates(tpAniSirGlobal pMac, tDot11fIESuppRates *pSupp,