qcacld-3.0: Remove #ifdef FEATURE_WLAN_LFR from MAC

The condition #ifdef WLAN_FEATURE_LFR is used to include some of
the roaming code. It has been defined for all the recent driver
builds. Roaming code underneath is permanent part of the driver.
Remove #ifdef FEATURE_WLAN_LFR compiler flag from MAC so that the code
will always be compiled in.

CRs-Fixed: 936683
Change-Id: I6e5afb8eeb5f4f3a0bb7f7b007ffb07cbeff1adf

core/mac/inc/ani_global.h

@@ -829,10 +829,8 @@ typedef struct sAniSirLim {
 	cdf_list_t gLimMgmtFrameRegistratinQueue;
 	uint32_t mgmtFrameSessionId;
 
-#if  defined (WLAN_FEATURE_VOWIFI_11R) || defined (FEATURE_WLAN_ESE) || defined(FEATURE_WLAN_LFR)
 	tpPESession pSessionEntry;
 	uint8_t reAssocRetryAttempt;
-#endif
 	tLimDisassocDeauthCnfReq limDisassocDeauthCnfReq;
 	uint8_t deferredMsgCnt;
 	tSirDFSChannelList dfschannelList;

core/mac/inc/sir_api.h

@@ -269,11 +269,8 @@ typedef enum eSirResultCodes {
 	eSIR_SME_STOP_BSS_FAILURE,
 	eSIR_SME_WOWL_ENTER_REQ_FAILED,
 	eSIR_SME_WOWL_EXIT_REQ_FAILED,
-#if defined(WLAN_FEATURE_VOWIFI_11R) || defined(FEATURE_WLAN_ESE) || \
-	defined(FEATURE_WLAN_LFR)
 	eSIR_SME_FT_REASSOC_TIMEOUT_FAILURE,
 	eSIR_SME_FT_REASSOC_FAILURE,
-#endif
 	eSIR_SME_SEND_ACTION_FAIL,
 	eSIR_SME_DEAUTH_STATUS,
 	eSIR_PNO_SCAN_SUCCESS,
@@ -1000,12 +997,8 @@ typedef struct sSirSmeJoinReq {
 	tESETspecInfo eseTspecInfo;
 #endif
 
-#if defined WLAN_FEATURE_VOWIFI_11R || defined FEATURE_WLAN_ESE || defined(FEATURE_WLAN_LFR)
 	tAniBool isFastTransitionEnabled;
-#endif
-#ifdef FEATURE_WLAN_LFR
 	tAniBool isFastRoamIniFeatureEnabled;
-#endif
 
 	uint8_t txLdpcIniFeatureEnabled;
 	tSirHTConfig htConfig;
@@ -2055,7 +2048,6 @@ typedef struct sSirPlmReq {
 } tSirPlmReq, *tpSirPlmReq;
 #endif
 
-#if defined WLAN_FEATURE_VOWIFI_11R || defined FEATURE_WLAN_ESE || defined(FEATURE_WLAN_LFR)
 
 #define SIR_QOS_NUM_AC_MAX 4
 
@@ -2087,7 +2079,6 @@ typedef struct sSirAggrQosRsp {
 	tSirAggrQosRspInfo aggrInfo;
 } tSirAggrQosRsp, *tpSirAggrQosRsp;
 
-#endif /*WLAN_FEATURE_VOWIFI_11R || FEATURE_WLAN_ESE */
 
 typedef struct sSirQosMapSet {
 	uint8_t present;

core/mac/inc/sir_mac_prot_def.h

@@ -1952,13 +1952,11 @@ typedef struct sSirMacActionFrameHdr {
 	uint8_t actionID;
 } cdf_packed tSirMacActionFrameHdr, *tpSirMacActionFrameHdr;
 
-#if  defined (WLAN_FEATURE_VOWIFI_11R) || defined (FEATURE_WLAN_ESE) || defined(FEATURE_WLAN_LFR)
 typedef struct sSirMacVendorSpecificFrameHdr {
 	uint8_t category;
 	uint8_t Oui[4];
 } cdf_packed tSirMacVendorSpecificFrameHdr,
 *tpSirMacVendorSpecificFrameHdr;
-#endif
 
 typedef struct sSirMacVendorSpecificPublicActionFrameHdr {
 	uint8_t category;

core/mac/src/pe/include/lim_session.h

@@ -117,9 +117,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_ESE) || defined(FEATURE_WLAN_LFR)
 	void *pLimMlmReassocRetryReq;   /* keep reasoc req for retry */
-#endif
 	void *pLimMlmReassocReq;        /* handle to MLM reassoc Req */
 	uint16_t channelChangeReasonCode;
 	uint8_t dot11mode;
@@ -291,12 +289,8 @@ typedef struct sPESession       /* Added to Support BT-AMP */
 	tAniBool isESEconnection;
 	tEsePEContext eseContext;
 #endif
-#if defined WLAN_FEATURE_VOWIFI_11R || defined FEATURE_WLAN_ESE || defined(FEATURE_WLAN_LFR)
 	tAniBool isFastTransitionEnabled;
-#endif
-#ifdef FEATURE_WLAN_LFR
 	tAniBool isFastRoamIniFeatureEnabled;
-#endif
 	tSirNoAParam p2pNoA;
 	tSirP2PNoaAttr p2pGoPsUpdate;
 	uint32_t defaultAuthFailureTimeout;

core/mac/src/pe/lim/lim_api.c

@@ -301,10 +301,8 @@ static void __lim_init_assoc_vars(tpAniSirGlobal pMac)
 	cdf_mem_set(pMac->lim.protStaCache,
 		    sizeof(tCacheParams) * LIM_PROT_STA_CACHE_SIZE, 0);
 
-#if  defined (WLAN_FEATURE_VOWIFI_11R) || defined (FEATURE_WLAN_ESE) || defined(FEATURE_WLAN_LFR)
 	pMac->lim.pSessionEntry = NULL;
 	pMac->lim.reAssocRetryAttempt = 0;
-#endif
 
 }
 

core/mac/src/pe/lim/lim_assoc_utils.h

@@ -192,11 +192,9 @@ void lim_handle_add_bss_in_re_assoc_context(tpAniSirGlobal pMac, tpDphHashNode p
 void lim_fill_rx_highest_supported_rate(tpAniSirGlobal pMac,
 					uint16_t *rxHighestRate,
 					uint8_t *pSupportedMCSSet);
-#if  defined (WLAN_FEATURE_VOWIFI_11R) || defined (FEATURE_WLAN_ESE) || defined(FEATURE_WLAN_LFR)
 void lim_send_retry_reassoc_req_frame(tpAniSirGlobal pMac,
 				      tLimMlmReassocReq *pMlmReassocReq,
 				      tpPESession psessionEntry);
-#endif
 #ifdef WLAN_FEATURE_11W
 void lim_send_sme_unprotected_mgmt_frame_ind(tpAniSirGlobal pMac, uint8_t frameType,
 					     uint8_t *frame, uint32_t frameLen,

core/mac/src/pe/lim/lim_ft.c

@@ -362,15 +362,12 @@ void lim_perform_ft_pre_auth(tpAniSirGlobal pMac, CDF_STATUS status,
 		 * receive Auth2
 		 */
 		authFrame.authAlgoNumber = eSIR_FT_AUTH;
-	}
-#if defined FEATURE_WLAN_ESE || defined FEATURE_WLAN_LFR
-	else {
+	} else {
 		/* Will need to make isESEconnection a enum may be for further
 		 * improvements to this to match this algorithm number
 		 */
 		authFrame.authAlgoNumber = eSIR_OPEN_SYSTEM;
 	}
-#endif
 	authFrame.authTransactionSeqNumber = SIR_MAC_AUTH_FRAME_1;
 	authFrame.authStatusCode = 0;
 
@@ -825,9 +822,7 @@ void lim_fill_ft_session(tpAniSirGlobal pMac,
 	}
 
 	/* Retrieve the session that has already been created and update the entry */
-#if defined WLAN_FEATURE_VOWIFI_11R_DEBUG || defined FEATURE_WLAN_ESE || defined(FEATURE_WLAN_LFR)
 	lim_print_mac_addr(pMac, pbssDescription->bssId, LOG1);
-#endif
 	pftSessionEntry->limWmeEnabled = psessionEntry->limWmeEnabled;
 	pftSessionEntry->limQosEnabled = psessionEntry->limQosEnabled;
 	pftSessionEntry->limWsmEnabled = psessionEntry->limWsmEnabled;
@@ -930,9 +925,7 @@ void lim_fill_ft_session(tpAniSirGlobal pMac,
 	sir_copy_mac_addr(pftSessionEntry->limReAssocbssId,
 			  pbssDescription->bssId);
 	sir_copy_mac_addr(pftSessionEntry->prev_ap_bssid, psessionEntry->bssId);
-#if defined WLAN_FEATURE_VOWIFI_11R_DEBUG || defined FEATURE_WLAN_ESE || defined(FEATURE_WLAN_LFR)
 	lim_print_mac_addr(pMac, pftSessionEntry->limReAssocbssId, LOG1);
-#endif
 
 	/* Store beaconInterval */
 	pftSessionEntry->beaconParams.beaconInterval =
@@ -982,15 +975,11 @@ void lim_fill_ft_session(tpAniSirGlobal pMac,
 	pftSessionEntry->is_ese_version_ie_present =
 		pBeaconStruct->is_ese_ver_ie_present;
 #endif
-#if defined WLAN_FEATURE_VOWIFI_11R || defined FEATURE_WLAN_ESE || defined(FEATURE_WLAN_LFR)
 	pftSessionEntry->isFastTransitionEnabled =
 		psessionEntry->isFastTransitionEnabled;
-#endif
 
-#ifdef FEATURE_WLAN_LFR
 	pftSessionEntry->isFastRoamIniFeatureEnabled =
 		psessionEntry->isFastRoamIniFeatureEnabled;
-#endif
 
 #ifdef FEATURE_WLAN_ESE
 	pftSessionEntry->maxTxPower =

core/mac/src/pe/lim/lim_process_action_frame.c

@@ -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.
  *
@@ -1952,8 +1952,6 @@ void lim_process_action_frame(tpAniSirGlobal mac_ctx,
 		}
 		break;
 #endif
-#if  defined(WLAN_FEATURE_VOWIFI_11R) || defined(FEATURE_WLAN_ESE) || \
-		defined(FEATURE_WLAN_LFR)
 	case SIR_MAC_ACTION_VENDOR_SPECIFIC_CATEGORY:
 		vendor_specific = (tpSirMacVendorSpecificFrameHdr) action_hdr;
 		mac_hdr = NULL;
@@ -1999,8 +1997,6 @@ void lim_process_action_frame(tpAniSirGlobal mac_ctx,
 				GET_LIM_SYSTEM_ROLE(session));
 		}
 	break;
-#endif /* WLAN_FEATURE_VOWIFI_11R || FEATURE_WLAN_ESE ||
-		                   FEATURE_WLAN_LFR */
 	case SIR_MAC_ACTION_PUBLIC_USAGE:
 		switch (action_hdr->actionID) {
 		case SIR_MAC_ACTION_VENDOR_SPECIFIC:

core/mac/src/pe/lim/lim_process_assoc_rsp_frame.c

@@ -648,10 +648,8 @@ lim_process_assoc_rsp_frame(tpAniSirGlobal mac_ctx,
 		((subtype == LIM_REASSOC) &&
 		 !session_entry->bRoamSynchInProgress &&
 		((session_entry->limMlmState != eLIM_MLM_WT_REASSOC_RSP_STATE)
-#if defined (WLAN_FEATURE_VOWIFI_11R) || defined (FEATURE_WLAN_ESE) || defined(FEATURE_WLAN_LFR)
 		&& (session_entry->limMlmState !=
 		eLIM_MLM_WT_FT_REASSOC_RSP_STATE)
-#endif
 		))) {
 		/* Received unexpected Re/Association Response frame */
 
@@ -818,7 +816,6 @@ lim_process_assoc_rsp_frame(tpAniSirGlobal mac_ctx,
 	else
 	{
 		/* Stop Reassociation failure timer */
-#if  defined (WLAN_FEATURE_VOWIFI_11R) || defined (FEATURE_WLAN_ESE) || defined(FEATURE_WLAN_LFR)
 		mac_ctx->lim.reAssocRetryAttempt = 0;
 		if ((NULL != mac_ctx->lim.pSessionEntry)
 		    && (NULL !=
@@ -828,7 +825,6 @@ lim_process_assoc_rsp_frame(tpAniSirGlobal mac_ctx,
 			mac_ctx->lim.pSessionEntry->pLimMlmReassocRetryReq =
 				NULL;
 		}
-#endif
 		lim_deactivate_and_change_timer(mac_ctx,
 			eLIM_REASSOC_FAIL_TIMER);
 	}
@@ -973,7 +969,6 @@ lim_process_assoc_rsp_frame(tpAniSirGlobal mac_ctx,
 				session_entry, false);
 			goto assocReject;
 		}
-#if defined(WLAN_FEATURE_VOWIFI_11R) || defined (FEATURE_WLAN_ESE) || defined(FEATURE_WLAN_LFR)
 		if ((session_entry->limMlmState ==
 		    eLIM_MLM_WT_FT_REASSOC_RSP_STATE) ||
 			session_entry->bRoamSynchInProgress) {
@@ -1003,7 +998,6 @@ lim_process_assoc_rsp_frame(tpAniSirGlobal mac_ctx,
 			cdf_mem_free(beacon);
 			return;
 		}
-#endif /* WLAN_FEATURE_VOWIFI_11R */
 
 		/*
 		 * If we're re-associating to the same BSS,

core/mac/src/pe/lim/lim_process_mlm_req_messages.c

@@ -896,10 +896,7 @@ void lim_post_join_set_link_state_callback(tpAniSirGlobal mac,
 	 */
 	session_entry->channelChangeReasonCode =
 			 LIM_SWITCH_CHANNEL_JOIN;
-#if  defined (WLAN_FEATURE_VOWIFI_11R) || defined (FEATURE_WLAN_ESE) || \
-	 defined(FEATURE_WLAN_LFR)
 	session_entry->pLimMlmReassocRetryReq = NULL;
-#endif
 	lim_log(mac, LOGE,
 		FL("[lim_process_mlm_join_req]: suspend link success(%d) "
 		"on sessionid: %d setting channel to: %d with ch_width :%d "

core/mac/src/pe/lim/lim_process_mlm_rsp_messages.c

@@ -2730,7 +2730,6 @@ lim_process_sta_mlm_add_bss_rsp_ft(tpAniSirGlobal pMac, tpSirMsgQ limMsgQ,
 			eSIR_MAC_UNSPEC_FAILURE_STATUS;
 		goto end;
 	}
-#if  defined (WLAN_FEATURE_VOWIFI_11R) || defined (FEATURE_WLAN_ESE) || defined(FEATURE_WLAN_LFR)
 	pMac->lim.pSessionEntry = psessionEntry;
 	if (NULL == pMac->lim.pSessionEntry->pLimMlmReassocRetryReq) {
 		/* Take a copy of reassoc request for retrying */
@@ -2748,7 +2747,6 @@ lim_process_sta_mlm_add_bss_rsp_ft(tpAniSirGlobal pMac, tpSirMsgQ limMsgQ,
 			     sizeof(tLimMlmReassocReq));
 	}
 	pMac->lim.reAssocRetryAttempt = 0;
-#endif
 	lim_send_reassoc_req_with_ft_ies_mgmt_frame(pMac,
 						    psessionEntry->
 						    pLimMlmReassocReq,
@@ -2955,11 +2953,8 @@ lim_process_sta_mlm_add_bss_rsp(tpAniSirGlobal mac_ctx,
 		goto end;
 	}
 	if (eLIM_MLM_WT_ADD_BSS_RSP_REASSOC_STATE == session_entry->limMlmState
-#if defined(WLAN_FEATURE_VOWIFI_11R) || defined(FEATURE_WLAN_ESE) || defined(FEATURE_WLAN_LFR)
 		|| (eLIM_MLM_WT_ADD_BSS_RSP_FT_REASSOC_STATE ==
-		session_entry->limMlmState)
-#endif
-	) {
+		session_entry->limMlmState)) {
 		msg_type = LIM_MLM_REASSOC_CNF;
 		sub_type = LIM_REASSOC;
 		/*
@@ -2987,7 +2982,6 @@ lim_process_sta_mlm_add_bss_rsp(tpAniSirGlobal mac_ctx,
 #endif
 
 	if (CDF_STATUS_SUCCESS == add_bss_params->status) {
-#if defined(WLAN_FEATURE_VOWIFI_11R) || defined(FEATURE_WLAN_ESE) || defined(FEATURE_WLAN_LFR)
 		if (eLIM_MLM_WT_ADD_BSS_RSP_FT_REASSOC_STATE ==
 			session_entry->limMlmState) {
 #ifdef WLAN_FEATURE_VOWIFI_11R_DEBUG
@@ -2999,7 +2993,6 @@ lim_process_sta_mlm_add_bss_rsp(tpAniSirGlobal mac_ctx,
 				session_entry);
 			goto end;
 		}
-#endif /* WLAN_FEATURE_VOWIFI_11R */
 
 		/* Set MLME state */
 		session_entry->limMlmState = eLIM_MLM_WT_ADD_STA_RSP_STATE;

core/mac/src/pe/lim/lim_process_sme_req_messages.c

@@ -1806,15 +1806,11 @@ __lim_process_sme_join_req(tpAniSirGlobal mac_ctx, uint32_t *msg_buf)
 #ifdef FEATURE_WLAN_ESE
 		session->isESEconnection = sme_join_req->isESEconnection;
 #endif
-#if defined WLAN_FEATURE_VOWIFI_11R || defined FEATURE_WLAN_ESE || defined(FEATURE_WLAN_LFR)
 		session->isFastTransitionEnabled =
 			sme_join_req->isFastTransitionEnabled;
-#endif
 
-#ifdef FEATURE_WLAN_LFR
 		session->isFastRoamIniFeatureEnabled =
 			sme_join_req->isFastRoamIniFeatureEnabled;
-#endif
 		session->txLdpcIniFeatureEnabled =
 			sme_join_req->txLdpcIniFeatureEnabled;
 
@@ -2127,8 +2123,6 @@ static void __lim_process_sme_reassoc_req(tpAniSirGlobal mac_ctx,
 	 */
 
 	if (session_entry->limSmeState != eLIM_SME_LINK_EST_STATE) {
-#if defined(WLAN_FEATURE_VOWIFI_11R) || defined(FEATURE_WLAN_ESE) || \
-		defined(FEATURE_WLAN_LFR)
 		if (session_entry->limSmeState == eLIM_SME_WT_REASSOC_STATE) {
 			/*
 			 * May be from 11r FT pre-auth. So lets check it
@@ -2155,7 +2149,6 @@ static void __lim_process_sme_reassoc_req(tpAniSirGlobal mac_ctx,
 					session_entry);
 			return;
 		}
-#endif
 		/*
 		 * Should not have received eWNI_SME_REASSOC_REQ
 		 */

core/mac/src/pe/lim/lim_send_management_frames.c

@@ -1977,7 +1977,6 @@ lim_send_assoc_req_mgmt_frame(tpAniSirGlobal mac_ctx,
 	return;
 }
 
-#if defined WLAN_FEATURE_VOWIFI_11R || defined FEATURE_WLAN_ESE || defined(FEATURE_WLAN_LFR)
 /**
  * lim_send_reassoc_req_with_ft_ies_mgmt_frame() - Send Reassoc Req with FTIEs.
  *
@@ -2011,9 +2010,7 @@ lim_send_reassoc_req_with_ft_ies_mgmt_frame(tpAniSirGlobal mac_ctx,
 	uint8_t *body;
 	uint16_t add_ie_len;
 	uint8_t *add_ie;
-#if defined FEATURE_WLAN_ESE || defined(FEATURE_WLAN_LFR)
 	uint8_t *wps_ie = NULL;
-#endif
 	uint8_t tx_flag = 0;
 	uint8_t sme_sessionid = 0;
 	bool vht_enabled = false;
@@ -2116,7 +2113,6 @@ lim_send_reassoc_req_with_ft_ies_mgmt_frame(tpAniSirGlobal mac_ctx,
 	 * at the end of the pack routine for 11r.
 	 * This should ideally! be fixed.
 	 */
-#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
@@ -2176,7 +2172,6 @@ lim_send_reassoc_req_with_ft_ies_mgmt_frame(tpAniSirGlobal mac_ctx,
 #endif
 	}
 #endif /* FEATURE_WLAN_ESE */
-#endif /* FEATURE_WLAN_ESE || FEATURE_WLAN_LFR */
 
 	/* include WME EDCA IE as well */
 	if (wme_enabled) {
@@ -2297,9 +2292,7 @@ lim_send_reassoc_req_with_ft_ies_mgmt_frame(tpAniSirGlobal mac_ctx,
 	/* Paranoia: */
 	cdf_mem_set(frame, bytes + ft_ies_length, 0);
 
-#if defined WLAN_FEATURE_VOWIFI_11R_DEBUG || defined FEATURE_WLAN_ESE || defined(FEATURE_WLAN_LFR)
 	lim_print_mac_addr(mac_ctx, pe_session->limReAssocbssId, LOG1);
-#endif
 	/* Next, we fill out the buffer descriptor: */
 	lim_populate_mac_header(mac_ctx, frame, SIR_MAC_MGMT_FRAME,
 		SIR_MAC_MGMT_REASSOC_REQ, pe_session->limReAssocbssId,
@@ -2477,7 +2470,6 @@ end:
 			     (uint32_t *) &mlmReassocCnf);
 }
 
-#endif /* WLAN_FEATURE_VOWIFI_11R */
 
 void
 lim_send_reassoc_req_mgmt_frame(tpAniSirGlobal pMac,
@@ -3022,13 +3014,10 @@ lim_send_auth_mgmt_frame(tpAniSirGlobal mac_ctx,
 	if ((SIR_BAND_5_GHZ == lim_get_rf_band(session->currentOperChannel))
 	    || (session->pePersona == CDF_P2P_CLIENT_MODE)
 	    || (session->pePersona == CDF_P2P_GO_MODE)
-#if defined(WLAN_FEATURE_VOWIFI_11R) || defined(FEATURE_WLAN_ESE) || defined(FEATURE_WLAN_LFR)
 	    || ((NULL != session->ftPEContext.pFTPreAuthReq) &&
 		(SIR_BAND_5_GHZ ==
 		 lim_get_rf_band(session->ftPEContext.pFTPreAuthReq->
-				 preAuthchannelNum)))
-#endif
-	    )
+				 preAuthchannelNum))))
 		tx_flag |= HAL_USE_BD_RATE2_FOR_MANAGEMENT_FRAME;
 
 
@@ -3099,9 +3088,7 @@ CDF_STATUS lim_send_deauth_cnf(tpAniSirGlobal pMac)
 #ifdef FEATURE_WLAN_ESE
 		(psessionEntry->isESEconnection) ||
 #endif
-#ifdef FEATURE_WLAN_LFR
 		(psessionEntry->isFastRoamIniFeatureEnabled) ||
-#endif
 		(psessionEntry->is11Rconnection))) {
 		PELOGE(lim_log(pMac, LOGE,
 			FL("FT Preauth Session (%p,%d) Cleanup Deauth reason %d Trigger = %d"),
@@ -3115,17 +3102,13 @@ CDF_STATUS lim_send_deauth_cnf(tpAniSirGlobal pMac)
 #ifdef FEATURE_WLAN_ESE
 			" isESE %d"
 #endif
-#ifdef FEATURE_WLAN_LFR
 			" isLFR %d"
-#endif
 			" is11r %d, Deauth reason %d Trigger = %d"),
 			psessionEntry->limSystemRole,
 #ifdef FEATURE_WLAN_ESE
 			psessionEntry->isESEconnection,
 #endif
-#ifdef FEATURE_WLAN_LFR
 			psessionEntry->isFastRoamIniFeatureEnabled,
-#endif
 			psessionEntry->is11Rconnection,
 			pMlmDeauthReq->reasonCode,
 			pMlmDeauthReq->deauthTrigger););
@@ -3209,9 +3192,7 @@ CDF_STATUS lim_send_disassoc_cnf(tpAniSirGlobal mac_ctx)
 #ifdef FEATURE_WLAN_ESE
 			    (pe_session->isESEconnection) ||
 #endif
-#ifdef FEATURE_WLAN_LFR
 			    (pe_session->isFastRoamIniFeatureEnabled) ||
-#endif
 			    (pe_session->is11Rconnection)) &&
 			    (disassoc_req->reasonCode !=
 				eSIR_MAC_DISASSOC_DUE_TO_FTHANDOFF_REASON)) {
@@ -3229,17 +3210,13 @@ CDF_STATUS lim_send_disassoc_cnf(tpAniSirGlobal mac_ctx)
 #ifdef FEATURE_WLAN_ESE
 				" isESE %d"
 #endif
-#ifdef FEATURE_WLAN_LFR
 				" isLFR %d"
-#endif
 				" is11r %d reason %d"),
 				GET_LIM_SYSTEM_ROLE(pe_session),
 #ifdef FEATURE_WLAN_ESE
 				pe_session->isESEconnection,
 #endif
-#ifdef FEATURE_WLAN_LFR
 				pe_session->isFastRoamIniFeatureEnabled,
-#endif
 				pe_session->is11Rconnection,
 				disassoc_req->reasonCode);
 		}

core/mac/src/pe/lim/lim_session.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.
  *
@@ -310,12 +310,8 @@ pe_create_session(tpAniSirGlobal pMac, uint8_t *bssid, uint8_t *sessionId,
 #ifdef FEATURE_WLAN_ESE
 	session_ptr->isESEconnection = false;
 #endif
-#if defined WLAN_FEATURE_VOWIFI_11R || defined FEATURE_WLAN_ESE || defined(FEATURE_WLAN_LFR)
 	session_ptr->isFastTransitionEnabled = false;
-#endif
-#ifdef FEATURE_WLAN_LFR
 	session_ptr->isFastRoamIniFeatureEnabled = false;
-#endif
 	*sessionId = i;
 	session_ptr->gLimPhyMode = WNI_CFG_PHY_MODE_11G;
 	/* Initialize CB mode variables when session is created */
@@ -640,12 +636,10 @@ void pe_delete_session(tpAniSirGlobal mac_ctx, tpPESession session)
 		cdf_mem_free(session->limAssocResponseData);
 		session->limAssocResponseData = NULL;
 	}
-#if  defined (WLAN_FEATURE_VOWIFI_11R) || defined (FEATURE_WLAN_ESE) || defined(FEATURE_WLAN_LFR)
 	if (NULL != session->pLimMlmReassocRetryReq) {
 		cdf_mem_free(session->pLimMlmReassocRetryReq);
 		session->pLimMlmReassocRetryReq = NULL;
 	}
-#endif
 	if (NULL != session->pLimMlmReassocReq) {
 		cdf_mem_free(session->pLimMlmReassocReq);
 		session->pLimMlmReassocReq = NULL;

core/mac/src/pe/lim/lim_timer_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.
  *
@@ -565,7 +565,6 @@ void lim_assoc_failure_timer_handler(void *mac_global, uint32_t param)
 	tpAniSirGlobal mac_ctx = (tpAniSirGlobal) mac_global;
 	tpPESession session = NULL;
 
-#if  defined (WLAN_FEATURE_VOWIFI_11R) || defined (FEATURE_WLAN_ESE) || defined(FEATURE_WLAN_LFR)
 	session = mac_ctx->lim.pSessionEntry;
 	if (LIM_REASSOC == param && NULL != session
 	    && session->limMlmState == eLIM_MLM_WT_FT_REASSOC_RSP_STATE) {
@@ -589,7 +588,6 @@ void lim_assoc_failure_timer_handler(void *mac_global, uint32_t param)
 			}
 		}
 	}
-#endif
 	/* Prepare and post message to LIM Message Queue */
 	msg.type = SIR_LIM_ASSOC_FAIL_TIMEOUT;
 	msg.bodyval = (uint32_t) param;

core/mac/src/pe/lim/lim_utils.h

@@ -59,9 +59,7 @@ typedef enum {
 #define LIM_RRM_BIT_MASK                          0x1000
 #define LIM_SHORT_PREAMBLE_BIT_MASK               0x0020
 #define LIM_IMMEDIATE_BLOCK_ACK_MASK              0x8000
-#if  defined (WLAN_FEATURE_VOWIFI_11R) || defined (FEATURE_WLAN_ESE) || defined(FEATURE_WLAN_LFR)
 #define LIM_MAX_REASSOC_RETRY_LIMIT            2
-#endif
 
 /* classifier ID is coded as 0-3: tsid, 4-5:direction */
 #define LIM_MAKE_CLSID(tsid, dir) (((tsid) & 0x0F) | (((dir) & 0x03) << 4))