qcacld-3.0: Remove WLAN_FEATURE_VOWIFI conditional compilation

Remove #ifdef WLAN_FEATURE_VOWIFI from host driver source code.
It has alwasys been defined in Kbuild and underlying features
will be permanent in cld3.0. Those features are 11r radio
resource measurement, beacon report, link report, neighbor
report and power constraint.

Please note that WLAN_FEATURE_VOWIFI_11R is used for different
purpose and it is not removed in this change.

CRs-Fixed: 958729
Change-Id: Icd80e9cce08c4662e86ccda94491c1fc22c5756d

Kbuild

@@ -902,7 +902,6 @@ CDEFINES :=	-DANI_LITTLE_BYTE_ENDIAN \
 		-DWLAN_AP_STA_CONCURRENCY \
 		-DFEATURE_WLAN_SCAN_PNO \
 		-DWLAN_FEATURE_PACKET_FILTERING \
-		-DWLAN_FEATURE_VOWIFI \
 		-DWLAN_FEATURE_11AC \
 		-DWLAN_FEATURE_P2P_DEBUG \
 		-DWLAN_ENABLE_AGEIE_ON_SCAN_RESULTS \

core/hdd/inc/wlan_hdd_cfg.h

@@ -801,7 +801,6 @@ typedef enum {
 #define CFG_TL_DELAYED_TRGR_FRM_INT_MAX                     (4294967295UL)
 #define CFG_TL_DELAYED_TRGR_FRM_INT_DEFAULT                 3000
 
-#if defined WLAN_FEATURE_VOWIFI
 #define CFG_RRM_ENABLE_NAME                              "gRrmEnable"
 #define CFG_RRM_ENABLE_MIN                               (0)
 #define CFG_RRM_ENABLE_MAX                               (1)
@@ -833,7 +832,6 @@ typedef enum {
  */
 #define CFG_RM_CAPABILITY_NAME            "rm_capability"
 #define CFG_RM_CAPABILITY_DEFAULT         "73,00,6D,00,04"
-#endif
 
 #define CFG_QOS_IMPLICIT_SETUP_ENABLED_NAME                 "ImplicitQosIsEnabled"
 #define CFG_QOS_IMPLICIT_SETUP_ENABLED_MIN                  (0)
@@ -2956,14 +2954,12 @@ struct hdd_config {
 	uint8_t nTxPowerCap;    /* In dBm */
 	bool fIsLowGainOverride;
 	uint8_t disablePacketFilter;
-#if defined WLAN_FEATURE_VOWIFI
 	bool fRrmEnable;
 	uint8_t nInChanMeasMaxDuration;
 	uint8_t nOutChanMeasMaxDuration;
 	uint16_t nRrmRandnIntvl;
 	/* length includes separator */
 	char rm_capability[3 * DOT11F_IE_RRMENABLEDCAP_MAX_LEN];
-#endif
 
 	/* Vowifi 11r params */
 	bool fFTResourceReqSupported;

core/hdd/src/wlan_hdd_cfg.c

@@ -1285,7 +1285,6 @@ REG_TABLE_ENTRY g_registry_table[] = {
 		     CFG_WLAN_AUTO_SHUTDOWN_MIN,
 		     CFG_WLAN_AUTO_SHUTDOWN_MAX),
 #endif
-#if defined WLAN_FEATURE_VOWIFI
 	REG_VARIABLE(CFG_RRM_ENABLE_NAME, WLAN_PARAM_Integer,
 		     struct hdd_config, fRrmEnable,
 		     VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT,
@@ -1320,7 +1319,6 @@ REG_TABLE_ENTRY g_registry_table[] = {
 			    struct hdd_config, rm_capability,
 			    VAR_FLAGS_OPTIONAL,
 			    (void *) CFG_RM_CAPABILITY_DEFAULT),
-#endif
 
 	REG_VARIABLE(CFG_FT_RESOURCE_REQ_NAME, WLAN_PARAM_Integer,
 		     struct hdd_config, fFTResourceReqSupported,
@@ -5852,14 +5850,12 @@ bool hdd_update_config_dat(hdd_context_t *pHddCtx)
 		       "Could not pass on WNI_CFG_GO_LINK_MONITOR_TIMEOUT to CFG");
 	}
 
-#if defined WLAN_FEATURE_VOWIFI
 	if (sme_cfg_set_int
 		    (pHddCtx->hHal, WNI_CFG_MCAST_BCAST_FILTER_SETTING,
 		    pConfig->mcastBcastFilterSetting) == QDF_STATUS_E_FAILURE)
 		fStatus = false;
 		hddLog(LOGE,
 		       "Could not pass on WNI_CFG_MCAST_BCAST_FILTER_SETTING to CFG");
-#endif
 
 	if (sme_cfg_set_int
 		    (pHddCtx->hHal, WNI_CFG_SINGLE_TID_RC,
@@ -6492,13 +6488,11 @@ QDF_STATUS hdd_set_sme_config(hdd_context_t *pHddCtx)
 	smeConfig->csrConfig.Is11eSupportEnabled = pConfig->b80211eIsEnabled;
 	smeConfig->csrConfig.WMMSupportMode = pConfig->WmmMode;
 
-#if defined WLAN_FEATURE_VOWIFI
 	smeConfig->rrmConfig.rrm_enabled = pConfig->fRrmEnable;
 	smeConfig->rrmConfig.max_randn_interval = pConfig->nRrmRandnIntvl;
 	hdd_hex_string_to_u8_array(pConfig->rm_capability,
 			smeConfig->rrmConfig.rm_capability, &rrm_capab_len,
 			DOT11F_IE_RRMENABLEDCAP_MAX_LEN);
-#endif
 	/* Remaining config params not obtained from registry
 	 * On RF EVB beacon using channel 1.
 	 */

core/hdd/src/wlan_hdd_wext.c

@@ -44,9 +44,7 @@
 #include "sir_params.h"
 #include "csr_api.h"
 #include "csr_inside_api.h"
-#if defined WLAN_FEATURE_VOWIFI
 #include "sme_rrm_internal.h"
-#endif
 #include <ani_global.h>
 #include "dot11f.h"
 #include <wlan_hdd_wowl.h>
@@ -284,9 +282,7 @@ static const hdd_freq_chan_map_t freq_chan_map[] = {
 #define WLAN_PRIV_SET_CHAR_GET_NONE   (SIOCIWFIRSTPRIV + 3)
 #define WE_WOWL_ADD_PTRN     1
 #define WE_WOWL_DEL_PTRN     2
-#if defined WLAN_FEATURE_VOWIFI
 #define WE_NEIGHBOR_REPORT_REQUEST 3
-#endif
 #define WE_SET_AP_WPS_IE     4  /* This is called in station mode to set probe rsp ie. */
 #define WE_SET_CONFIG        5
 
@@ -6181,9 +6177,7 @@ static int __iw_setchar_getnone(struct net_device *dev,
 	char *pBuffer = NULL;
 	hdd_adapter_t *pAdapter = (netdev_priv(dev));
 	hdd_context_t *hdd_ctx = WLAN_HDD_GET_CTX(pAdapter);
-#ifdef WLAN_FEATURE_VOWIFI
 	struct hdd_config *pConfig = hdd_ctx->config;
-#endif /* WLAN_FEATURE_VOWIFI */
 	struct iw_point s_priv_data;
 
 	if (!capable(CAP_NET_ADMIN)) {
@@ -6233,7 +6227,6 @@ static int __iw_setchar_getnone(struct net_device *dev,
 		QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO, "DEL_PTRN");
 		hdd_del_wowl_ptrn(pAdapter, pBuffer);
 		break;
-#if defined WLAN_FEATURE_VOWIFI
 	case WE_NEIGHBOR_REPORT_REQUEST:
 	{
 		tRrmNeighborReq neighborReq;
@@ -6270,7 +6263,6 @@ static int __iw_setchar_getnone(struct net_device *dev,
 		}
 	}
 	break;
-#endif
 	case WE_SET_AP_WPS_IE:
 		hddLog(LOGE, "Received WE_SET_AP_WPS_IE");
 		sme_update_p2p_ie(WLAN_HDD_GET_HAL_CTX(pAdapter), pBuffer,
@@ -10320,13 +10312,12 @@ static const struct iw_priv_args we_private_args[] = {
 	 0,
 	 "wowlDelPtrn"},
 
-#if defined WLAN_FEATURE_VOWIFI
 	/* handlers for sub-ioctl */
 	{WE_NEIGHBOR_REPORT_REQUEST,
 	 IW_PRIV_TYPE_CHAR | 512,
 	 0,
 	 "neighbor"},
-#endif
+
 	{WE_SET_AP_WPS_IE,
 	 IW_PRIV_TYPE_CHAR | 512,
 	 0,

core/mac/inc/ani_global.h

@@ -57,10 +57,8 @@ typedef struct sAniSirGlobal *tpAniSirGlobal;
 #include "oem_data_internal.h"
 #endif
 
-#if defined WLAN_FEATURE_VOWIFI
 #include "sme_rrm_internal.h"
 #include "rrm_global.h"
-#endif
 #include "p2p_api.h"
 
 #include <lim_ft_defs.h>
@@ -851,12 +849,10 @@ struct mgmt_frm_reg_info {
 	uint8_t matchData[1];
 };
 
-#if defined WLAN_FEATURE_VOWIFI
 typedef struct sRrmContext {
 	tRrmSMEContext rrmSmeContext;
 	tRrmPEContext rrmPEContext;
 } tRrmContext, *tpRrmContext;
-#endif
 
 /**
  * enum tDriverType - Indicate the driver type to the mac, and based on this
@@ -989,9 +985,7 @@ typedef struct sAniSirGlobal {
 #ifdef FEATURE_OEM_DATA_SUPPORT
 	tOemDataStruct oemData;
 #endif
-#if defined WLAN_FEATURE_VOWIFI
 	tRrmContext rrm;
-#endif
 #ifdef WLAN_FEATURE_CONCURRENT_P2P
 	tp2pContext p2pContext[MAX_NO_OF_P2P_SESSIONS];
 #else

core/mac/inc/sir_api.h

@@ -673,10 +673,8 @@ typedef struct sSirBssDescription {
 	uint8_t sSirBssDescriptionRsvd[3];
 	/* base on a tick count. It is a time stamp, not a relative time. */
 	uint32_t nReceivedTime;
-#if defined WLAN_FEATURE_VOWIFI
 	uint32_t parentTSF;
 	uint32_t startTSF[2];
-#endif
 	uint8_t mdiePresent;
 	/* MDIE for 11r, picked from the beacons */
 	uint8_t mdie[SIR_MDIE_SIZE];

core/mac/inc/sir_mac_prot_def.h

@@ -171,7 +171,6 @@
 
 /* RRM related. */
 /* Refer IEEE Std 802.11k-2008, Section 7.3.2.21, table 7.29 */
-#if defined WLAN_FEATURE_VOWIFI
 
 #define SIR_MAC_RRM_CHANNEL_LOAD_TYPE          3
 #define SIR_MAC_RRM_NOISE_HISTOGRAM_BEACON     4
@@ -191,8 +190,6 @@
 #define SIR_MAC_RRM_NEIGHBOR_REQ               4
 #define SIR_MAC_RRM_NEIGHBOR_RPT               5
 
-#endif
-
 /* VHT Action Field */
 #ifdef WLAN_FEATURE_11AC
 #define SIR_MAC_VHT_GID_NOTIFICATION           1
@@ -565,9 +562,7 @@
 #define SIR_MAC_GET_QOS(x)               ((((uint16_t) x) & 0x0200) >> 9)
 #define SIR_MAC_GET_SHORT_SLOT_TIME(x)   ((((uint16_t) x) & 0x0400) >> 10)
 #define SIR_MAC_GET_APSD(x)              ((((uint16_t) x) & 0x0800) >> 11)
-#if defined WLAN_FEATURE_VOWIFI
 #define SIR_MAC_GET_RRM(x)               ((((uint16_t) x) & 0x1000) >> 12)
-#endif
 #define SIR_MAC_GET_BLOCK_ACK(x)         ((((uint16_t) x) & 0xc000) >> CAPABILITY_INFO_DELAYED_BA_BIT)
 #define SIR_MAC_SET_ESS(x)               (((uint16_t) x) | 0x0001)
 #define SIR_MAC_SET_IBSS(x)              (((uint16_t) x) | 0x0002)
@@ -579,9 +574,7 @@
 #define SIR_MAC_SET_QOS(x)               (((uint16_t) x) | 0x0200)
 #define SIR_MAC_SET_SHORT_SLOT_TIME(x)   (((uint16_t) x) | 0x0400)
 #define SIR_MAC_SET_APSD(x)              (((uint16_t) x) | 0x0800)
-#if defined WLAN_FEATURE_VOWIFI
 #define SIR_MAC_SET_RRM(x)               (((uint16_t) x) | 0x1000)
-#endif
 #define SIR_MAC_SET_GROUP_ACK(x)         (((uint16_t) x) | 0x4000)
 
 #ifdef WLAN_FEATURE_11AC
@@ -1992,8 +1985,6 @@ typedef struct sSirMacMeasReqActionFrame {
 } tSirMacMeasReqActionFrame, *tpSirMacMeasReqActionFrame;
 #endif
 
-#if defined WLAN_FEATURE_VOWIFI
-
 typedef struct sSirMacNeighborReportReq {
 	uint8_t dialogToken;
 	uint8_t ssid_present;
@@ -2039,8 +2030,6 @@ typedef struct sSirMacRadioMeasureReport {
 
 } tSirMacRadioMeasureReport, *tpSirMacRadioMeasureReport;
 
-#endif
-
 /* QOS action frame definitions */
 
 /* max number of possible tclas elements in any frame */

core/mac/inc/wni_api.h

@@ -117,7 +117,6 @@ enum eWniMsgTypes {
 	/* WOWL Messages */
 	eWNI_PMC_SMPS_STATE_IND,
 
-#if defined WLAN_FEATURE_VOWIFI
 	eWNI_SME_RRM_MSG_TYPE_BEGIN,
 
 	eWNI_SME_NEIGHBOR_REPORT_REQ_IND,
@@ -125,7 +124,6 @@ enum eWniMsgTypes {
 	eWNI_SME_BEACON_REPORT_REQ_IND,
 	eWNI_SME_BEACON_REPORT_RESP_XMIT_IND,
 
-#endif
 	eWNI_SME_ADD_STA_SELF_RSP,
 	eWNI_SME_DEL_STA_SELF_RSP,
 

core/mac/src/cfg/cfg_api.c

@@ -818,11 +818,9 @@ tSirRetStatus cfg_get_capability_info(tpAniSirGlobal pMac, uint16_t *pCap,
 	if (val)
 		pCapInfo->apsd = 1;
 
-#if defined WLAN_FEATURE_VOWIFI
 	pCapInfo->rrm = pMac->rrm.rrmSmeContext.rrmConfig.rrm_enabled;
 #if defined WLAN_VOWIFI_DEBUG
 	cfg_log(pMac, LOGE, FL("RRM = %d"), pCapInfo->rrm);
-#endif
 #endif
 	/* DSSS-OFDM */
 	/* FIXME : no config defined yet. */

core/mac/src/include/parser_api.h

@@ -601,12 +601,10 @@ populate_dot11f_ext_supp_rates(tpAniSirGlobal pMac,
 			uint8_t nChannelNum, tDot11fIEExtSuppRates *pDot11f,
 			tpPESession psessionEntry);
 
-#if defined WLAN_FEATURE_VOWIFI
 tSirRetStatus
 populate_dot11f_beacon_report(tpAniSirGlobal pMac,
 			tDot11fIEMeasurementReport *pDot11f,
 			tSirMacBeaconReport *pBeaconReport);
-#endif
 
 /**
  * \brief Populate a tDot11fIEExtSuppRates
@@ -887,7 +885,6 @@ tSirRetStatus populate_dot11_assoc_res_p2p_ie(tpAniSirGlobal pMac,
 tSirRetStatus populate_dot11f_wscInAssocRes(tpAniSirGlobal pMac,
 					tDot11fIEWscAssocRes *pDot11f);
 
-#if defined WLAN_FEATURE_VOWIFI
 tSirRetStatus populate_dot11f_wfatpc(tpAniSirGlobal pMac,
 				tDot11fIEWFATPC *pDot11f, uint8_t txPower,
 				uint8_t linkMargin);
@@ -895,7 +892,6 @@ tSirRetStatus populate_dot11f_wfatpc(tpAniSirGlobal pMac,
 tSirRetStatus populate_dot11f_rrm_ie(tpAniSirGlobal pMac,
 				tDot11fIERRMEnabledCap *pDot11f,
 				tpPESession psessionEntry);
-#endif
 
 void populate_mdie(tpAniSirGlobal pMac,
 		tDot11fIEMobilityDomain * pDot11f, uint8_t mdie[]);

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

@@ -274,11 +274,7 @@ typedef struct sPESession       /* Added to Support BT-AMP */
 
 	int8_t maxTxPower;   /* MIN (Regulatory and local power constraint) */
 	enum tQDF_ADAPTER_MODE pePersona;
-
-#if defined WLAN_FEATURE_VOWIFI
 	int8_t txMgmtPower;
-#endif
-
 	tAniBool is11Rconnection;
 
 #ifdef FEATURE_WLAN_ESE

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

@@ -38,7 +38,6 @@
 #ifndef __RRM_API_H__
 #define __RRM_API_H__
 
-#ifdef WLAN_FEATURE_VOWIFI
 #define RRM_MIN_TX_PWR_CAP    13
 #define RRM_MAX_TX_PWR_CAP    19
 
@@ -102,10 +101,4 @@ rrm_process_beacon_report_xmit(tpAniSirGlobal pMac,
 			       tpSirBeaconReportXmitInd pBcnReport);
 extern void lim_update_rrm_capability(tpAniSirGlobal mac_ctx,
 				      tpSirSmeJoinReq join_req);
-#else
-void lim_update_rrm_capability(tpAniSirGlobal mac_ctx,
-			       tpSirSmeJoinReq join_req)
-{
-}
-#endif
 #endif

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

@@ -61,9 +61,7 @@
 #include "lim_session.h"
 #include "wma_types.h"
 
-#if defined WLAN_FEATURE_VOWIFI
 #include "rrm_api.h"
-#endif
 
 #include <lim_ft.h>
 #include "qdf_types.h"
@@ -600,9 +598,7 @@ tSirRetStatus lim_initialize(tpAniSirGlobal pMac)
 	/* Initializations for maintaining peers in IBSS */
 	lim_ibss_init(pMac);
 
-#if defined WLAN_FEATURE_VOWIFI
 	rrm_initialize(pMac);
-#endif
 
 	qdf_mutex_create(&pMac->lim.lim_frame_register_lock);
 	qdf_list_create(&pMac->lim.gLimMgmtFrameRegistratinQueue, 0);
@@ -707,9 +703,7 @@ void lim_cleanup(tpAniSirGlobal pMac)
 	/* Now, finally reset the deferred message queue pointers */
 	lim_reset_deferred_msg_q(pMac);
 
-#if defined WLAN_FEATURE_VOWIFI
 	rrm_cleanup(pMac);
-#endif
 
 	lim_ft_cleanup_all_ft_sessions(pMac);
 

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

@@ -4204,10 +4204,8 @@ tSirRetStatus lim_sta_send_add_bss(tpAniSirGlobal pMac, tpSirAssocRsp pAssocRsp,
 			"could not Update the supported rates"));
 	pAddBssParams->staContext.encryptType = psessionEntry->encryptType;
 
-#if defined WLAN_FEATURE_VOWIFI
 	pAddBssParams->maxTxPower = psessionEntry->maxTxPower;
 	lim_log(pMac, LOG2, FL("maxTxPower: %d"), pAddBssParams->maxTxPower);
-#endif
 	/* FIXME_GEN4 - Any other value that can be used for initialization? */
 	pAddBssParams->status = QDF_STATUS_SUCCESS;
 	pAddBssParams->respReqd = true;
@@ -4733,10 +4731,8 @@ tSirRetStatus lim_sta_send_add_bss_pre_assoc(tpAniSirGlobal pMac, uint8_t update
 
 	pAddBssParams->staContext.encryptType = psessionEntry->encryptType;
 
-#if defined WLAN_FEATURE_VOWIFI
 	pAddBssParams->maxTxPower = psessionEntry->maxTxPower;
 	lim_log(pMac, LOG2, FL("maxTxPower: %d"), pAddBssParams->maxTxPower);
-#endif
 
 	pAddBssParams->status = QDF_STATUS_SUCCESS;
 	pAddBssParams->respReqd = true;

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

@@ -714,9 +714,7 @@ tSirRetStatus lim_ft_prepare_add_bss_req(tpAniSirGlobal pMac,
 		}
 	}
 
-#if defined WLAN_FEATURE_VOWIFI
 	pAddBssParams->maxTxPower = pftSessionEntry->maxTxPower;
-#endif
 
 #ifdef WLAN_FEATURE_11W
 	if (pftSessionEntry->limRmfEnabled) {

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

@@ -52,9 +52,7 @@
 #include "lim_admit_control.h"
 #include "wmm_apsd.h"
 #include "lim_send_messages.h"
-#if defined WLAN_FEATURE_VOWIFI
 #include "rrm_api.h"
-#endif
 #include "lim_session_utils.h"
 #include "cds_concurrency.h"
 #include "wma_types.h"
@@ -1350,7 +1348,6 @@ __lim_process_sm_power_save_update(tpAniSirGlobal pMac, uint8_t *pRxPacketInfo,
 				 pSta->staAddr, psessionEntry->smeSessionId);
 }
 
-#if defined WLAN_FEATURE_VOWIFI
 
 static void
 __lim_process_radio_measure_request(tpAniSirGlobal pMac, uint8_t *pRxPacketInfo,
@@ -1501,7 +1498,6 @@ __lim_process_neighbor_report(tpAniSirGlobal pMac, uint8_t *pRxPacketInfo,
 	qdf_mem_free(pFrm);
 }
 
-#endif
 
 #ifdef WLAN_FEATURE_11W
 /**
@@ -1911,7 +1907,6 @@ void lim_process_action_frame(tpAniSirGlobal mac_ctx,
 		}
 		break;
 
-#if defined WLAN_FEATURE_VOWIFI
 	case SIR_MAC_ACTION_RRM:
 #ifdef WLAN_FEATURE_11W
 		if (lim_drop_unprotected_action_frame(mac_ctx, session,
@@ -1948,7 +1943,7 @@ void lim_process_action_frame(tpAniSirGlobal mac_ctx,
 				FL("RRM frm ignored, it is disabled in cfg"));
 		}
 		break;
-#endif
+
 	case SIR_MAC_ACTION_VENDOR_SPECIFIC_CATEGORY:
 		vendor_specific = (tpSirMacVendorSpecificFrameHdr) action_hdr;
 		mac_hdr = NULL;

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

@@ -44,9 +44,7 @@
 #include "lim_utils.h"
 #include "lim_prop_exts_utils.h"
 #include "sch_api.h"
-#if defined WLAN_FEATURE_VOWIFI
 #include "rrm_api.h"
-#endif
 
 static void lim_update_config(tpAniSirGlobal pMac, tpPESession psessionEntry);
 

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

@@ -55,9 +55,7 @@
 #include "lim_session.h"
 #include "lim_send_messages.h"
 
-#if defined WLAN_FEATURE_VOWIFI
 #include "rrm_api.h"
-#endif
 
 #include "lim_ft.h"
 
@@ -1340,10 +1338,8 @@ void lim_process_messages(tpAniSirGlobal mac_ctx, tpSirMsgQ msg)
 	case eWNI_SME_GET_WPSPBC_SESSION_REQ:
 	case eWNI_SME_SET_APWPARSNIEs_REQ:
 	case eWNI_SME_CHNG_MCC_BEACON_INTERVAL:
-#if defined WLAN_FEATURE_VOWIFI
 	case eWNI_SME_NEIGHBOR_REPORT_REQ_IND:
 	case eWNI_SME_BEACON_REPORT_RESP_XMIT_IND:
-#endif
 #if defined FEATURE_WLAN_ESE
 	case eWNI_SME_ESE_ADJACENT_AP_REPORT:
 #endif
@@ -1628,9 +1624,7 @@ void lim_process_messages(tpAniSirGlobal mac_ctx, tpSirMsgQ msg)
 		msg->bodyptr = NULL;
 		break;
 	case WMA_SET_MAX_TX_POWER_RSP:
-#if defined WLAN_FEATURE_VOWIFI
 		rrm_set_max_tx_power_rsp(mac_ctx, msg);
-#endif
 		if (msg->bodyptr != NULL) {
 			qdf_mem_free((void *)msg->bodyptr);
 			msg->bodyptr = NULL;

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

@@ -663,9 +663,7 @@ lim_mlm_add_bss(tpAniSirGlobal mac_ctx,
 	addbss_param->bProxyProbeRespEn = 0;
 	addbss_param->obssProtEnabled = mlm_start_req->obssProtEnabled;
 
-#if defined WLAN_FEATURE_VOWIFI
 	addbss_param->maxTxPower = session->maxTxPower;
-#endif
 	mlm_add_sta(mac_ctx, &addbss_param->staContext,
 		    addbss_param->bssId, addbss_param->htCapable,
 		    session);
@@ -2893,9 +2891,6 @@ void lim_set_channel(tpAniSirGlobal mac_ctx, uint8_t channel,
 		     phy_ch_width ch_width, int8_t max_tx_power,
 		     uint8_t pe_session_id)
 {
-#if !defined WLAN_FEATURE_VOWIFI
-	uint32_t localPwrConstraint;
-#endif
 	tpPESession pe_session;
 	pe_session = pe_find_session_by_session_id(mac_ctx, pe_session_id);
 
@@ -2904,21 +2899,7 @@ void lim_set_channel(tpAniSirGlobal mac_ctx, uint8_t channel,
 			pe_session_id);
 		return;
 	}
-#if defined WLAN_FEATURE_VOWIFI
 	lim_send_switch_chnl_params(mac_ctx, channel, ch_center_freq_seg0,
 				    ch_center_freq_seg1, ch_width,
 				    max_tx_power, pe_session_id, false);
-#else
-	if (wlan_cfg_get_int(mac_ctx, WNI_CFG_LOCAL_POWER_CONSTRAINT,
-			    &localPwrConstraint) != eSIR_SUCCESS) {
-		lim_log(mac_ctx, LOGP,
-			FL("couldn't read CFG_LOCAL_POWER_CONSTRAINT"));
-		return;
-	}
-	/* Send WMA_CHNL_SWITCH_IND to HAL */
-	lim_send_switch_chnl_params(mac_ctx, channel, ch_center_freq_seg0,
-				    ch_center_freq_seg1, ch_width,
-				    (int8_t)localPwrConstraint,
-				    pe_session_id, false);
-#endif
 }

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

@@ -44,9 +44,7 @@
 #include "lim_ft_defs.h"
 #include "lim_session.h"
 #include "lim_session_utils.h"
-#if defined WLAN_FEATURE_VOWIFI
 #include "rrm_api.h"
-#endif
 #include "wma_types.h"
 #include "cds_utils.h"
 #include "lim_types.h"
@@ -2771,9 +2769,7 @@ lim_process_sta_mlm_add_bss_rsp_ft(tpAniSirGlobal pMac, tpSirMsgQ limMsgQ,
 	pStaDs->ucUcastSig = pAddBssParams->staContext.ucUcastSig;
 	pStaDs->ucBcastSig = pAddBssParams->staContext.ucBcastSig;
 
-#if defined WLAN_FEATURE_VOWIFI
 	rrm_cache_mgmt_tx_power(pMac, pAddBssParams->txMgmtPower, psessionEntry);
-#endif
 
 	pAddStaParams = qdf_mem_malloc(sizeof(tAddStaParams));
 	if (NULL == pAddStaParams) {
@@ -3027,10 +3023,8 @@ lim_process_sta_mlm_add_bss_rsp(tpAniSirGlobal mac_ctx,
 			lim_send_edca_params(mac_ctx,
 				session_entry->gLimEdcaParamsActive,
 				sta_ds->bssId);
-#if defined WLAN_FEATURE_VOWIFI
 			rrm_cache_mgmt_tx_power(mac_ctx,
 				add_bss_params->txMgmtPower, session_entry);
-#endif
 			if (lim_add_sta_self(mac_ctx, sta_idx, update_sta,
 				session_entry) != eSIR_SUCCESS) {
 				/* Add STA context at HW */
@@ -3638,11 +3632,9 @@ void lim_process_switch_channel_rsp(tpAniSirGlobal pMac, void *body)
 			FL("session does not exist for given sessionId"));
 		return;
 	}
-#if defined WLAN_FEATURE_VOWIFI
 	/* HAL fills in the tx power used for mgmt frames in this field. */
 	/* Store this value to use in TPC report IE. */
 	rrm_cache_mgmt_tx_power(pMac, pChnlParams->txMgmtPower, psessionEntry);
-#endif
 	channelChangeReasonCode = psessionEntry->channelChangeReasonCode;
 	/* initialize it back to invalid id */
 	psessionEntry->chainMask = pChnlParams->chainMask;

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

@@ -2017,7 +2017,6 @@ end:
 		sme_transaction_id);
 }
 
-#if defined FEATURE_WLAN_ESE || defined WLAN_FEATURE_VOWIFI
 uint8_t lim_get_max_tx_power(int8_t regMax, int8_t apTxPower,
 			     uint8_t iniTxPower)
 {
@@ -2033,7 +2032,6 @@ uint8_t lim_get_max_tx_power(int8_t regMax, int8_t apTxPower,
 
 	return maxTxPower;
 }
-#endif
 
 /**
  * __lim_process_sme_reassoc_req() - process reassoc req
@@ -4386,7 +4384,6 @@ static void __lim_process_sme_set_ht2040_mode(tpAniSirGlobal pMac,
 
 void __lim_process_report_message(tpAniSirGlobal pMac, tpSirMsgQ pMsg)
 {
-#ifdef WLAN_FEATURE_VOWIFI
 	switch (pMsg->type) {
 	case eWNI_SME_NEIGHBOR_REPORT_REQ_IND:
 		rrm_process_neighbor_report_req(pMac, pMsg->bodyptr);
@@ -4397,10 +4394,8 @@ void __lim_process_report_message(tpAniSirGlobal pMac, tpSirMsgQ pMsg)
 	default:
 		lim_log(pMac, LOGE, FL("Invalid msg type:%d"), pMsg->type);
 	}
-#endif
 }
 
-#if defined(FEATURE_WLAN_ESE) || defined(WLAN_FEATURE_VOWIFI)
 /* -------------------------------------------------------------------- */
 /**
  * lim_send_set_max_tx_power_req
@@ -4469,7 +4464,6 @@ lim_send_set_max_tx_power_req(tpAniSirGlobal pMac, int8_t txPower,
 	}
 	return retCode;
 }
-#endif
 
 /**
  * __lim_process_sme_register_mgmt_frame_req() - process sme reg mgmt frame req
@@ -4853,12 +4847,10 @@ bool lim_process_sme_req_messages(tpAniSirGlobal pMac, tpSirMsgQ pMsg)
 		break;
 #endif
 
-#if defined WLAN_FEATURE_VOWIFI
 	case eWNI_SME_NEIGHBOR_REPORT_REQ_IND:
 	case eWNI_SME_BEACON_REPORT_RESP_XMIT_IND:
 		__lim_process_report_message(pMac, pMsg);
 		break;
-#endif
 
 	case eWNI_SME_FT_PRE_AUTH_REQ:
 		bufConsumed = (bool) lim_process_ft_pre_auth_req(pMac, pMsg);

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

@@ -78,9 +78,6 @@ lim_extract_ap_capability(tpAniSirGlobal mac_ctx, uint8_t *p_ie,
 	int8_t *local_constraint, tpPESession session)
 {
 	tSirProbeRespBeacon *beacon_struct;
-#if !defined WLAN_FEATURE_VOWIFI
-	uint32_t local_power_constraints = 0;
-#endif
 	uint32_t enable_txbf_20mhz;
 	tSirRetStatus cfg_set_status = eSIR_FAILURE;
 	tSirRetStatus cfg_get_status = eSIR_FAILURE;
@@ -213,25 +210,10 @@ lim_extract_ap_capability(tpAniSirGlobal mac_ctx, uint8_t *p_ie,
 			beacon_struct->is_ese_ver_ie_present;
 #endif
 		if (beacon_struct->powerConstraintPresent) {
-#if defined WLAN_FEATURE_VOWIFI
 			*local_constraint -=
 				beacon_struct->localPowerConstraint.
 				localPowerConstraints;
-#else
-			local_power_constraints =
-				(uint32_t) beacon_struct->localPowerConstraint.
-				localPowerConstraints;
-#endif
 		}
-#if !defined WLAN_FEATURE_VOWIFI
-		if (cfg_set_int
-			    (mac_ctx, WNI_CFG_LOCAL_POWER_CONSTRAINT,
-			    local_power_constraints) != eSIR_SUCCESS) {
-			lim_log(mac_ctx, LOGP,
-				FL
-					("Could not update local power constraint to cfg."));
-		}
-#endif
 		session->country_info_present = false;
 		/* Initializing before first use */
 		if (beacon_struct->countryInfoPresent)

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

@@ -41,9 +41,7 @@
 #include "lim_api.h"
 #include "lim_ft_defs.h"
 #include "lim_session.h"
-#if defined WLAN_FEATURE_VOWIFI
 #include "rrm_api.h"
-#endif
 #include "cds_utils.h"
 
 
@@ -67,24 +65,16 @@
  * @param  pMac - Pointer to Global MAC structure
  * @param  pBPR - Pointer to parsed Beacon/Probe Response structure
  * @param  pRxPacketInfo  - Pointer to Received frame's BD
- * ---------if defined WLAN_FEATURE_VOWIFI------
  * @param  fScanning - flag to indicate if it is during scan.
  * ---------------------------------------------
  *
  * @return None
  */
-#if defined WLAN_FEATURE_VOWIFI
 QDF_STATUS
 lim_collect_bss_description(tpAniSirGlobal pMac,
 			    tSirBssDescription *pBssDescr,
 			    tpSirProbeRespBeacon pBPR,
 			    uint8_t *pRxPacketInfo, uint8_t fScanning)
-#else
-QDF_STATUS
-lim_collect_bss_description(tpAniSirGlobal pMac,
-			    tSirBssDescription *pBssDescr,
-			    tpSirProbeRespBeacon pBPR, uint8_t *pRxPacketInfo)
-#endif
 {
 	uint8_t *pBody;
 	uint32_t ieLen = 0;
@@ -193,12 +183,10 @@ lim_collect_bss_description(tpAniSirGlobal pMac,
 	lim_log(pMac, LOG1, FL("BSSID: "MAC_ADDRESS_STR " tsf_delta = %u"),
 			    MAC_ADDR_ARRAY(pHdr->bssId), pBssDescr->tsf_delta);
 
-#if defined WLAN_FEATURE_VOWIFI
 	if (fScanning) {
 		rrm_get_start_tsf(pMac, pBssDescr->startTSF);
 		pBssDescr->parentTSF = WMA_GET_RX_TIMESTAMP(pRxPacketInfo);
 	}
-#endif
 
 	/* MobilityDomain */
 	pBssDescr->mdie[0] = 0;
@@ -393,17 +381,10 @@ lim_check_and_add_bss_description(tpAniSirGlobal mac_ctx,
 		return;
 	}
 	/* In scan state, store scan result. */
-#if defined WLAN_FEATURE_VOWIFI
 	status = lim_collect_bss_description(mac_ctx, bssdescr,
 					     bpr, rx_packet_info, scanning);
 	if (QDF_STATUS_SUCCESS != status)
 		goto last;
-#else
-	status = lim_collect_bss_description(mac_ctx, bssdescr,
-					     bpr, rx_packet_info);
-	if (QDF_STATUS_SUCCESS != status)
-		goto last;
-#endif
 	bssdescr->fProbeRsp = fProbeRsp;
 
 	/*

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

@@ -46,14 +46,8 @@ void lim_restore_pre_scan_state(tpAniSirGlobal);
 void lim_copy_scan_result(tpAniSirGlobal, uint8_t *);
 void lim_check_and_add_bss_description(tpAniSirGlobal, tpSirProbeRespBeacon,
 				       uint8_t *, bool, uint8_t);
-#if defined WLAN_FEATURE_VOWIFI
+QDF_STATUS lim_collect_bss_description(tpAniSirGlobal pMac,
-QDF_STATUS lim_collect_bss_description(tpAniSirGlobal,
+			    tSirBssDescription *pBssDescr,
-				       tSirBssDescription *,
+			    tpSirProbeRespBeacon pBPR,
-				       tpSirProbeRespBeacon, uint8_t *, uint8_t);
+			    uint8_t *pRxPacketInfo, uint8_t fScanning);
-#else
-QDF_STATUS lim_collect_bss_description(tpAniSirGlobal,
-				       tSirBssDescription *,
-				       tpSirProbeRespBeacon, uint8_t *);
-#endif
-
 #endif /* __LIM_SCAN_UTILS_H */

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

@@ -58,9 +58,7 @@
 #include "qdf_trace.h"
 #include "cds_utils.h"
 #include "sme_trace.h"
-#if defined WLAN_FEATURE_VOWIFI
 #include "rrm_api.h"
-#endif
 
 #include "wma_types.h"
 
@@ -288,7 +286,6 @@ lim_send_probe_req_mgmt_frame(tpAniSirGlobal mac_ctx,
 		}
 	}
 
-#if defined WLAN_FEATURE_VOWIFI
 	/*
 	 * Table 7-14 in IEEE Std. 802.11k-2008 says
 	 * DS params "can" be present in RRM is disabled and "is" present if
@@ -300,7 +297,6 @@ lim_send_probe_req_mgmt_frame(tpAniSirGlobal mac_ctx,
 	txPower = (uint8_t) rrm_get_mgmt_tx_power(mac_ctx, pesession);
 	populate_dot11f_wfatpc(mac_ctx, &pr.WFATPC, txPower, 0);
 
-#endif
 
 	if (pesession != NULL) {
 		pesession->htCapability = IS_DOT11_MODE_HT(dot11mode);
@@ -1594,9 +1590,7 @@ lim_send_assoc_req_mgmt_frame(tpAniSirGlobal mac_ctx,
 	uint16_t add_ie_len;
 	uint8_t *add_ie;
 	uint8_t *wps_ie = NULL;
-#if defined WLAN_FEATURE_VOWIFI
 	uint8_t power_caps = false;
-#endif
 	uint8_t tx_flag = 0;
 	uint8_t sme_sessionid = 0;
 	bool vht_enabled = false;
@@ -1694,17 +1688,14 @@ lim_send_assoc_req_mgmt_frame(tpAniSirGlobal mac_ctx,
 
 	if (pe_session->lim11hEnable &&
 	    pe_session->pLimJoinReq->spectrumMgtIndicator == eSIR_TRUE) {
-#if defined WLAN_FEATURE_VOWIFI
 		power_caps = true;
 
 		populate_dot11f_power_caps(mac_ctx, &frm->PowerCaps,
 			LIM_ASSOC, pe_session);
-#endif
 		populate_dot11f_supp_channels(mac_ctx, &frm->SuppChannels,
 			LIM_ASSOC, pe_session);
 
 	}
-#if defined WLAN_FEATURE_VOWIFI
 	if (mac_ctx->rrm.rrmPEContext.rrmEnable &&
 	    SIR_MAC_GET_RRM(pe_session->limCurrentBssCaps)) {
 		if (power_caps == false) {
@@ -1713,8 +1704,6 @@ lim_send_assoc_req_mgmt_frame(tpAniSirGlobal mac_ctx,
 				LIM_ASSOC, pe_session);
 		}
 	}
-#endif
-
 	if (qos_enabled)
 		populate_dot11f_qos_caps_station(mac_ctx, &frm->QOSCapsStation);
 
@@ -1722,12 +1711,11 @@ lim_send_assoc_req_mgmt_frame(tpAniSirGlobal mac_ctx,
 		POPULATE_DOT11F_RATES_OPERATIONAL, &frm->ExtSuppRates,
 		pe_session);
 
-#if defined WLAN_FEATURE_VOWIFI
 	if (mac_ctx->rrm.rrmPEContext.rrmEnable &&
 	    SIR_MAC_GET_RRM(pe_session->limCurrentBssCaps))
 		populate_dot11f_rrm_ie(mac_ctx, &frm->RRMEnabledCap,
 			pe_session);
-#endif
+
 	/*
 	 * The join request *should* contain zero or one of the WPA and RSN
 	 * IEs.  The payload send along with the request is a
@@ -1997,9 +1985,7 @@ lim_send_reassoc_req_with_ft_ies_mgmt_frame(tpAniSirGlobal mac_ctx,
 	uint8_t qos_enabled, wme_enabled, wsm_enabled;
 	void *packet;
 	QDF_STATUS qdf_status;
-#if defined WLAN_FEATURE_VOWIFI
 	uint8_t power_caps_populated = false;
-#endif
 	uint16_t ft_ies_length = 0;
 	uint8_t *body;
 	uint16_t add_ie_len;
@@ -2067,16 +2053,13 @@ lim_send_reassoc_req_with_ft_ies_mgmt_frame(tpAniSirGlobal mac_ctx,
 
 	if (pe_session->lim11hEnable &&
 	    pe_session->pLimReAssocReq->spectrumMgtIndicator == eSIR_TRUE) {
-#if defined WLAN_FEATURE_VOWIFI
 		power_caps_populated = true;
 
 		populate_dot11f_power_caps(mac_ctx, &frm.PowerCaps,
 					   LIM_REASSOC, pe_session);
 		populate_dot11f_supp_channels(mac_ctx, &frm.SuppChannels,
 			LIM_REASSOC, pe_session);
-#endif
 	}
-#if defined WLAN_FEATURE_VOWIFI
 	if (mac_ctx->rrm.rrmPEContext.rrmEnable &&
 	    SIR_MAC_GET_RRM(pe_session->limCurrentBssCaps)) {
 		if (power_caps_populated == false) {
@@ -2085,7 +2068,6 @@ lim_send_reassoc_req_with_ft_ies_mgmt_frame(tpAniSirGlobal mac_ctx,
 				LIM_REASSOC, pe_session);
 		}
 	}
-#endif
 
 	if (qos_enabled)
 		populate_dot11f_qos_caps_station(mac_ctx, &frm.QOSCapsStation);
@@ -2094,11 +2076,9 @@ lim_send_reassoc_req_with_ft_ies_mgmt_frame(tpAniSirGlobal mac_ctx,
 		POPULATE_DOT11F_RATES_OPERATIONAL, &frm.ExtSuppRates,
 		pe_session);
 
-#if defined WLAN_FEATURE_VOWIFI
 	if (mac_ctx->rrm.rrmPEContext.rrmEnable &&
 	    SIR_MAC_GET_RRM(pe_session->limCurrentBssCaps))
 		populate_dot11f_rrm_ie(mac_ctx, &frm.RRMEnabledCap, pe_session);
-#endif
 
 	/*
 	 * Ideally this should be enabled for 11r also. But 11r does
@@ -2472,9 +2452,7 @@ lim_send_reassoc_req_mgmt_frame(tpAniSirGlobal pMac,
 	uint8_t *pAddIE;
 	uint8_t *wpsIe = NULL;
 	uint8_t txFlag = 0;
-#if defined WLAN_FEATURE_VOWIFI
 	uint8_t PowerCapsPopulated = false;
-#endif
 	uint8_t smeSessionId = 0;
 	bool isVHTEnabled = false;
 	tpSirMacMgmtHdr pMacHdr;
@@ -2527,15 +2505,12 @@ lim_send_reassoc_req_mgmt_frame(tpAniSirGlobal pMac,
 
 	if (psessionEntry->lim11hEnable &&
 	    psessionEntry->pLimReAssocReq->spectrumMgtIndicator == eSIR_TRUE) {
-#if defined WLAN_FEATURE_VOWIFI
 		PowerCapsPopulated = true;
 		populate_dot11f_power_caps(pMac, &frm.PowerCaps, LIM_REASSOC,
 					   psessionEntry);
 		populate_dot11f_supp_channels(pMac, &frm.SuppChannels, LIM_REASSOC,
 					      psessionEntry);
-#endif
 	}
-#if defined WLAN_FEATURE_VOWIFI
 	if (pMac->rrm.rrmPEContext.rrmEnable &&
 	    SIR_MAC_GET_RRM(psessionEntry->limCurrentBssCaps)) {
 		if (PowerCapsPopulated == false) {
@@ -2544,7 +2519,6 @@ lim_send_reassoc_req_mgmt_frame(tpAniSirGlobal pMac,
 						   LIM_REASSOC, psessionEntry);
 		}
 	}
-#endif
 
 	if (fQosEnabled)
 		populate_dot11f_qos_caps_station(pMac, &frm.QOSCapsStation);
@@ -2552,11 +2526,9 @@ lim_send_reassoc_req_mgmt_frame(tpAniSirGlobal pMac,
 	populate_dot11f_ext_supp_rates(pMac, POPULATE_DOT11F_RATES_OPERATIONAL,
 				       &frm.ExtSuppRates, psessionEntry);
 
-#if defined WLAN_FEATURE_VOWIFI
 	if (pMac->rrm.rrmPEContext.rrmEnable &&
 	    SIR_MAC_GET_RRM(psessionEntry->limCurrentBssCaps))
 		populate_dot11f_rrm_ie(pMac, &frm.RRMEnabledCap, psessionEntry);
-#endif
 	/* The join request *should* contain zero or one of the WPA and RSN */
 	/* IEs.  The payload send along with the request is a */
 	/* 'tSirSmeJoinReq'; the IE portion is held inside a 'tSirRSNie': */
@@ -4335,8 +4307,6 @@ lim_send_vht_opmode_notification_frame(tpAniSirGlobal pMac,
 	return eSIR_SUCCESS;
 }
 
-#if defined WLAN_FEATURE_VOWIFI
-
 /**
  * \brief Send a Neighbor Report Request Action frame
  *
@@ -4842,8 +4812,6 @@ returnAfterError:
 	return statusCode;
 }
 
-#endif
-
 #ifdef WLAN_FEATURE_11W
 /**
  * \brief Send SA query request action frame to peer

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

@@ -61,10 +61,8 @@ static tBeaconFilterIe beacon_filter_table[] = {
 	{SIR_MAC_CHNL_SWITCH_ANN_EID, 1, {0, 0, 0, 0} },
 	{SIR_MAC_HT_INFO_EID, 0, {0, 0, HT_BYTE0_FILTER_MASK, 0} },
 	{SIR_MAC_HT_INFO_EID, 0, {2, 0, HT_BYTE2_FILTER_MASK, 0} },
-	{SIR_MAC_HT_INFO_EID, 0, {5, 0, HT_BYTE5_FILTER_MASK, 0} }
+	{SIR_MAC_HT_INFO_EID, 0, {5, 0, HT_BYTE5_FILTER_MASK, 0} },
-#if defined WLAN_FEATURE_VOWIFI
+	{SIR_MAC_PWR_CONSTRAINT_EID, 0, {0, 0, 0, 0} }
-	, {SIR_MAC_PWR_CONSTRAINT_EID, 0, {0, 0, 0, 0} }
-#endif
 #ifdef WLAN_FEATURE_11AC
 	, {SIR_MAC_VHT_OPMODE_EID, 0, {0, 0, 0, 0} }
 	, {SIR_MAC_VHT_OPERATION_EID, 0, {0, 0, VHTOP_CHWIDTH_MASK, 0} }
@@ -205,16 +203,6 @@ tSirRetStatus lim_send_beacon_params(tpAniSirGlobal pMac,
  *
  * @return success if message send is ok, else false.
  */
-#if !defined WLAN_FEATURE_VOWIFI
-tSirRetStatus lim_send_switch_chnl_params(tpAniSirGlobal pMac,
-					  uint8_t chnlNumber,
-					  uint8_t ch_center_freq_seg0,
-					  uint8_t ch_center_freq_seg1,
-					  phy_ch_width ch_width,
-					  uint8_t localPwrConstraint,
-					  uint8_t peSessionId,
-					  uint8_t is_restart)
-#else
 tSirRetStatus lim_send_switch_chnl_params(tpAniSirGlobal pMac,
 					  uint8_t chnlNumber,
 					  uint8_t ch_center_freq_seg0,
@@ -223,7 +211,6 @@ tSirRetStatus lim_send_switch_chnl_params(tpAniSirGlobal pMac,
 					  int8_t maxTxPower,
 					  uint8_t peSessionId,
 					  uint8_t is_restart)
-#endif
 {
 	tpSwitchChannelParams pChnlParams = NULL;
 	tSirMsgQ msgQ;
@@ -248,11 +235,7 @@ tSirRetStatus lim_send_switch_chnl_params(tpAniSirGlobal pMac,
 	pChnlParams->ch_width = ch_width;
 	qdf_mem_copy(pChnlParams->selfStaMacAddr, pSessionEntry->selfMacAddr,
 		     sizeof(tSirMacAddr));
-#if defined WLAN_FEATURE_VOWIFI
 	pChnlParams->maxTxPower = maxTxPower;
-#else
-	pChnlParams->localPowerConstraint = localPwrConstraint;
-#endif
 	qdf_mem_copy(pChnlParams->bssId, pSessionEntry->bssId,
 		     sizeof(tSirMacAddr));
 	pChnlParams->peSessionId = peSessionId;
@@ -277,18 +260,10 @@ tSirRetStatus lim_send_switch_chnl_params(tpAniSirGlobal pMac,
 	msgQ.reserved = 0;
 	msgQ.bodyptr = pChnlParams;
 	msgQ.bodyval = 0;
-#if defined WLAN_FEATURE_VOWIFI
 	PELOG3(lim_log(pMac, LOG3, FL(
 		"Sending CH_SWITCH_REQ, ch_width %d, ch_num %d, maxTxPower %d"),
 		       pChnlParams->ch_width,
 		       pChnlParams->channelNumber, pChnlParams->maxTxPower);)
-#else
-	PELOG3(lim_log(pMac, LOG3, FL(
-		"Sending CH_SWITCH_REQ, ch_width %d, ch_num %d, local_pwr_constraint %d"),
-		       pChnlParams->ch_width,
-		       pChnlParams->channelNumber,
-		       pChnlParams->localPowerConstraint);)
-#endif
 	MTRACE(mac_trace_msg_tx(pMac, peSessionId, msgQ.type));
 	if (eSIR_SUCCESS != wma_post_ctrl_msg(pMac, &msgQ)) {
 		qdf_mem_free(pChnlParams);

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

@@ -63,7 +63,6 @@ tSirRetStatus lim_set_membership(tpAniSirGlobal pMac,
 tSirRetStatus lim_set_user_pos(tpAniSirGlobal pMac,
 			       tUpdateUserPos *pTempParam,
 			       tpPESession psessionEntry);
-#if defined WLAN_FEATURE_VOWIFI
 tSirRetStatus lim_send_switch_chnl_params(tpAniSirGlobal pMac,
 					  uint8_t chnlNumber,
 					  uint8_t ch_center_freq_seg0,
@@ -72,16 +71,6 @@ tSirRetStatus lim_send_switch_chnl_params(tpAniSirGlobal pMac,
 					  int8_t maxTxPower,
 					  uint8_t peSessionId,
 					  uint8_t is_restart);
-#else
-tSirRetStatus lim_send_switch_chnl_params(tpAniSirGlobal pMac,
-					  uint8_t chnlNumber,
-					  uint8_t ch_center_freq_seg0,
-					  uint8_t ch_center_freq_seg1,
-					  phy_ch_width ch_width,
-					  uint8_t localPwrConstraint,
-					  uint8_t peSessionId,
-					  uint8_t is_restart);
-#endif
 tSirRetStatus lim_send_edca_params(tpAniSirGlobal pMac,
 				   tSirMacEdcaParamRecord *pUpdatedEdcaParams,
 				   uint16_t bssIdx);

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

@@ -497,7 +497,6 @@ tSirRetStatus lim_send_vht_opmode_notification_frame(tpAniSirGlobal pMac,
 						     tSirMacAddr peer, uint8_t nMode,
 						     tpPESession psessionEntry);
 
-#if defined WLAN_FEATURE_VOWIFI
 tSirRetStatus lim_send_neighbor_report_request_frame(tpAniSirGlobal,
 						     tpSirMacNeighborReportReq,
 						     tSirMacAddr, tpPESession);
@@ -507,7 +506,6 @@ tSirRetStatus lim_send_radio_measure_report_action_frame(tpAniSirGlobal, uint8_t
 							 uint8_t,
 							 tpSirMacRadioMeasureReport,
 							 tSirMacAddr, tpPESession);
-#endif
 
 
 #ifdef FEATURE_WLAN_TDLS

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

@@ -2701,9 +2701,6 @@ void lim_switch_channel_cback(tpAniSirGlobal pMac, QDF_STATUS status,
 void lim_switch_primary_channel(tpAniSirGlobal pMac, uint8_t newChannel,
 				tpPESession psessionEntry)
 {
-#if !defined WLAN_FEATURE_VOWIFI
-	uint32_t localPwrConstraint;
-#endif
 
 	PELOG3(lim_log
 		       (pMac, LOG3,
@@ -2718,22 +2715,9 @@ void lim_switch_primary_channel(tpAniSirGlobal pMac, uint8_t newChannel,
 	pMac->lim.gpchangeChannelCallback = lim_switch_channel_cback;
 	pMac->lim.gpchangeChannelData = NULL;
 
-#if defined WLAN_FEATURE_VOWIFI
 	lim_send_switch_chnl_params(pMac, newChannel, 0, 0, CH_WIDTH_20MHZ,
 				    psessionEntry->maxTxPower,
 				    psessionEntry->peSessionId, false);
-#else
-	if (wlan_cfg_get_int
-		    (pMac, WNI_CFG_LOCAL_POWER_CONSTRAINT,
-		    &localPwrConstraint) != eSIR_SUCCESS) {
-		lim_log(pMac, LOGP,
-			FL("Unable to read Local Power Constraint from cfg"));
-		return;
-	}
-	lim_send_switch_chnl_params(pMac, newChannel, 0, 0, CH_WIDTH_20MHZ,
-				    localPwrConstraint,
-				    psessionEntry->peSessionId, false);
-#endif
 	return;
 }
 
@@ -2763,19 +2747,8 @@ void lim_switch_primary_secondary_channel(tpAniSirGlobal pMac,
 					uint8_t ch_center_freq_seg1,
 					phy_ch_width ch_width)
 {
-#if !defined WLAN_FEATURE_VOWIFI
-	uint32_t localPwrConstraint;
-#endif
 	uint8_t subband = 0;
-#if !defined WLAN_FEATURE_VOWIFI
+
-	if (wlan_cfg_get_int
-		    (pMac, WNI_CFG_LOCAL_POWER_CONSTRAINT,
-		    &localPwrConstraint) != eSIR_SUCCESS) {
-		lim_log(pMac, LOGP,
-			FL("Unable to get Local Power Constraint from cfg"));
-		return;
-	}
-#endif
 	/* Assign the callback to resume TX once channel is changed. */
 	psessionEntry->currentReqChannel = newChannel;
 	psessionEntry->limRFBand = lim_get_rf_band(newChannel);
@@ -2783,18 +2756,11 @@ void lim_switch_primary_secondary_channel(tpAniSirGlobal pMac,
 	pMac->lim.gpchangeChannelCallback = lim_switch_channel_cback;
 	pMac->lim.gpchangeChannelData = NULL;
 
-#if defined WLAN_FEATURE_VOWIFI
 	lim_send_switch_chnl_params(pMac, newChannel, ch_center_freq_seg0,
 					ch_center_freq_seg1, ch_width,
 					psessionEntry->maxTxPower,
 					psessionEntry->peSessionId,
 					false);
-#else
-	lim_send_switch_chnl_params(pMac, newChannel, ch_center_freq_seg0,
-					ch_center_freq_seg1, ch_width,
-					psessionEntry->peSessionId,
-					false);
-#endif
 
 	/* Store the new primary and secondary channel in session entries if different */
 	if (psessionEntry->currentOperChannel != newChannel) {
@@ -4888,25 +4854,12 @@ void lim_update_sta_run_time_ht_switch_chnl_params(tpAniSirGlobal pMac,
 						   tpPESession psessionEntry)
 {
 	uint8_t center_freq = 0;
-#if !defined WLAN_FEATURE_VOWIFI
-	uint32_t localPwrConstraint;
-#endif
 
 	/* If self capability is set to '20Mhz only', then do not change the CB mode. */
 	if (!lim_get_ht_capability
 		    (pMac, eHT_SUPPORTED_CHANNEL_WIDTH_SET, psessionEntry))
 		return;
 
-#if !defined WLAN_FEATURE_VOWIFI
-	if (wlan_cfg_get_int
-		    (pMac, WNI_CFG_LOCAL_POWER_CONSTRAINT,
-		    &localPwrConstraint) != eSIR_SUCCESS) {
-		lim_log(pMac, LOGP,
-			FL("Unable to get Local Power Constraint from cfg"));
-		return;
-	}
-#endif
-
 	if (psessionEntry->ftPEContext.ftPreAuthSession) {
 		lim_log(pMac, LOGE,
 			FL("FT PREAUTH channel change is in progress"));
@@ -4957,21 +4910,12 @@ void lim_update_sta_run_time_ht_switch_chnl_params(tpAniSirGlobal pMac,
 		pMac->lim.gpchangeChannelCallback = NULL;
 		pMac->lim.gpchangeChannelData = NULL;
 
-#if defined WLAN_FEATURE_VOWIFI
 		lim_send_switch_chnl_params(pMac, (uint8_t) pHTInfo->primaryChannel,
 					    center_freq, 0,
 					    psessionEntry->htRecommendedTxWidthSet,
 					    psessionEntry->maxTxPower,
 					    psessionEntry->peSessionId,
 					    true);
-#else
-		lim_send_switch_chnl_params(pMac, (uint8_t) pHTInfo->primaryChannel,
-					    center_freq, 0,
-					    psessionEntry->htRecommendedTxWidthSet,
-					    (int8_t)localPwrConstraint,
-					    psessionEntry->peSessionId,
-					    true);
-#endif
 
 		/* In case of IBSS, if STA should update HT Info IE in its beacons. */
 		if (LIM_IS_IBSS_ROLE(psessionEntry)) {

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

@@ -91,13 +91,11 @@ void lim_print_sme_state(tpAniSirGlobal pMac, uint16_t logLevel,
 		tLimSmeStates state);
 void lim_print_msg_name(tpAniSirGlobal pMac, uint16_t logLevel, uint32_t msgType);
 
-#if defined FEATURE_WLAN_ESE || defined WLAN_FEATURE_VOWIFI
 extern tSirRetStatus lim_send_set_max_tx_power_req(tpAniSirGlobal pMac,
 		int8_t txPower,
 		tpPESession pSessionEntry);
 extern uint8_t lim_get_max_tx_power(int8_t regMax, int8_t apTxPower,
 		uint8_t iniTxPower);
-#endif
 uint8_t lim_is_addr_bc(tSirMacAddr);
 uint8_t lim_is_group_addr(tSirMacAddr);
 

core/mac/src/pe/rrm/rrm_api.c

@@ -35,7 +35,6 @@
 
 /* $Header$ */
 
-#if defined WLAN_FEATURE_VOWIFI
 
 /*--------------------------------------------------------------------------
    Include Files
@@ -1460,5 +1459,3 @@ void lim_update_rrm_capability(tpAniSirGlobal mac_ctx,
 
 	return;
 }
-
-#endif

core/mac/src/pe/sch/sch_beacon_process.c

@@ -50,9 +50,7 @@
 #include "lim_send_messages.h"
 #include "lim_sta_hash_api.h"
 
-#if defined WLAN_FEATURE_VOWIFI
 #include "rrm_api.h"
-#endif
 
 #ifdef FEATURE_WLAN_DIAG_SUPPORT
 #include "host_diag_core_log.h"
@@ -724,9 +722,7 @@ static void __sch_beacon_process_for_session(tpAniSirGlobal mac_ctx,
 #ifdef WLAN_FEATURE_11AC
 	tpSirMacMgmtHdr pMh = WMA_GET_RX_MAC_HEADER(rx_pkt_info);
 #endif
-#if defined FEATURE_WLAN_ESE || defined WLAN_FEATURE_VOWIFI
 	int8_t regMax = 0, maxTxPower = 0;
-#endif
 	qdf_mem_zero(&beaconParams, sizeof(tUpdateBeaconParams));
 	beaconParams.paramChangeBitmap = 0;
 
@@ -772,13 +768,10 @@ static void __sch_beacon_process_for_session(tpAniSirGlobal mac_ctx,
 					&beaconParams, &sendProbeReq, pMh);
 #endif
 
-#if defined (FEATURE_WLAN_ESE) || defined (WLAN_FEATURE_VOWIFI)
 	/* Obtain the Max Tx power for the current regulatory  */
 	regMax = cfg_get_regulatory_max_transmit_power(mac_ctx,
 					session->currentOperChannel);
-#endif
 
-#if defined WLAN_FEATURE_VOWIFI
 	if (mac_ctx->rrm.rrmPEContext.rrmEnable
 	    && bcn->powerConstraintPresent)
 		localRRMConstraint =
@@ -787,9 +780,6 @@ static void __sch_beacon_process_for_session(tpAniSirGlobal mac_ctx,
 		localRRMConstraint = 0;
 	maxTxPower = lim_get_max_tx_power(regMax, regMax - localRRMConstraint,
 					mac_ctx->roam.configParam.nTxPowerCap);
-#elif defined FEATURE_WLAN_ESE
-	maxTxPower = regMax;
-#endif
 
 #if defined FEATURE_WLAN_ESE
 	if (session->isESEconnection) {
@@ -806,7 +796,6 @@ static void __sch_beacon_process_for_session(tpAniSirGlobal mac_ctx,
 	}
 #endif
 
-#if defined (FEATURE_WLAN_ESE) || defined (WLAN_FEATURE_VOWIFI)
 	/* If maxTxPower is increased or decreased */
 	if (maxTxPower != session->maxTxPower) {
 		sch_log(mac_ctx, LOG1,
@@ -816,7 +805,6 @@ static void __sch_beacon_process_for_session(tpAniSirGlobal mac_ctx,
 		    == eSIR_SUCCESS)
 			session->maxTxPower = maxTxPower;
 	}
-#endif
 
 	/* Indicate to LIM that Beacon is received */
 	if (bcn->HTInfo.present)

core/mac/src/sys/legacy/src/utils/src/mac_trace.c

@@ -293,13 +293,11 @@ uint8_t *mac_trace_get_sme_msg_string(uint16_t sme_msg)
 		CASE_RETURN_STRING(eWNI_PMC_MSG_TYPES_BEGIN);
 
 		CASE_RETURN_STRING(eWNI_PMC_SMPS_STATE_IND);
-#if defined WLAN_FEATURE_VOWIFI
 		CASE_RETURN_STRING(eWNI_SME_RRM_MSG_TYPE_BEGIN);
 		CASE_RETURN_STRING(eWNI_SME_NEIGHBOR_REPORT_REQ_IND);
 		CASE_RETURN_STRING(eWNI_SME_NEIGHBOR_REPORT_IND);
 		CASE_RETURN_STRING(eWNI_SME_BEACON_REPORT_REQ_IND);
 		CASE_RETURN_STRING(eWNI_SME_BEACON_REPORT_RESP_XMIT_IND);
-#endif
 		CASE_RETURN_STRING(eWNI_SME_ADD_STA_SELF_RSP);
 		CASE_RETURN_STRING(eWNI_SME_DEL_STA_SELF_RSP);
 		CASE_RETURN_STRING(eWNI_SME_FT_PRE_AUTH_REQ);

core/mac/src/sys/legacy/src/utils/src/parser_api.c

@@ -45,9 +45,7 @@
 #include "lim_ser_des_utils.h"
 #include "sch_api.h"
 #include "wmm_apsd.h"
-#if defined WLAN_FEATURE_VOWIFI
 #include "rrm_api.h"
-#endif
 
 #include "cds_regdomain_common.h"
 
@@ -5491,7 +5489,6 @@ tSirRetStatus populate_dot11_assoc_res_p2p_ie(tpAniSirGlobal pMac,
 	return eSIR_SUCCESS;
 }
 
-#if defined WLAN_FEATURE_VOWIFI
 
 tSirRetStatus populate_dot11f_wfatpc(tpAniSirGlobal pMac,
 				     tDot11fIEWFATPC *pDot11f, uint8_t txPower,
@@ -5586,7 +5583,6 @@ tSirRetStatus populate_dot11f_rrm_ie(tpAniSirGlobal pMac,
 	pDot11f->present = 1;
 	return eSIR_SUCCESS;
 }
-#endif
 
 void populate_mdie(tpAniSirGlobal pMac,
 		   tDot11fIEMobilityDomain *pDot11f,

core/sme/inc/csr_api.h

@@ -363,13 +363,11 @@ typedef struct tagCsrScanResultFilter {
 	/* For WPS filtering if true => auth and ecryption should be ignored */
 	bool bWPSAssociation;
 	bool bOSENAssociation;
-#if defined WLAN_FEATURE_VOWIFI
 	/*
 	 * For measurement reports --> if set, only SSID,
 	 * BSSID and channel is considered for filtering.
 	 */
 	bool fMeasurement;
-#endif
 	tCsrMobilityDomainInfo MDID;
 	bool p2pResult;
 #ifdef WLAN_FEATURE_11W

core/sme/inc/sme_api.h

@@ -52,9 +52,7 @@
 #include "oem_data_api.h"
 #endif
 
-#if defined WLAN_FEATURE_VOWIFI
 #include "sme_rrm_internal.h"
-#endif
 #include "sir_types.h"
 /*--------------------------------------------------------------------------
   Preprocessor definitions and constants
@@ -90,9 +88,7 @@
 typedef void (*hdd_ftm_msg_processor)(void *);
 typedef struct _smeConfigParams {
 	tCsrConfigParam csrConfig;
-#if defined WLAN_FEATURE_VOWIFI
 	struct rrm_config_param rrmConfig;
-#endif
 } tSmeConfigParams, *tpSmeConfigParams;
 
 #ifdef FEATURE_WLAN_TDLS
@@ -434,11 +430,9 @@ QDF_STATUS sme_dhcp_stop_ind(tHalHandle hHal,
 void sme_set_cfg_privacy(tHalHandle hHal, tCsrRoamProfile *pProfile,
 		bool fPrivacy);
 void sme_get_recovery_stats(tHalHandle hHal);
-#if defined WLAN_FEATURE_VOWIFI
 QDF_STATUS sme_neighbor_report_request(tHalHandle hHal, uint8_t sessionId,
 		tpRrmNeighborReq pRrmNeighborReq,
 		tpRrmNeighborRspCallbackInfo callbackInfo);
-#endif
 QDF_STATUS sme_get_wcnss_wlan_compiled_version(tHalHandle hHal,
 		tSirVersionType * pVersion);
 QDF_STATUS sme_get_wcnss_wlan_reported_version(tHalHandle hHal,

core/sme/inc/sme_inside.h

@@ -51,9 +51,7 @@
 #include "oem_data_internal.h"
 #endif
 
-#if defined WLAN_FEATURE_VOWIFI
 #include "sme_rrm_api.h"
-#endif
 ePhyChanBondState csr_convert_cb_ini_value_to_phy_cb_state(uint32_t cbIniValue);
 
 /*--------------------------------------------------------------------------

core/sme/src/common/sme_api.c

@@ -1097,13 +1097,11 @@ QDF_STATUS sme_open(tHalHandle hHal)
 	if (!QDF_IS_STATUS_SUCCESS(status))
 		return status;
 
-#if defined WLAN_FEATURE_VOWIFI
 	status = rrm_open(pMac);
 	if (!QDF_IS_STATUS_SUCCESS(status)) {
 		sms_log(pMac, LOGE, FL("rrm_open failed, status=%d"), status);
 		return status;
 	}
-#endif
 	sme_p2p_open(pMac);
 	sme_trace_init(pMac);
 	return status;
@@ -1364,7 +1362,6 @@ QDF_STATUS sme_update_config(tHalHandle hHal, tpSmeConfigParams pSmeConfigParams
 			"csr_change_default_config_param failed with status=%d",
 			status);
 	}
-#if defined WLAN_FEATURE_VOWIFI
 	status =
 		rrm_change_default_config_param(hHal, &pSmeConfigParams->rrmConfig);
 
@@ -1373,7 +1370,6 @@ QDF_STATUS sme_update_config(tHalHandle hHal, tpSmeConfigParams pSmeConfigParams
 			"rrm_change_default_config_param failed with status=%d",
 			status);
 	}
-#endif
 	/* For SOC, CFG is set before start */
 	/* We don't want to apply global CFG in connect state because that may cause some side affect */
 	if (csr_is_all_session_disconnected(pMac)) {
@@ -1664,13 +1660,11 @@ QDF_STATUS sme_hdd_ready_ind(tHalHandle hHal)
 			break;
 		}
 
-#if defined WLAN_FEATURE_VOWIFI
 		if (QDF_STATUS_SUCCESS != rrm_ready(hHal)) {
 			status = QDF_STATUS_E_FAILURE;
 			sms_log(pMac, LOGE, "rrm_ready failed");
 			break;
 		}
-#endif
 		pMac->sme.state = SME_STATE_READY;
 	} while (0);
 
@@ -2215,7 +2209,6 @@ QDF_STATUS sme_process_msg(tHalHandle hHal, cds_msg_t *pMsg)
 				pMsg->type);
 		}
 		break;
-#if defined WLAN_FEATURE_VOWIFI
 	case eWNI_SME_NEIGHBOR_REPORT_IND:
 	case eWNI_SME_BEACON_REPORT_REQ_IND:
 #if defined WLAN_VOWIFI_DEBUG
@@ -2231,7 +2224,6 @@ QDF_STATUS sme_process_msg(tHalHandle hHal, cds_msg_t *pMsg)
 				pMsg->type);
 		}
 		break;
-#endif
 #ifdef FEATURE_OEM_DATA_SUPPORT
 	/* Handle the eWNI_SME_OEM_DATA_RSP: */
 	case eWNI_SME_OEM_DATA_RSP:
@@ -2891,7 +2883,6 @@ QDF_STATUS sme_close(tHalHandle hHal)
 		fail_status = status;
 	}
 
-#if defined WLAN_FEATURE_VOWIFI
 	status = rrm_close(hHal);
 	if (!QDF_IS_STATUS_SUCCESS(status)) {
 		sms_log(pMac, LOGE,
@@ -2899,7 +2890,6 @@ QDF_STATUS sme_close(tHalHandle hHal)
 			status);
 		fail_status = status;
 	}
-#endif
 
 	sme_p2p_close(hHal);
 
@@ -5306,7 +5296,6 @@ void sme_set_cfg_privacy(tHalHandle hHal,
 	}
 }
 
-#if defined WLAN_FEATURE_VOWIFI
 /* ---------------------------------------------------------------------------
     \fn sme_neighbor_report_request
     \brief  API to request neighbor report.
@@ -5337,7 +5326,6 @@ QDF_STATUS sme_neighbor_report_request(tHalHandle hHal, uint8_t sessionId,
 
 	return status;
 }
-#endif
 
 void sms_log(tpAniSirGlobal pMac, uint32_t loglevel, const char *pString, ...)
 {

core/sme/src/csr/csr_neighbor_roam.c

@@ -1671,7 +1671,6 @@ static QDF_STATUS csr_neighbor_roam_process_scan_complete(tpAniSirGlobal pMac,
 }
 
 
-#if defined WLAN_FEATURE_VOWIFI
 /**
  * csr_neighbor_roam_channels_filter_by_current_band()
  *
@@ -1994,7 +1993,6 @@ QDF_STATUS csr_neighbor_roam_create_chan_list_from_neighbor_report(tpAniSirGloba
 
 	return QDF_STATUS_SUCCESS;
 }
-#endif /* WLAN_FEATURE_VOWIFI */
 
 /**
  * csr_neighbor_roam_is_ssid_and_security_match() - to match ssid/security

core/sme/src/csr/csr_util.c

@@ -4779,13 +4779,11 @@ bool csr_match_bss(tHalHandle hal, tSirBssDescription *bss_descr,
 	}
 	if (!check)
 		goto end;
-#if defined WLAN_FEATURE_VOWIFI
 	/* If this is for measurement filtering */
 	if (filter->fMeasurement) {
 		rc = true;
 		goto end;
 	}
-#endif
 	if (!csr_is_phy_mode_match(mac_ctx, filter->phyMode, bss_descr,
 			NULL, NULL, ie_ptr))
 		goto end;

core/sme/src/rrm/sme_rrm.c

@@ -35,7 +35,6 @@
 
 /* $Header$ */
 
-#if defined WLAN_FEATURE_VOWIFI
 /*--------------------------------------------------------------------------
    Include Files
    ------------------------------------------------------------------------*/
@@ -1563,4 +1562,3 @@ tRrmNeighborReportDesc *sme_rrm_get_next_bss_entry_from_neighbor_cache(
 	return pTempBssEntry;
 }
 
-#endif

core/wma/inc/wma_if.h

@@ -486,10 +486,8 @@ typedef struct {
 	tSirMacSSid ssId;
 	uint8_t respReqd;
 	uint8_t sessionId;
-#if defined WLAN_FEATURE_VOWIFI
 	int8_t txMgmtPower;
 	int8_t maxTxPower;
-#endif /* WLAN_FEATURE_VOWIFI */
 
 #if defined WLAN_FEATURE_VOWIFI_11R
 	uint8_t extSetStaKeyParamValid;
@@ -613,10 +611,8 @@ typedef struct {
 typedef struct {
 	uint8_t scanChannel;
 	QDF_STATUS status;
-#if defined WLAN_FEATURE_VOWIFI
 	uint32_t startTSF[2];
 	int8_t txMgmtPower;
-#endif /* WLAN_FEATURE_VOWIFI */
 } tStartScanParams, *tpStartScanParams;
 
 /**
@@ -895,14 +891,9 @@ typedef struct {
  */
 typedef struct {
 	uint8_t channelNumber;
-#ifndef WLAN_FEATURE_VOWIFI
-	uint8_t localPowerConstraint;
-#endif /* WLAN_FEATURE_VOWIFI  */
 	uint8_t peSessionId;
-#if defined WLAN_FEATURE_VOWIFI
 	int8_t txMgmtPower;
 	int8_t maxTxPower;
-#endif /* WLAN_FEATURE_VOWIFI */
 	tSirMacAddr selfStaMacAddr;
 	/* the request has power constraints, this should be applied only to
 	 * that session

core/wma/src/wma_dev_if.c

@@ -2799,13 +2799,8 @@ static void wma_add_bss_ap_mode(tp_wma_handle wma, tpAddBssParams add_bss)
 	req.ch_center_freq_seg0 = add_bss->ch_center_freq_seg0;
 	req.ch_center_freq_seg1 = add_bss->ch_center_freq_seg1;
 	req.vht_capable = add_bss->vhtCapable;
-#if defined WLAN_FEATURE_VOWIFI
 	req.max_txpow = add_bss->maxTxPower;
 	maxTxPower = add_bss->maxTxPower;
-#else
-	req.max_txpow = 0;
-	maxTxPower = 0;
-#endif /* WLAN_FEATURE_VOWIFI */
 #ifdef WLAN_FEATURE_11W
 	if (add_bss->rmfEnabled) {
 		/*
@@ -3197,11 +3192,7 @@ static void wma_add_bss_sta_mode(tp_wma_handle wma, tpAddBssParams add_bss)
 			req.chan_width = add_bss->ch_width;
 			req.ch_center_freq_seg0 = add_bss->ch_center_freq_seg0;
 			req.ch_center_freq_seg1 = add_bss->ch_center_freq_seg1;
-#if defined WLAN_FEATURE_VOWIFI
 			req.max_txpow = add_bss->maxTxPower;
-#else
-			req.max_txpow = 0;
-#endif
 			req.beacon_intval = add_bss->beaconInterval;
 			req.dtim_period = add_bss->dtimPeriod;
 			req.hidden_ssid = add_bss->bHiddenSSIDEn;
@@ -3915,11 +3906,7 @@ static void wma_add_sta_req_sta_mode(tp_wma_handle wma, tpAddStaParams params)
 		}
 #endif
 	}
-#if defined WLAN_FEATURE_VOWIFI
 	maxTxPower = params->maxTxPower;
-#else
-	maxTxPower = 0;
-#endif
 	wma_vdev_set_bss_params(wma, params->smesessionId,
 				iface->beaconInterval, iface->dtimPeriod,
 				iface->shortSlotTimeSupported,

core/wma/src/wma_scan_roam.c

@@ -2491,11 +2491,7 @@ void wma_set_channel(tp_wma_handle wma, tpSwitchChannelParams params)
 		req.preferred_tx_streams = 1;
 	}
 
-#ifdef WLAN_FEATURE_VOWIFI
 	req.max_txpow = params->maxTxPower;
-#else
-	req.max_txpow = params->localPowerConstraint;
-#endif /* WLAN_FEATURE_VOWIFI */
 	req.beacon_intval = 100;
 	req.dtim_period = 1;
 	req.is_dfs = params->isDfsChannel;
@@ -2523,11 +2519,7 @@ void wma_set_channel(tp_wma_handle wma, tpSwitchChannelParams params)
 send_resp:
 	WMA_LOGD("%s: channel %d ch_width %d txpower %d status %d", __func__,
 		 params->channelNumber, params->ch_width,
-#ifdef WLAN_FEATURE_VOWIFI
 		 params->maxTxPower,
-#else
-		 params->localPowerConstraint,
-#endif /* WLAN_FEATURE_VOWIFI */
 		 status);
 	params->status = status;
 	WMA_LOGI("%s: sending WMA_SWITCH_CHANNEL_RSP, status = 0x%x",