diff --git a/Kbuild b/Kbuild
index 545389c1c000..8bf73d63cf82 100755
--- a/Kbuild
+++ b/Kbuild
@@ -903,7 +903,6 @@ CDEFINES :=	-DANI_LITTLE_BYTE_ENDIAN \
 		-DWLAN_AP_STA_CONCURRENCY \
 		-DFEATURE_WLAN_SCAN_PNO \
 		-DWLAN_FEATURE_PACKET_FILTERING \
-		-DWLAN_FEATURE_11AC \
 		-DWLAN_FEATURE_P2P_DEBUG \
 		-DWLAN_ENABLE_AGEIE_ON_SCAN_RESULTS \
 		-DWLANTL_DEBUG\
diff --git a/core/hdd/inc/wlan_hdd_cfg.h b/core/hdd/inc/wlan_hdd_cfg.h
index 02a5d59dc144..c3caa83d3078 100644
--- a/core/hdd/inc/wlan_hdd_cfg.h
+++ b/core/hdd/inc/wlan_hdd_cfg.h
@@ -186,11 +186,7 @@ typedef enum {
 
 #define CFG_DOT11_MODE_NAME                    "gDot11Mode"
 #define CFG_DOT11_MODE_MIN                     eHDD_DOT11_MODE_AUTO
-#ifdef WLAN_FEATURE_11AC
 #define CFG_DOT11_MODE_DEFAULT                 eHDD_DOT11_MODE_11ac
-#else
-#define CFG_DOT11_MODE_DEFAULT                 eHDD_DOT11_MODE_11n
-#endif
 #define CFG_DOT11_MODE_MAX                     eHDD_DOT11_MODE_11a
 
 #define CFG_CHANNEL_BONDING_MODE_24GHZ_NAME    "gChannelBondingMode24GHz"
@@ -1074,7 +1070,6 @@ typedef enum {
 	eHDD_LINK_SPEED_REPORT_MAX = 1,
 	eHDD_LINK_SPEED_REPORT_MAX_SCALED = 2,
 } eHddLinkSpeedReportType;
-#ifdef WLAN_FEATURE_11AC
 #define CFG_VHT_CHANNEL_WIDTH                "gVhtChannelWidth"
 #define CFG_VHT_CHANNEL_WIDTH_MIN            (0)
 #define CFG_VHT_CHANNEL_WIDTH_MAX            (4)
@@ -1119,7 +1114,6 @@ typedef enum {
 #define CFG_VHT_ENABLE_GID_FEATURE_MIN          (0)
 #define CFG_VHT_ENABLE_GID_FEATURE_MAX          (1)
 #define CFG_VHT_ENABLE_GID_FEATURE_DEFAULT      (0)
-#endif
 
 #define CFG_VHT_ENABLE_1x1_TX_CHAINMASK         "gSetTxChainmask1x1"
 #define CFG_VHT_ENABLE_1x1_TX_CHAINMASK_MIN     (1)
@@ -1788,12 +1782,10 @@ typedef enum {
 #define CFG_SAP_ALLOW_ALL_CHANNEL_PARAM_MAX           (1)
 #define CFG_SAP_ALLOW_ALL_CHANNEL_PARAM_DEFAULT       (0)
 
-#ifdef WLAN_FEATURE_11AC
 #define CFG_DISABLE_LDPC_WITH_TXBF_AP             "gDisableLDPCWithTxbfAP"
 #define CFG_DISABLE_LDPC_WITH_TXBF_AP_MIN         (0)
 #define CFG_DISABLE_LDPC_WITH_TXBF_AP_MAX         (1)
 #define CFG_DISABLE_LDPC_WITH_TXBF_AP_DEFAULT     (0)
-#endif
 
 /*
  * IBSS Operating Channels for 2.4G and 5GHz channels
@@ -1979,7 +1971,6 @@ typedef enum {
 #define CFG_ENABLE_FW_SELF_RECOVERY_ENABLE       (1)
 #define CFG_ENABLE_FW_SELF_RECOVERY_DEFAULT      (CFG_ENABLE_FW_SELF_RECOVERY_DISABLE)
 
-#ifdef WLAN_FEATURE_11AC
 /* Macro to handle maximum receive AMPDU size configuration */
 #define CFG_VHT_AMPDU_LEN_EXPONENT_NAME                "gVhtAmpduLenExponent"
 #define CFG_VHT_AMPDU_LEN_EXPONENT_MIN                 (0)
@@ -1990,7 +1981,6 @@ typedef enum {
 #define CFG_VHT_MPDU_LEN_MIN                           (0)
 #define CFG_VHT_MPDU_LEN_MAX                           (2)
 #define CFG_VHT_MPDU_LEN_DEFAULT                       (0)
-#endif
 
 #define CFG_MAX_WOW_FILTERS_NAME                       "gMaxWoWFilters"
 #define CFG_MAX_WOW_FILTERS_MIN                        (0)
@@ -3299,10 +3289,8 @@ struct hdd_config {
 	bool enablePowersaveOffload;
 	bool enablefwprint;
 	bool enable_fw_log;
-#ifdef WLAN_FEATURE_11AC
 	uint8_t fVhtAmpduLenExponent;
 	uint32_t vhtMpduLen;
-#endif
 	uint32_t IpaConfig;
 	bool IpaClkScalingEnable;
 	uint32_t IpaDescSize;
diff --git a/core/hdd/src/wlan_hdd_cfg.c b/core/hdd/src/wlan_hdd_cfg.c
index b776f6396965..68d174a2d5d5 100644
--- a/core/hdd/src/wlan_hdd_cfg.c
+++ b/core/hdd/src/wlan_hdd_cfg.c
@@ -2010,7 +2010,6 @@ REG_TABLE_ENTRY g_registry_table[] = {
 		     CFG_MC_ADDR_LIST_ENABLE_MIN,
 		     CFG_MC_ADDR_LIST_ENABLE_MAX),
 
-#ifdef WLAN_FEATURE_11AC
 	REG_VARIABLE(CFG_VHT_CHANNEL_WIDTH, WLAN_PARAM_Integer,
 		     struct hdd_config, vhtChannelWidth,
 		     VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK,
@@ -2073,7 +2072,6 @@ REG_TABLE_ENTRY g_registry_table[] = {
 		     CFG_VHT_ENABLE_GID_FEATURE_DEFAULT,
 		     CFG_VHT_ENABLE_GID_FEATURE_MIN,
 		     CFG_VHT_ENABLE_GID_FEATURE_MAX),
-#endif
 
 	REG_VARIABLE(CFG_VHT_ENABLE_1x1_TX_CHAINMASK, WLAN_PARAM_Integer,
 		     struct hdd_config, txchainmask1x1,
@@ -2463,14 +2461,12 @@ REG_TABLE_ENTRY g_registry_table[] = {
 		     CFG_SAP_ALLOW_ALL_CHANNEL_PARAM_MIN,
 		     CFG_SAP_ALLOW_ALL_CHANNEL_PARAM_MAX),
 
-#ifdef WLAN_FEATURE_11AC
 	REG_VARIABLE(CFG_DISABLE_LDPC_WITH_TXBF_AP, WLAN_PARAM_Integer,
 		     struct hdd_config, disableLDPCWithTxbfAP,
 		     VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT,
 		     CFG_DISABLE_LDPC_WITH_TXBF_AP_DEFAULT,
 		     CFG_DISABLE_LDPC_WITH_TXBF_AP_MIN,
 		     CFG_DISABLE_LDPC_WITH_TXBF_AP_MAX),
-#endif
 
 	REG_DYNAMIC_VARIABLE(CFG_ENABLE_SSR, WLAN_PARAM_Integer,
 			     struct hdd_config, enableSSR,
@@ -2488,16 +2484,12 @@ REG_TABLE_ENTRY g_registry_table[] = {
 		     CFG_MAX_MEDIUM_TIME_STAMIN,
 		     CFG_MAX_MEDIUM_TIME_STAMAX),
 
-
-
-#ifdef WLAN_FEATURE_11AC
 	REG_VARIABLE(CFG_ENABLE_VHT_FOR_24GHZ_NAME, WLAN_PARAM_Integer,
 		     struct hdd_config, enableVhtFor24GHzBand,
 		     VAR_FLAGS_OPTIONAL,
 		     CFG_ENABLE_VHT_FOR_24GHZ_DEFAULT,
 		     CFG_ENABLE_VHT_FOR_24GHZ_MIN,
 		     CFG_ENABLE_VHT_FOR_24GHZ_MAX),
-#endif
 
 	REG_DYNAMIC_VARIABLE(CFG_ENABLE_FAST_ROAM_IN_CONCURRENCY,
 			     WLAN_PARAM_Integer,
@@ -2645,7 +2637,6 @@ REG_TABLE_ENTRY g_registry_table[] = {
 		     CFG_IPA_LOW_BANDWIDTH_MBPS_MAX),
 #endif
 
-#ifdef WLAN_FEATURE_11AC
 	REG_VARIABLE(CFG_VHT_AMPDU_LEN_EXPONENT_NAME, WLAN_PARAM_Integer,
 		     struct hdd_config, fVhtAmpduLenExponent,
 		     VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK,
@@ -2659,7 +2650,6 @@ REG_TABLE_ENTRY g_registry_table[] = {
 		     CFG_VHT_MPDU_LEN_DEFAULT,
 		     CFG_VHT_MPDU_LEN_MIN,
 		     CFG_VHT_MPDU_LEN_MAX),
-#endif
 
 	REG_VARIABLE(CFG_MAX_WOW_FILTERS_NAME, WLAN_PARAM_Integer,
 		     struct hdd_config, maxWoWFilters,
@@ -4946,11 +4936,9 @@ void hdd_cfg_print(hdd_context_t *pHddCtx)
 	QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH,
 		  "Name = [thermalMitigationEnable] Value = [%u] ",
 		  pHddCtx->config->thermalMitigationEnable);
-#ifdef WLAN_FEATURE_11AC
 	QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH,
 		  "Name = [gVhtChannelWidth] value = [%u]",
 		  pHddCtx->config->vhtChannelWidth);
-#endif
 	QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH,
 		  "Name = [enableFirstScan2GOnly] Value = [%u] ",
 		  pHddCtx->config->enableFirstScan2GOnly);
@@ -5526,17 +5514,10 @@ eCsrPhyMode hdd_cfg_xlate_to_csr_phy_mode(eHddDot11Mode dot11Mode)
 		return eCSR_DOT11_MODE_11n_ONLY;
 	case (eHDD_DOT11_MODE_11b_ONLY):
 		return eCSR_DOT11_MODE_11b_ONLY;
-#ifdef WLAN_FEATURE_11AC
 	case (eHDD_DOT11_MODE_11ac_ONLY):
 		return eCSR_DOT11_MODE_11ac_ONLY;
 	case (eHDD_DOT11_MODE_11ac):
 		return eCSR_DOT11_MODE_11ac;
-#else
-	/* If 11AC support is not compiled set Auto mode */
-	case (eHDD_DOT11_MODE_11ac):
-	case (eHDD_DOT11_MODE_11ac_ONLY):
-		return eCSR_DOT11_MODE_AUTO;
-#endif
 	case (eHDD_DOT11_MODE_AUTO):
 		return eCSR_DOT11_MODE_AUTO;
 	case (eHDD_DOT11_MODE_11a):
@@ -6526,7 +6507,6 @@ QDF_STATUS hdd_set_sme_config(hdd_context_t *pHddCtx)
 	/* Remaining config params not obtained from registry
 	 * On RF EVB beacon using channel 1.
 	 */
-#ifdef WLAN_FEATURE_11AC
 	smeConfig->csrConfig.nVhtChannelWidth = pConfig->vhtChannelWidth;
 	smeConfig->csrConfig.enableTxBF = pConfig->enableTxBF;
 	smeConfig->csrConfig.enable_txbf_sap_mode =
@@ -6537,7 +6517,6 @@ QDF_STATUS hdd_set_sme_config(hdd_context_t *pHddCtx)
 	smeConfig->csrConfig.enableMuBformee = pConfig->enableMuBformee;
 	smeConfig->csrConfig.enableVhtpAid = pConfig->enableVhtpAid;
 	smeConfig->csrConfig.enableVhtGid = pConfig->enableVhtGid;
-#endif
 	smeConfig->csrConfig.enableAmpduPs = pConfig->enableAmpduPs;
 	smeConfig->csrConfig.enableHtSmps = pConfig->enableHtSmps;
 	smeConfig->csrConfig.htSmps = pConfig->htSmps;
diff --git a/core/hdd/src/wlan_hdd_cfg80211.c b/core/hdd/src/wlan_hdd_cfg80211.c
index 2abd3ffef348..0cf30ce47739 100644
--- a/core/hdd/src/wlan_hdd_cfg80211.c
+++ b/core/hdd/src/wlan_hdd_cfg80211.c
@@ -7785,14 +7785,10 @@ void hdd_select_cbmode(hdd_adapter_t *pAdapter, uint8_t operationChannel)
 	case eHDD_DOT11_MODE_AUTO:
 	case eHDD_DOT11_MODE_11ac:
 	case eHDD_DOT11_MODE_11ac_ONLY:
-#ifdef WLAN_FEATURE_11AC
 		if (sme_is_feature_supported_by_fw(DOT11AC))
 			hddDot11Mode = eHDD_DOT11_MODE_11ac;
 		else
 			hddDot11Mode = eHDD_DOT11_MODE_11n;
-#else
-		hddDot11Mode = eHDD_DOT11_MODE_11n;
-#endif
 		break;
 	case eHDD_DOT11_MODE_11n:
 	case eHDD_DOT11_MODE_11n_ONLY:
diff --git a/core/hdd/src/wlan_hdd_main.c b/core/hdd/src/wlan_hdd_main.c
index f7550bc664d4..73c75f5f8398 100644
--- a/core/hdd/src/wlan_hdd_main.c
+++ b/core/hdd/src/wlan_hdd_main.c
@@ -784,12 +784,10 @@ static void hdd_update_tgt_services(hdd_context_t *hdd_ctx,
 	/* Set up UAPSD */
 	config->apUapsdEnabled &= cfg->uapsd;
 
-#ifdef WLAN_FEATURE_11AC
 	/* 11AC mode support */
 	if ((config->dot11Mode == eHDD_DOT11_MODE_11ac ||
 	     config->dot11Mode == eHDD_DOT11_MODE_11ac_ONLY) && !cfg->en_11ac)
 		config->dot11Mode = eHDD_DOT11_MODE_AUTO;
-#endif /* #ifdef WLAN_FEATURE_11AC */
 
 	/* ARP offload: override user setting if invalid  */
 	config->fhostArpOffload &= cfg->arp_offload;
@@ -943,7 +941,6 @@ static void hdd_update_tgt_ht_cap(hdd_context_t *hdd_ctx,
 #undef WLAN_HDD_RX_MCS_ALL_NSTREAM_RATES
 }
 
-#ifdef WLAN_FEATURE_11AC
 static void hdd_update_tgt_vht_cap(hdd_context_t *hdd_ctx,
 				   struct wma_tgt_vht_cap *cfg)
 {
@@ -1269,7 +1266,6 @@ static void hdd_update_tgt_vht_cap(hdd_context_t *hdd_ctx,
 		band_5g->vht_cap.cap |= IEEE80211_VHT_CAP_VHT_TXOP_PS;
 
 }
-#endif /* #ifdef WLAN_FEATURE_11AC */
 
 void hdd_update_tgt_cfg(void *context, void *param)
 {
@@ -1327,9 +1323,7 @@ void hdd_update_tgt_cfg(void *context, void *param)
 
 	hdd_update_tgt_ht_cap(hdd_ctx, &cfg->ht_cap);
 
-#ifdef WLAN_FEATURE_11AC
 	hdd_update_tgt_vht_cap(hdd_ctx, &cfg->vht_cap);
-#endif /* #ifdef WLAN_FEATURE_11AC */
 	hdd_ctx->config->fine_time_meas_cap &= cfg->fine_time_measurement_cap;
 	hdd_ctx->fine_time_meas_cap_target = cfg->fine_time_measurement_cap;
 	hdd_info(FL("fine_time_meas_cap: 0x%x"),
diff --git a/core/hdd/src/wlan_hdd_stats.c b/core/hdd/src/wlan_hdd_stats.c
index 36d7087d54b3..c3af64498253 100644
--- a/core/hdd/src/wlan_hdd_stats.c
+++ b/core/hdd/src/wlan_hdd_stats.c
@@ -149,7 +149,6 @@ static struct index_data_rate_type supported_mcs_rate_nss2[] = {
 	{7, {1300, 2700, 1444, 3000} }
 };
 
-#ifdef WLAN_FEATURE_11AC
 /* MCS Based VHT rate table MCS parameters with Nss = 1*/
 static struct index_vht_data_rate_type supported_vht_mcs_rate_nss1[] = {
 /* MCS  L80    S80     L40   S40    L20   S40*/
@@ -179,7 +178,6 @@ static struct index_vht_data_rate_type supported_vht_mcs_rate_nss2[] = {
 	{8, {7020, 7800}, {3240, 3600}, {1560, 1733} },
 	{9, {7800, 8667}, {3600, 4000}, {1560, 1733} }
 };
-#endif /* End of WLAN_FEATURE_11AC */
 
 /*array index ponints to MCS and array value points respective rssi*/
 static int rssi_mcs_tbl[][10] = {
@@ -1715,11 +1713,8 @@ static int __wlan_hdd_cfg80211_get_station(struct wiphy *wiphy,
 	struct index_vht_data_rate_type *supported_vht_mcs_rate;
 	struct index_data_rate_type *supported_mcs_rate;
 
-#ifdef WLAN_FEATURE_11AC
 	uint32_t vht_mcs_map;
 	enum eDataRate11ACMaxMcs vhtMaxMcs;
-#endif /* WLAN_FEATURE_11AC */
-
 
 	ENTER();
 
@@ -1887,7 +1882,6 @@ static int __wlan_hdd_cfg80211_get_station(struct wiphy *wiphy,
 				return 0;
 			}
 			rateFlag = 0;
-#ifdef WLAN_FEATURE_11AC
 			supported_vht_mcs_rate =
 				(struct index_vht_data_rate_type *)
 				((nss ==
@@ -1967,9 +1961,7 @@ static int __wlan_hdd_cfg80211_get_station(struct wiphy *wiphy,
 				if (currentRate > maxRate)
 					maxRate = currentRate;
 
-			} else
-#endif /* WLAN_FEATURE_11AC */
-			{
+			} else {
 				if (rate_flags & eHAL_TX_RATE_HT40)
 					rateFlag |= 1;
 				if (rate_flags & eHAL_TX_RATE_SGI)
@@ -2042,7 +2034,6 @@ static int __wlan_hdd_cfg80211_get_station(struct wiphy *wiphy,
 #endif /* LINKSPEED_DEBUG_ENABLED */
 		} else {
 			sinfo->txrate.mcs = maxMCSIdx;
-#ifdef WLAN_FEATURE_11AC
 			sinfo->txrate.nss = nss;
 			if (rate_flags & eHAL_TX_RATE_VHT80) {
 				sinfo->txrate.flags |= RATE_INFO_FLAGS_VHT_MCS;
@@ -2064,7 +2055,6 @@ static int __wlan_hdd_cfg80211_get_station(struct wiphy *wiphy,
 				sinfo->txrate.flags |= RATE_INFO_FLAGS_VHT_MCS;
 			} else
 				sinfo->txrate.flags |= RATE_INFO_FLAGS_VHT_MCS;
-#endif /* WLAN_FEATURE_11AC */
 			if (rate_flags &
 			    (eHAL_TX_RATE_HT20 | eHAL_TX_RATE_HT40)) {
 				sinfo->txrate.flags |= RATE_INFO_FLAGS_MCS;
@@ -2104,7 +2094,6 @@ static int __wlan_hdd_cfg80211_get_station(struct wiphy *wiphy,
 			/* must be MCS */
 			sinfo->txrate.mcs =
 				pAdapter->hdd_stats.ClassA_stat.mcs_index;
-#ifdef WLAN_FEATURE_11AC
 			sinfo->txrate.nss = nss;
 			sinfo->txrate.flags |= RATE_INFO_FLAGS_VHT_MCS;
 			if (rate_flags & eHAL_TX_RATE_VHT80) {
@@ -2122,7 +2111,6 @@ static int __wlan_hdd_cfg80211_get_station(struct wiphy *wiphy,
 					RATE_INFO_FLAGS_40_MHZ_WIDTH;
 #endif
 			}
-#endif /* WLAN_FEATURE_11AC */
 			if (rate_flags &
 			    (eHAL_TX_RATE_HT20 | eHAL_TX_RATE_HT40)) {
 				sinfo->txrate.flags |= RATE_INFO_FLAGS_MCS;
diff --git a/core/hdd/src/wlan_hdd_stats.h b/core/hdd/src/wlan_hdd_stats.h
index b30b587be819..38e48f2b4e03 100644
--- a/core/hdd/src/wlan_hdd_stats.h
+++ b/core/hdd/src/wlan_hdd_stats.h
@@ -35,7 +35,6 @@
 #define MAX_HT_MCS_IDX 8
 #define MAX_VHT_MCS_IDX 10
 
-#ifdef WLAN_FEATURE_11AC
 #define DATA_RATE_11AC_MCS_MASK    0x03
 
 /* LL stats get request time out value */
@@ -68,7 +67,6 @@ enum eDataRate11ACMaxMcs{
 	DATA_RATE_11AC_MAX_MCS_9,
 	DATA_RATE_11AC_MAX_MCS_NA
 };
-#endif /* End of WLAN_FEATURE_11AC */
 
 /**
  * struct index_data_rate_type - non vht data rate type
diff --git a/core/hdd/src/wlan_hdd_wext.c b/core/hdd/src/wlan_hdd_wext.c
index 2e1badca6a22..ccc45f2b1aed 100644
--- a/core/hdd/src/wlan_hdd_wext.c
+++ b/core/hdd/src/wlan_hdd_wext.c
@@ -299,9 +299,7 @@ static const hdd_freq_chan_map_t freq_chan_map[] = {
 #define WE_GET_CFG           3
 #define WE_GET_WMM_STATUS    4
 #define WE_GET_CHANNEL_LIST  5
-#ifdef WLAN_FEATURE_11AC
 #define WE_GET_RSSI          6
-#endif
 #ifdef FEATURE_WLAN_TDLS
 #define WE_GET_TDLS_PEERS    8
 #endif
@@ -4550,9 +4548,7 @@ int wlan_hdd_update_phymode(struct net_device *net, tHalHandle hal,
 	bool ch_bond24 = false, ch_bond5g = false;
 	tSmeConfigParams smeconfig;
 	uint32_t chwidth = WNI_CFG_CHANNEL_BONDING_MODE_DISABLE;
-#ifdef WLAN_FEATURE_11AC
 	uint32_t vhtchanwidth;
-#endif
 	eCsrPhyMode phymode = -EIO, old_phymode;
 	eHddDot11Mode hdd_dot11mode = phddctx->config->dot11Mode;
 	eCsrBand curr_band = eCSR_BAND_ALL;
@@ -4684,7 +4680,6 @@ int wlan_hdd_update_phymode(struct net_device *net, tHalHandle hal,
 			return -EIO;
 		}
 		break;
-#ifdef WLAN_FEATURE_11AC
 	case IEEE80211_MODE_11AC_VHT20:
 	case IEEE80211_MODE_11AC_VHT40:
 	case IEEE80211_MODE_11AC_VHT80:
@@ -4699,7 +4694,6 @@ int wlan_hdd_update_phymode(struct net_device *net, tHalHandle hal,
 			return -EIO;
 		}
 		break;
-#endif
 	case IEEE80211_MODE_2G_AUTO:
 		sme_set_phy_mode(hal, eCSR_DOT11_MODE_AUTO);
 		if ((hdd_set_band(net, WLAN_HDD_UI_BAND_2_4_GHZ) == 0)) {
@@ -4741,7 +4735,6 @@ int wlan_hdd_update_phymode(struct net_device *net, tHalHandle hal,
 		return -EIO;
 	}
 
-#ifdef WLAN_FEATURE_11AC
 	switch (new_phymode) {
 	case IEEE80211_MODE_11AC_VHT20:
 		chwidth = WNI_CFG_CHANNEL_BONDING_MODE_DISABLE;
@@ -4757,7 +4750,6 @@ int wlan_hdd_update_phymode(struct net_device *net, tHalHandle hal,
 		vhtchanwidth = phddctx->config->vhtChannelWidth;
 		break;
 	}
-#endif
 
 	if (phymode != -EIO) {
 		sme_get_config_param(hal, &smeconfig);
@@ -4800,9 +4792,7 @@ int wlan_hdd_update_phymode(struct net_device *net, tHalHandle hal,
 			smeconfig.csrConfig.channelBondingMode24GHz = chwidth;
 			smeconfig.csrConfig.channelBondingMode5GHz = chwidth;
 		}
-#ifdef WLAN_FEATURE_11AC
 		smeconfig.csrConfig.nVhtChannelWidth = vhtchanwidth;
-#endif
 		sme_update_config(hal, &smeconfig);
 
 		phddctx->config->dot11Mode = hdd_dot11mode;
@@ -5461,7 +5451,6 @@ static int __iw_setint_getnone(struct net_device *dev,
 				return -EINVAL;
 
 			break;
-#ifdef WLAN_FEATURE_11AC
 		case eHT_CHANNEL_WIDTH_80MHZ:
 			if (chwidth)
 				smeConfig.csrConfig.
@@ -5472,7 +5461,6 @@ static int __iw_setint_getnone(struct net_device *dev,
 				return -EINVAL;
 
 			break;
-#endif
 
 		default:
 			return -EINVAL;
@@ -7128,7 +7116,6 @@ static int __iw_get_char_setnone(struct net_device *dev,
 		wrqu->data.length = strlen(extra) + 1;
 		break;
 	}
-#ifdef WLAN_FEATURE_11AC
 	case WE_GET_RSSI:
 	{
 		int8_t s7Rssi = 0;
@@ -7137,7 +7124,6 @@ static int __iw_get_char_setnone(struct net_device *dev,
 		wrqu->data.length = strlen(extra) + 1;
 		break;
 	}
-#endif
 
 	case WE_GET_WMM_STATUS:
 	{
@@ -7339,7 +7325,6 @@ static int __iw_get_char_setnone(struct net_device *dev,
 		case eCSR_DOT11_MODE_11g_ONLY:
 			snprintf(extra, WE_MAX_STR_LEN, "11G");
 			break;
-#ifdef WLAN_FEATURE_11AC
 		case eCSR_DOT11_MODE_11ac:
 		case eCSR_DOT11_MODE_11ac_ONLY:
 			if (hddctx->config->vhtChannelWidth ==
@@ -7359,7 +7344,6 @@ static int __iw_get_char_setnone(struct net_device *dev,
 				snprintf(extra, WE_MAX_STR_LEN,
 					 "11ACVHT160");
 			break;
-#endif
 		}
 
 		wrqu->data.length = strlen(extra) + 1;
@@ -10392,12 +10376,10 @@ static const struct iw_priv_args we_private_args[] = {
 	 0,
 	 IW_PRIV_TYPE_CHAR | WE_MAX_STR_LEN,
 	 "getConfig"},
-#ifdef WLAN_FEATURE_11AC
 	{WE_GET_RSSI,
 	 0,
 	 IW_PRIV_TYPE_CHAR | WE_MAX_STR_LEN,
 	 "getRSSI"},
-#endif
 	{WE_GET_WMM_STATUS,
 	 0,
 	 IW_PRIV_TYPE_CHAR | WE_MAX_STR_LEN,
diff --git a/core/mac/inc/sir_api.h b/core/mac/inc/sir_api.h
index e32a9d9c65c5..79d8f5123f12 100644
--- a/core/mac/inc/sir_api.h
+++ b/core/mac/inc/sir_api.h
@@ -301,9 +301,7 @@ typedef enum eStaRateMode {
 	eSTA_11bg,
 	eSTA_11a,
 	eSTA_11n,
-#ifdef WLAN_FEATURE_11AC
 	eSTA_11ac,
-#endif
 	eSTA_INVALID_RATE_MODE
 } tStaRateMode, *tpStaRateMode;
 
@@ -355,7 +353,6 @@ typedef struct sSirSupportedRates {
 	 */
 	uint16_t rxHighestDataRate;
 
-#ifdef WLAN_FEATURE_11AC
 	/*Indicates the Maximum MCS that can be received for each number
 	   of spacial streams */
 	uint16_t vhtRxMCSMap;
@@ -366,7 +363,6 @@ typedef struct sSirSupportedRates {
 	uint16_t vhtTxMCSMap;
 	/*Indicate the highest VHT data rate that the STA is able to transmit */
 	uint16_t vhtTxHighestDataRate;
-#endif
 } tSirSupportedRates, *tpSirSupportedRates;
 
 typedef enum eSirRFBand {
@@ -512,9 +508,7 @@ typedef enum eSirNwType {
 	eSIR_11B_NW_TYPE,
 	eSIR_11G_NW_TYPE,
 	eSIR_11N_NW_TYPE,
-#ifdef WLAN_FEATURE_11AC
 	eSIR_11AC_NW_TYPE,
-#endif
 	eSIR_DONOT_USE_NW_TYPE = SIR_MAX_ENUM_SIZE
 } tSirNwType;
 
@@ -681,12 +675,10 @@ typedef struct sSirSmeHTProfile {
 	uint8_t htSupportedChannelWidthSet;
 	uint8_t htRecommendedTxWidthSet;
 	ePhyChanBondState htSecondaryChannelOffset;
-#ifdef WLAN_FEATURE_11AC
 	uint8_t vhtCapability;
 	uint8_t vhtTxChannelWidthSet;
 	uint8_t apCenterChan;
 	uint8_t apChanWidth;
-#endif
 } tSirSmeHTProfile;
 #endif
 /* / Definition for response message to previously */
@@ -973,13 +965,11 @@ typedef struct sSirSmeJoinReq {
 
 	uint8_t txLdpcIniFeatureEnabled;
 	tSirHTConfig htConfig;
-#ifdef WLAN_FEATURE_11AC
 	uint8_t txBFIniFeatureEnabled;
 	uint8_t txBFCsnValue;
 	uint8_t txMuBformee;
 	uint8_t enableVhtpAid;
 	uint8_t enableVhtGid;
-#endif
 	uint8_t enableAmpduPs;
 	uint8_t enableHtSmps;
 	uint8_t htSmps;
diff --git a/core/mac/inc/sir_mac_prop_exts.h b/core/mac/inc/sir_mac_prop_exts.h
index dd24a87904f4..260e081be46c 100644
--- a/core/mac/inc/sir_mac_prop_exts.h
+++ b/core/mac/inc/sir_mac_prop_exts.h
@@ -51,12 +51,10 @@
 	  (dot11Mode ==  WNI_CFG_DOT11_MODE_11AC_ONLY) || \
 	  (dot11Mode ==  WNI_CFG_DOT11_MODE_ALL)) ? true:false)
 
-#ifdef WLAN_FEATURE_11AC
 #define IS_DOT11_MODE_VHT(dot11Mode) \
 	(((dot11Mode == WNI_CFG_DOT11_MODE_11AC) || \
 	  (dot11Mode ==  WNI_CFG_DOT11_MODE_11AC_ONLY) || \
 	  (dot11Mode ==  WNI_CFG_DOT11_MODE_ALL)) ? true:false)
-#endif
 
 #define IS_DOT11_MODE_11B(dot11Mode)  \
 	((dot11Mode == WNI_CFG_DOT11_MODE_11B) ? true:false)
diff --git a/core/mac/inc/sir_mac_prot_def.h b/core/mac/inc/sir_mac_prot_def.h
index a417daefd490..75ada58fea90 100644
--- a/core/mac/inc/sir_mac_prot_def.h
+++ b/core/mac/inc/sir_mac_prot_def.h
@@ -191,10 +191,8 @@
 #define SIR_MAC_RRM_NEIGHBOR_RPT               5
 
 /* VHT Action Field */
-#ifdef WLAN_FEATURE_11AC
 #define SIR_MAC_VHT_GID_NOTIFICATION           1
 #define SIR_MAC_VHT_OPMODE_NOTIFICATION        2
-#endif
 
 #define NUM_OF_SOUNDING_DIMENSIONS	1 /*Nss - 1, (Nss = 2 for 2x2)*/
 /* HT Action Field Codes */
@@ -382,12 +380,10 @@
 #define SIR_MAC_HT_INFO_EID_MIN    0
 #define SIR_MAC_HT_INFO_EID_MAX    255
 
-#ifdef WLAN_FEATURE_11AC
 #define SIR_MAC_VHT_CAPABILITIES_EID   191
 #define SIR_MAC_VHT_OPERATION_EID      192
 #define SIR_MAC_VHT_EXT_BSS_LOAD_EID   193
 #define SIR_MAC_VHT_OPMODE_EID         199
-#endif
 #define SIR_MAC_MAX_SUPPORTED_MCS_SET    16
 
 #ifdef FEATURE_AP_MCC_CH_AVOIDANCE
@@ -577,9 +573,7 @@
 #define SIR_MAC_SET_RRM(x)               (((uint16_t) x) | 0x1000)
 #define SIR_MAC_SET_GROUP_ACK(x)         (((uint16_t) x) | 0x4000)
 
-#ifdef WLAN_FEATURE_11AC
 #define SIR_MAC_GET_VHT_MAX_AMPDU_EXPO(x) ((((uint32_t) x) & 0x03800000) >> 23)
-#endif
 
 /* bitname must be one of the above, eg ESS, CF_POLLABLE, etc. */
 #define SIR_MAC_CLEAR_CAPABILITY(u16value, bitname) \
diff --git a/core/mac/src/include/parser_api.h b/core/mac/src/include/parser_api.h
index 087833dd8b1c..27e72b527a69 100644
--- a/core/mac/src/include/parser_api.h
+++ b/core/mac/src/include/parser_api.h
@@ -145,14 +145,12 @@ typedef struct sSirProbeRespBeacon {
 
 	uint8_t mdiePresent;
 
-#ifdef WLAN_FEATURE_11AC
 	tDot11fIEVHTCaps VHTCaps;
 	tDot11fIEVHTOperation VHTOperation;
 	tDot11fIEVHTExtBssLoad VHTExtBssLoad;
 	tDot11fIEOperatingMode OperatingMode;
 	uint8_t WiderBWChanSwitchAnnPresent;
 	tDot11fIEWiderBWChanSwitchAnn WiderBWChanSwitchAnn;
-#endif
 	uint8_t Vendor1IEPresent;
 	tDot11fIEvendor2_ie vendor2_ie;
 	uint8_t Vendor3IEPresent;
@@ -177,10 +175,7 @@ typedef struct sSirProbeReq {
 	uint8_t extendedRatesPresent;
 	uint8_t wscIePresent;
 	uint8_t p2pIePresent;
-#ifdef WLAN_FEATURE_11AC
 	tDot11fIEVHTCaps VHTCaps;
-#endif
-
 } tSirProbeReq, *tpSirProbeReq;
 
 /* / Association Request structure (one day to be replaced by */
@@ -229,10 +224,8 @@ typedef struct sSirAssocReq {
 	   required for indicating the frame to upper layers */
 	uint32_t assocReqFrameLength;
 	uint8_t *assocReqFrame;
-#ifdef WLAN_FEATURE_11AC
 	tDot11fIEVHTCaps VHTCaps;
 	tDot11fIEOperatingMode operMode;
-#endif
 	tDot11fIEExtCap ExtCap;
 } tSirAssocReq, *tpSirAssocReq;
 
@@ -275,10 +268,8 @@ typedef struct sSirAssocRsp {
 	uint8_t tspecPresent;
 	uint8_t tsmPresent;
 #endif
-#ifdef WLAN_FEATURE_11AC
 	tDot11fIEVHTCaps VHTCaps;
 	tDot11fIEVHTOperation VHTOperation;
-#endif
 	tDot11fIEExtCap ExtCap;
 	tSirQosMapSet QosMapSet;
 #ifdef WLAN_FEATURE_11W
@@ -904,7 +895,6 @@ void populate_dot11f_assoc_rsp_rates(tpAniSirGlobal pMac,
 
 int find_ie_location(tpAniSirGlobal pMac, tpSirRSNie pRsnIe, uint8_t EID);
 
-#ifdef WLAN_FEATURE_11AC
 tSirRetStatus
 populate_dot11f_vht_caps(tpAniSirGlobal pMac, tpPESession psessionEntry,
 			tDot11fIEVHTCaps *pDot11f);
@@ -931,7 +921,6 @@ void
 populate_dot11f_wider_bw_chan_switch_ann(tpAniSirGlobal pMac,
 					tDot11fIEWiderBWChanSwitchAnn *pDot11f,
 					tpPESession psessionEntry);
-#endif
 
 void populate_dot11f_timeout_interval(tpAniSirGlobal pMac,
 				tDot11fIETimeoutInterval *pDot11f,
diff --git a/core/mac/src/include/sir_params.h b/core/mac/src/include/sir_params.h
index 30a0ad1cb1e0..62b8517406e8 100644
--- a/core/mac/src/include/sir_params.h
+++ b/core/mac/src/include/sir_params.h
@@ -59,7 +59,6 @@ typedef enum {
 	PHY_SINGLE_CHANNEL_CENTERED = 0,        /* 20MHz IF bandwidth centered on IF carrier */
 	PHY_DOUBLE_CHANNEL_LOW_PRIMARY = 1,     /* 40MHz IF bandwidth with lower 20MHz supporting the primary channel */
 	PHY_DOUBLE_CHANNEL_HIGH_PRIMARY = 3,    /* 40MHz IF bandwidth with higher 20MHz supporting the primary channel */
-#ifdef WLAN_FEATURE_11AC
 	PHY_QUADRUPLE_CHANNEL_20MHZ_LOW_40MHZ_CENTERED = 4,     /* 20/40MHZ offset LOW 40/80MHZ offset CENTERED */
 	PHY_QUADRUPLE_CHANNEL_20MHZ_CENTERED_40MHZ_CENTERED = 5,        /* 20/40MHZ offset CENTERED 40/80MHZ offset CENTERED */
 	PHY_QUADRUPLE_CHANNEL_20MHZ_HIGH_40MHZ_CENTERED = 6,    /* 20/40MHZ offset HIGH 40/80MHZ offset CENTERED */
@@ -67,7 +66,6 @@ typedef enum {
 	PHY_QUADRUPLE_CHANNEL_20MHZ_HIGH_40MHZ_LOW = 8, /* 20/40MHZ offset HIGH 40/80MHZ offset LOW */
 	PHY_QUADRUPLE_CHANNEL_20MHZ_LOW_40MHZ_HIGH = 9, /* 20/40MHZ offset LOW 40/80MHZ offset HIGH */
 	PHY_QUADRUPLE_CHANNEL_20MHZ_HIGH_40MHZ_HIGH = 10,       /* 20/40MHZ offset-HIGH 40/80MHZ offset HIGH */
-#endif
 	PHY_CHANNEL_BONDING_STATE_MAX = 11
 } ePhyChanBondState;
 
@@ -393,9 +391,7 @@ typedef struct sSirMbMsgP2p {
 
 #define SIR_HAL_SET_TM_LEVEL_REQ           (SIR_HAL_ITC_MSG_TYPES_BEGIN + 134)
 
-#ifdef WLAN_FEATURE_11AC
 #define SIR_HAL_UPDATE_OP_MODE             (SIR_HAL_ITC_MSG_TYPES_BEGIN + 135)
-#endif
 
 #ifdef FEATURE_WLAN_TDLS
 /* / PE <-> HAL TDLS messages */
@@ -453,10 +449,8 @@ typedef struct sSirMbMsgP2p {
 #define SIR_HAL_SET_MAX_TX_POWER_PER_BAND_REQ \
 					    (SIR_HAL_ITC_MSG_TYPES_BEGIN + 170)
 
-#ifdef WLAN_FEATURE_11AC
 #define SIR_HAL_UPDATE_MEMBERSHIP           (SIR_HAL_ITC_MSG_TYPES_BEGIN + 172)
 #define SIR_HAL_UPDATE_USERPOS              (SIR_HAL_ITC_MSG_TYPES_BEGIN + 173)
-#endif
 
 #ifdef FEATURE_WLAN_TDLS
 #define SIR_HAL_UPDATE_FW_TDLS_STATE        (SIR_HAL_ITC_MSG_TYPES_BEGIN + 174)
@@ -485,9 +479,7 @@ typedef struct sSirMbMsgP2p {
 #define SIR_HAL_DISASSOC_TX_COMP            (SIR_HAL_ITC_MSG_TYPES_BEGIN + 191)
 #define SIR_HAL_DEAUTH_TX_COMP              (SIR_HAL_ITC_MSG_TYPES_BEGIN + 192)
 
-#ifdef WLAN_FEATURE_11AC
 #define SIR_HAL_UPDATE_RX_NSS               (SIR_HAL_ITC_MSG_TYPES_BEGIN + 193)
-#endif
 
 #ifdef WLAN_FEATURE_STATS_EXT
 #define SIR_HAL_STATS_EXT_REQUEST           (SIR_HAL_ITC_MSG_TYPES_BEGIN + 194)
diff --git a/core/mac/src/pe/include/lim_global.h b/core/mac/src/pe/include/lim_global.h
index ce289a4be5ea..16e50515bae2 100644
--- a/core/mac/src/pe/include/lim_global.h
+++ b/core/mac/src/pe/include/lim_global.h
@@ -351,9 +351,7 @@ typedef struct sLimMlmStaContext {
 	uint8_t schClean:1;
 	/* 802.11n HT Capability in Station: Enabled 1 or DIsabled 0 */
 	uint8_t htCapability:1;
-#ifdef WLAN_FEATURE_11AC
 	uint8_t vhtCapability:1;
-#endif
 } tLimMlmStaContext, *tpLimMlmStaContext;
 
 /* Structure definition to hold deferred messages queue parameters */
@@ -480,11 +478,9 @@ struct tLimIbssPeerNode {
 	uint8_t *beacon;        /* Hold beacon to be sent to HDD/CSR */
 	uint16_t beaconLen;
 
-#ifdef WLAN_FEATURE_11AC
 	tDot11fIEVHTCaps VHTCaps;
 	uint8_t vhtSupportedChannelWidthSet;
 	uint8_t vhtBeamFormerCapable;
-#endif
 	/*
 	 * Peer Atim Info
 	 */
@@ -512,7 +508,6 @@ typedef struct sLimChannelSwitchInfo {
 	uint8_t switchMode;
 } tLimChannelSwitchInfo, *tpLimChannelSwitchInfo;
 
-#ifdef WLAN_FEATURE_11AC
 typedef struct sLimOperatingModeInfo {
 	uint8_t present;
 	uint8_t chanWidth:2;
@@ -520,7 +515,6 @@ typedef struct sLimOperatingModeInfo {
 	uint8_t rxNSS:3;
 	uint8_t rxNSSType:1;
 } tLimOperatingModeInfo, *tpLimOperatingModeInfo;
-#endif
 
 typedef struct sLimWiderBWChannelSwitch {
 	uint8_t newChanWidth;
diff --git a/core/mac/src/pe/lim/lim_assoc_utils.c b/core/mac/src/pe/lim/lim_assoc_utils.c
index f7616dea751a..07dbb857eace 100644
--- a/core/mac/src/pe/lim/lim_assoc_utils.c
+++ b/core/mac/src/pe/lim/lim_assoc_utils.c
@@ -1482,7 +1482,6 @@ bool lim_is_reassoc_in_progress(tpAniSirGlobal pMac, tpPESession psessionEntry)
 	return false;
 } /*** end lim_is_reassoc_in_progress() ***/
 
-#ifdef WLAN_FEATURE_11AC
 /**
  * lim_populate_vht_mcs_set - function to populate vht mcs rate set
  * @mac_ctx: pointer to global mac structure
@@ -1616,7 +1615,6 @@ error:
 
 	return eSIR_FAILURE;
 }
-#endif
 
 /**
  * lim_populate_own_rate_set() - comprises the basic and extended rates read
@@ -1640,19 +1638,11 @@ error:
  *
  * Return: eSIR_SUCCESS or eSIR_FAILURE.
  */
-#ifdef WLAN_FEATURE_11AC
 tSirRetStatus
 lim_populate_own_rate_set(tpAniSirGlobal mac_ctx,
 		tpSirSupportedRates rates, uint8_t *supported_mcs_set,
 		uint8_t basic_only, tpPESession session_entry,
 		tDot11fIEVHTCaps *vht_caps)
-#else
-tSirRetStatus
-lim_populate_own_rate_set(tpAniSirGlobal mac_ctx,
-			  tpSirSupportedRates rates,
-			  uint8_t *supported_mcs_set,
-			  uint8_t basic_only, tpPESession session_entry)
-#endif
 {
 	tSirMacRateSet temp_rate_set;
 	tSirMacRateSet temp_rate_set2;
@@ -1662,7 +1652,6 @@ lim_populate_own_rate_set(tpAniSirGlobal mac_ctx,
 	uint8_t a_rate_index = 0;
 	uint8_t b_rate_index = 0;
 
-
 	is_arate = 0;
 
 	wlan_cfg_get_int(mac_ctx, WNI_CFG_DOT11_MODE, &self_sta_dot11mode);
@@ -1700,7 +1689,7 @@ lim_populate_own_rate_set(tpAniSirGlobal mac_ctx,
 		/* we are in big trouble */
 		lim_log(mac_ctx, LOGP, FL("more than 12 rates in CFG"));
 		/* panic */
-		goto error;
+		return eSIR_FAILURE;
 	}
 	/* copy all rates in temp_rate_set, there are 12 rates max */
 	for (i = 0; i < temp_rate_set2.numRates; i++)
@@ -1767,7 +1756,7 @@ lim_populate_own_rate_set(tpAniSirGlobal mac_ctx,
 			/* Could not get rateset from CFG. Log error. */
 			lim_log(mac_ctx, LOGE,
 				FL("could not retrieve supportedMCSSet"));
-			goto error;
+			return eSIR_FAILURE;
 		}
 
 		/*
@@ -1787,29 +1776,17 @@ lim_populate_own_rate_set(tpAniSirGlobal mac_ctx,
 			PELOG2(lim_log(mac_ctx, LOG2, FL("%x "),
 				       rates->supportedMCSSet[i]);)
 	}
-#ifdef WLAN_FEATURE_11AC
 	lim_populate_vht_mcs_set(mac_ctx, rates, vht_caps, session_entry);
-#endif
 
 	return eSIR_SUCCESS;
-error:
-	return eSIR_FAILURE;
 }
 
-#ifdef WLAN_FEATURE_11AC
 tSirRetStatus
 lim_populate_peer_rate_set(tpAniSirGlobal pMac,
 			   tpSirSupportedRates pRates,
 			   uint8_t *pSupportedMCSSet,
 			   uint8_t basicOnly,
 			   tpPESession psessionEntry, tDot11fIEVHTCaps *pVHTCaps)
-#else
-tSirRetStatus
-lim_populate_peer_rate_set(tpAniSirGlobal pMac,
-			   tpSirSupportedRates pRates,
-			   uint8_t *pSupportedMCSSet,
-			   uint8_t basicOnly, tpPESession psessionEntry)
-#endif
 {
 	tSirMacRateSet tempRateSet;
 	tSirMacRateSet tempRateSet2;
@@ -1825,7 +1802,7 @@ lim_populate_peer_rate_set(tpAniSirGlobal pMac,
 	} else {
 		lim_log(pMac, LOGE,
 			FL("more than SIR_MAC_RATESET_EID_MAX rates\n"));
-		goto error;
+		return eSIR_FAILURE;
 	}
 	if ((psessionEntry->dot11mode == WNI_CFG_DOT11_MODE_11G) ||
 		(psessionEntry->dot11mode == WNI_CFG_DOT11_MODE_11A) ||
@@ -1843,7 +1820,7 @@ lim_populate_peer_rate_set(tpAniSirGlobal pMac,
 			lim_log(pMac, LOGE,
 				FL
 					("psessionEntry->extRateSet.numRates more than SIR_MAC_RATESET_EID_MAX rates\n"));
-			goto error;
+			return eSIR_FAILURE;
 		}
 	} else
 		tempRateSet2.numRates = 0;
@@ -1851,7 +1828,7 @@ lim_populate_peer_rate_set(tpAniSirGlobal pMac,
 	    SIR_MAC_RATESET_EID_MAX) {
 		/* we are in big trouble */
 		lim_log(pMac, LOGP, FL("more than 12 rates in CFG"));
-		goto error;
+		return eSIR_FAILURE;
 	}
 
 	/* copy all rates in tempRateSet, there are 12 rates max */
@@ -1919,7 +1896,7 @@ lim_populate_peer_rate_set(tpAniSirGlobal pMac,
 				       (pMac, LOGE,
 				       FL("could not retrieve supportedMCSSet"));
 			       )
-			goto error;
+			return eSIR_FAILURE;
 		}
 		/* if supported MCS Set of the peer is passed in, then do the intersection */
 		/* else use the MCS set from local CFG. */
@@ -1935,12 +1912,8 @@ lim_populate_peer_rate_set(tpAniSirGlobal pMac,
 				       pRates->supportedMCSSet[i]);
 			       )
 	}
-#ifdef WLAN_FEATURE_11AC
 	lim_populate_vht_mcs_set(pMac, pRates, pVHTCaps, psessionEntry);
-#endif
 	return eSIR_SUCCESS;
-error:
-	return eSIR_FAILURE;
 } /*** lim_populate_peer_rate_set() ***/
 
 /**
@@ -1973,18 +1946,13 @@ error:
  *
  * Return: eSIR_SUCCESS on success else eSIR_FAILURE
  */
-#ifdef WLAN_FEATURE_11AC
-tSirRetStatus
-lim_populate_matching_rate_set(tpAniSirGlobal mac_ctx, tpDphHashNode sta_ds,
-	tSirMacRateSet *oper_rate_set, tSirMacRateSet *ext_rate_set,
-	uint8_t *supported_mcs_set, tpPESession session_entry,
-	tDot11fIEVHTCaps *vht_caps)
-#else
-tSirRetStatus
-lim_populate_matching_rate_set(tpAniSirGlobal mac_ctx, tpDphHashNode sta_ds,
-	tSirMacRateSet *oper_rate_set, tSirMacRateSet *ext_rate_set,
-	uint8_t *supported_mcs_set, tpPESession session_entry)
-#endif
+tSirRetStatus lim_populate_matching_rate_set(tpAniSirGlobal mac_ctx,
+					     tpDphHashNode sta_ds,
+					     tSirMacRateSet *oper_rate_set,
+					     tSirMacRateSet *ext_rate_set,
+					     uint8_t *supported_mcs_set,
+					     tpPESession session_entry,
+					     tDot11fIEVHTCaps *vht_caps)
 {
 	tSirMacRateSet temp_rate_set;
 	tSirMacRateSet temp_rate_set2;
@@ -2016,7 +1984,7 @@ lim_populate_matching_rate_set(tpAniSirGlobal mac_ctx, tpDphHashNode sta_ds,
 
 	if ((temp_rate_set.numRates + temp_rate_set2.numRates) > 12) {
 		lim_log(mac_ctx, LOGE, FL("more than 12 rates in CFG"));
-		goto error;
+		return eSIR_FAILURE;
 	}
 
 	/*
@@ -2147,7 +2115,7 @@ lim_populate_matching_rate_set(tpAniSirGlobal mac_ctx, tpDphHashNode sta_ds,
 			/* Could not get rateset from CFG. Log error. */
 			lim_log(mac_ctx, LOGP,
 				FL("could not retrieve supportedMCSet"));
-			goto error;
+			return eSIR_FAILURE;
 		}
 
 		for (i = 0; i < val; i++)
@@ -2162,10 +2130,8 @@ lim_populate_matching_rate_set(tpAniSirGlobal mac_ctx, tpDphHashNode sta_ds,
 			    sta_ds->supportedRates.supportedMCSSet[i]);
 		}
 	}
-#ifdef WLAN_FEATURE_11AC
 	lim_populate_vht_mcs_set(mac_ctx, &sta_ds->supportedRates, vht_caps,
 				 session_entry);
-#endif
 	/*
 	 * Set the erpEnabled bit if the phy is in G mode and at least
 	 * one A rate is supported
@@ -2174,10 +2140,6 @@ lim_populate_matching_rate_set(tpAniSirGlobal mac_ctx, tpDphHashNode sta_ds,
 		sta_ds->erpEnabled = eHAL_SET;
 
 	return eSIR_SUCCESS;
-
-error:
-
-	return eSIR_FAILURE;
 }
 
 /**
@@ -2354,32 +2316,24 @@ lim_add_sta(tpAniSirGlobal mac_ctx,
 	    LIM_IS_BT_AMP_AP_ROLE(session_entry) ||
 	    LIM_IS_IBSS_ROLE(session_entry)) {
 		add_sta_params->htCapable = sta_ds->mlmStaContext.htCapability;
-#ifdef WLAN_FEATURE_11AC
 		add_sta_params->vhtCapable =
 			 sta_ds->mlmStaContext.vhtCapability;
-#endif
 	}
 #ifdef FEATURE_WLAN_TDLS
 	/* SystemRole shouldn't be matter if staType is TDLS peer */
 	else if (STA_ENTRY_TDLS_PEER == sta_ds->staType) {
 		add_sta_params->htCapable = sta_ds->mlmStaContext.htCapability;
-#ifdef WLAN_FEATURE_11AC
 		add_sta_params->vhtCapable =
 			 sta_ds->mlmStaContext.vhtCapability;
-#endif
 	}
 #endif
 	else {
 		add_sta_params->htCapable = session_entry->htCapability;
-#ifdef WLAN_FEATURE_11AC
 		add_sta_params->vhtCapable = session_entry->vhtCapability;
-#endif
 
 	}
-#ifdef WLAN_FEATURE_11AC
 	lim_log(mac_ctx, LOG2, FL("vhtCapable: %d "),
 		 add_sta_params->vhtCapable);
-#endif
 	lim_log(mac_ctx, LOG2, FL(" StaIdx: %d updateSta = %d htcapable = %d "),
 		add_sta_params->staIdx, add_sta_params->updateSta,
 		add_sta_params->htCapable);
@@ -2928,13 +2882,8 @@ lim_add_sta_self(tpAniSirGlobal pMac, uint16_t staIdx, uint8_t updateSta,
 		pAddStaParams->shortPreambleSupported = val;
 	}
 
-#ifdef WLAN_FEATURE_11AC
 	lim_populate_own_rate_set(pMac, &pAddStaParams->supportedRates, NULL, false,
 				  psessionEntry, NULL);
-#else
-	lim_populate_own_rate_set(pMac, &pAddStaParams->supportedRates, NULL, false,
-				  psessionEntry);
-#endif
 	if (IS_DOT11_MODE_HT(selfStaDot11Mode)) {
 		pAddStaParams->htCapable = true;
 #ifdef DISABLE_GF_FOR_INTEROP
@@ -3042,7 +2991,6 @@ lim_add_sta_self(tpAniSirGlobal pMac, uint16_t staIdx, uint8_t updateSta,
 				pAddStaParams->mimoPS, pAddStaParams->rifsMode);
 		}
 	}
-#ifdef WLAN_FEATURE_11AC
 	pAddStaParams->vhtCapable = IS_DOT11_MODE_VHT(selfStaDot11Mode);
 	if (pAddStaParams->vhtCapable) {
 		pAddStaParams->ch_width =
@@ -3070,7 +3018,6 @@ lim_add_sta_self(tpAniSirGlobal pMac, uint16_t staIdx, uint8_t updateSta,
 	}
 	pAddStaParams->vhtTxMUBformeeCapable = psessionEntry->txMuBformee;
 	pAddStaParams->enableVhtpAid = psessionEntry->enableVhtpAid;
-#endif
 	pAddStaParams->enableAmpduPs = psessionEntry->enableAmpduPs;
 	pAddStaParams->enableHtSmps = psessionEntry->enableHtSmps;
 	pAddStaParams->htSmpsconfig = psessionEntry->htSmpsvalue;
@@ -4464,7 +4411,6 @@ tSirRetStatus lim_sta_send_add_bss_pre_assoc(tpAniSirGlobal pMac, uint8_t update
 	pAddBssParams->currentOperChannel = bssDescription->channelId;
 	lim_log(pMac, LOG2, FL("currentOperChannel %d"),
 		pAddBssParams->currentOperChannel);
-#ifdef WLAN_FEATURE_11AC
 	if (psessionEntry->vhtCapability &&
 		(IS_BSS_VHT_CAPABLE(pBeaconStruct->VHTCaps) ||
 		 IS_BSS_VHT_CAPABLE(pBeaconStruct->vendor2_ie.VHTCaps))) {
@@ -4505,7 +4451,6 @@ tSirRetStatus lim_sta_send_add_bss_pre_assoc(tpAniSirGlobal pMac, uint8_t update
 		pAddBssParams->vhtCapable, pAddBssParams->ch_width,
 		pAddBssParams->ch_center_freq_seg0,
 		pAddBssParams->ch_center_freq_seg1);
-#endif
 
 	/*
 	 * Populate the STA-related parameters here
@@ -4710,20 +4655,12 @@ tSirRetStatus lim_sta_send_add_bss_pre_assoc(tpAniSirGlobal pMac, uint8_t update
 		pAddBssParams->staContext.wmmEnabled = 0;
 
 	/* Update the rates */
-#ifdef WLAN_FEATURE_11AC
 	lim_populate_peer_rate_set(pMac,
 			&pAddBssParams->staContext.
 			supportedRates,
 			pBeaconStruct->HTCaps.supportedMCSSet,
 			false, psessionEntry,
 			&pBeaconStruct->VHTCaps);
-#else
-	lim_populate_peer_rate_set(pMac,
-			&pAddBssParams->staContext.
-			supportedRates,
-			pBeaconStruct->HTCaps.supportedMCSSet,
-			false, psessionEntry);
-#endif
 	lim_fill_supported_rates_info(pMac, NULL,
 			&pAddBssParams->staContext.
 			supportedRates, psessionEntry);
@@ -4876,14 +4813,11 @@ tStaRateMode lim_get_sta_rate_mode(uint8_t dot11Mode)
 		return eSTA_11bg;
 	case WNI_CFG_DOT11_MODE_11N:
 		return eSTA_11n;
-#ifdef WLAN_FEATURE_11AC
 	case WNI_CFG_DOT11_MODE_11AC:
 		return eSTA_11ac;
-#endif
 	case WNI_CFG_DOT11_MODE_ALL:
 	default:
 		return eSTA_11n;
-
 	}
 }
 
diff --git a/core/mac/src/pe/lim/lim_assoc_utils.h b/core/mac/src/pe/lim/lim_assoc_utils.h
index 7686940149c0..46f7e307537a 100644
--- a/core/mac/src/pe/lim/lim_assoc_utils.h
+++ b/core/mac/src/pe/lim/lim_assoc_utils.h
@@ -62,22 +62,13 @@ void lim_reject_association(tpAniSirGlobal, tSirMacAddr, uint8_t,
 			    uint8_t, tAniAuthType,
 			    uint16_t, uint8_t, tSirResultCodes, tpPESession);
 
-#ifdef WLAN_FEATURE_11AC
 tSirRetStatus lim_populate_peer_rate_set(tpAniSirGlobal pMac,
 					 tpSirSupportedRates pRates,
 					 uint8_t *pSupportedMCSSet,
 					 uint8_t basicOnly,
 					 tpPESession psessionEntry,
 					 tDot11fIEVHTCaps * pVHTCaps);
-#else
-tSirRetStatus lim_populate_peer_rate_set(tpAniSirGlobal pMac,
-					 tpSirSupportedRates pRates,
-					 uint8_t *pSupportedMCSSet,
-					 uint8_t basicOnly,
-					 tpPESession psessionEntry);
-#endif
 
-#ifdef WLAN_FEATURE_11AC
 tSirRetStatus lim_populate_own_rate_set(tpAniSirGlobal pMac,
 					tpSirSupportedRates pRates,
 					uint8_t *pSupportedMCSSet,
@@ -85,15 +76,6 @@ tSirRetStatus lim_populate_own_rate_set(tpAniSirGlobal pMac,
 					tpPESession psessionEntry,
 					tDot11fIEVHTCaps * pVHTCaps);
 
-#else
-tSirRetStatus lim_populate_own_rate_set(tpAniSirGlobal pMac,
-					tpSirSupportedRates pRates,
-					uint8_t *pSupportedMCSSet,
-					uint8_t basicOnly,
-					tpPESession psessionEntry);
-#endif
-
-#ifdef WLAN_FEATURE_11AC
 tSirRetStatus
 lim_populate_matching_rate_set(tpAniSirGlobal pMac,
 			       tpDphHashNode pStaDs,
@@ -102,20 +84,8 @@ lim_populate_matching_rate_set(tpAniSirGlobal pMac,
 			       uint8_t *pSupportedMCSSet,
 			       tpPESession psessionEntry,
 			       tDot11fIEVHTCaps * pVHTCaps);
-#else
-tSirRetStatus lim_populate_matching_rate_set(tpAniSirGlobal,
-					     tpDphHashNode,
-					     tSirMacRateSet *,
-					     tSirMacRateSet *,
-					     uint8_t *pSupportedMCSSet,
-					     tpPESession);
-
-#endif
-
-#ifdef WLAN_FEATURE_11AC
 #define MCSMAPMASK1x1 0x3
 #define MCSMAPMASK2x2 0xC
-#endif
 
 tSirRetStatus lim_add_sta(tpAniSirGlobal, tpDphHashNode, uint8_t, tpPESession);
 tSirRetStatus lim_del_bss(tpAniSirGlobal, tpDphHashNode, uint16_t, tpPESession);
diff --git a/core/mac/src/pe/lim/lim_ft.c b/core/mac/src/pe/lim/lim_ft.c
index 99c3ed0f33be..c12dbd7a5dff 100644
--- a/core/mac/src/pe/lim/lim_ft.c
+++ b/core/mac/src/pe/lim/lim_ft.c
@@ -517,7 +517,6 @@ tSirRetStatus lim_ft_prepare_add_bss_req(tpAniSirGlobal pMac,
 		pBeaconStruct->HTInfo.secondaryChannelOffset;
 	sta_ctx = &pAddBssParams->staContext;
 
-#ifdef WLAN_FEATURE_11AC
 	if (pftSessionEntry->vhtCapability &&
 	    pftSessionEntry->vhtCapabilityPresentInBeacon) {
 		pAddBssParams->vhtCapable = pBeaconStruct->VHTCaps.present;
@@ -573,7 +572,6 @@ tSirRetStatus lim_ft_prepare_add_bss_req(tpAniSirGlobal pMac,
 	} else {
 		pAddBssParams->vhtCapable = 0;
 	}
-#endif
 
 	lim_log(pMac, LOG1, FL("SIR_HAL_ADD_BSS_REQ with channel = %d..."),
 		pAddBssParams->currentOperChannel);
@@ -683,20 +681,12 @@ tSirRetStatus lim_ft_prepare_add_bss_req(tpAniSirGlobal pMac,
 		    && (pftSessionEntry->isOSENConnection))
 			pAddBssParams->staContext.wpa_rsn = 1;
 		/* Update the rates */
-#ifdef WLAN_FEATURE_11AC
 		lim_populate_peer_rate_set(pMac,
 					   &pAddBssParams->staContext.
 					   supportedRates,
 					   pBeaconStruct->HTCaps.supportedMCSSet,
 					   false, pftSessionEntry,
 					   &pBeaconStruct->VHTCaps);
-#else
-		lim_populate_peer_rate_set(pMac,
-					   &pAddBssParams->staContext.
-					   supportedRates,
-					   beaconStruct.HTCaps.supportedMCSSet,
-					   false, pftSessionEntry);
-#endif
 		if (pftSessionEntry->htCapability) {
 			pAddBssParams->staContext.supportedRates.opRateMode =
 				eSTA_11n;
@@ -834,8 +824,6 @@ void lim_fill_ft_session(tpAniSirGlobal pMac,
 	pftSessionEntry->htRecommendedTxWidthSet =
 		pftSessionEntry->htSupportedChannelWidthSet;
 
-
-#ifdef WLAN_FEATURE_11AC
 	if (IS_BSS_VHT_CAPABLE(pBeaconStruct->VHTCaps) &&
 		pBeaconStruct->VHTOperation.present &&
 		pftSessionEntry->vhtCapability) {
@@ -843,7 +831,6 @@ void lim_fill_ft_session(tpAniSirGlobal pMac,
 	} else {
 		pftSessionEntry->vhtCapabilityPresentInBeacon = 0;
 	}
-#endif
 	if (pftSessionEntry->htRecommendedTxWidthSet) {
 		pftSessionEntry->ch_width = CH_WIDTH_40MHZ;
 		if (pftSessionEntry->vhtCapabilityPresentInBeacon &&
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 cfd4752271cd..f3814b151584 100644
--- a/core/mac/src/pe/lim/lim_ibss_peer_mgmt.c
+++ b/core/mac/src/pe/lim/lim_ibss_peer_mgmt.c
@@ -194,7 +194,6 @@ ibss_peer_collect(tpAniSirGlobal pMac,
 	}
 
 	/* Collect peer VHT capabilities based on the received beacon from the peer */
-#ifdef WLAN_FEATURE_11AC
 	if (pBeacon->VHTCaps.present) {
 		pPeer->vhtSupportedChannelWidthSet =
 			pBeacon->VHTOperation.chanWidth;
@@ -205,7 +204,6 @@ ibss_peer_collect(tpAniSirGlobal pMac,
 			     (uint8_t *) &pBeacon->VHTCaps,
 			     sizeof(tDot11fIEVHTCaps));
 	}
-#endif
 	pPeer->erpIePresent = pBeacon->erpPresent;
 
 	qdf_mem_copy((uint8_t *) &pPeer->supportedRates,
@@ -261,7 +259,6 @@ ibss_sta_caps_update(tpAniSirGlobal pMac,
 			pStaDs->htLdpcCapable = pPeerNode->htLdpcCapable;
 		}
 	}
-#ifdef WLAN_FEATURE_11AC
 	if (IS_DOT11_MODE_VHT(psessionEntry->dot11mode)) {
 		pStaDs->mlmStaContext.vhtCapability = pPeerNode->vhtCapable;
 		if (pPeerNode->vhtCapable) {
@@ -276,7 +273,6 @@ ibss_sta_caps_update(tpAniSirGlobal pMac,
 				(uint8_t) pPeerNode->VHTCaps.ldpcCodingCap;
 		}
 	}
-#endif
 	/* peer is 11e capable but is not 11e enabled yet */
 	/* some STA's when joining Airgo IBSS, assert qos capability even when */
 	/* they don't suport qos. however, they do not include the edca parameter */
@@ -330,18 +326,10 @@ ibss_sta_rates_update(tpAniSirGlobal pMac,
 		      tpDphHashNode pStaDs,
 		      tLimIbssPeerNode *pPeer, tpPESession psessionEntry)
 {
-#ifdef WLAN_FEATURE_11AC
 	lim_populate_matching_rate_set(pMac, pStaDs, &pPeer->supportedRates,
 				       &pPeer->extendedRates,
 				       pPeer->supportedMCSSet, psessionEntry,
 				       &pPeer->VHTCaps);
-#else
-	/* Populate supported rateset */
-	lim_populate_matching_rate_set(pMac, pStaDs, &pPeer->supportedRates,
-				       &pPeer->extendedRates,
-				       pPeer->supportedMCSSet, psessionEntry);
-#endif
-
 	pStaDs->mlmStaContext.capabilityInfo = pPeer->capabilityInfo;
 } /*** end ibss_sta_info_update() ***/
 
diff --git a/core/mac/src/pe/lim/lim_process_action_frame.c b/core/mac/src/pe/lim/lim_process_action_frame.c
index 99bc342e0a38..81e076278913 100644
--- a/core/mac/src/pe/lim/lim_process_action_frame.c
+++ b/core/mac/src/pe/lim/lim_process_action_frame.c
@@ -440,7 +440,6 @@ lim_process_ext_channel_switch_action_frame(tpAniSirGlobal mac_ctx,
 	return;
 } /*** end lim_process_ext_channel_switch_action_frame() ***/
 
-#ifdef WLAN_FEATURE_11AC
 /**
  * __lim_process_operating_mode_action_frame() - To process op mode frames
  * @mac_ctx: pointer to mac context
@@ -680,8 +679,6 @@ out:
 	return;
 }
 
-#endif
-
 static void
 __lim_process_add_ts_req(tpAniSirGlobal pMac, uint8_t *pRxPacketInfo,
 			 tpPESession psessionEntry)
@@ -2094,7 +2091,6 @@ void lim_process_action_frame(tpAniSirGlobal mac_ctx,
 		}
 		break;
 #endif
-#ifdef WLAN_FEATURE_11AC
 	case SIR_MAC_ACTION_VHT:
 		if (!session->vhtCapability)
 			break;
@@ -2113,7 +2109,6 @@ void lim_process_action_frame(tpAniSirGlobal mac_ctx,
 			break;
 		}
 		break;
-#endif
 	case SIR_MAC_ACTION_FST: {
 		tpSirMacMgmtHdr     hdr;
 		uint32_t            frame_len;
diff --git a/core/mac/src/pe/lim/lim_process_assoc_req_frame.c b/core/mac/src/pe/lim/lim_process_assoc_req_frame.c
index bd29fd130628..d01130f90b0f 100644
--- a/core/mac/src/pe/lim/lim_process_assoc_req_frame.c
+++ b/core/mac/src/pe/lim/lim_process_assoc_req_frame.c
@@ -1239,9 +1239,7 @@ static bool lim_update_sta_ds(tpAniSirGlobal mac_ctx, tpSirMacMgmtHdr hdr,
 	}
 
 	sta_ds->mlmStaContext.htCapability = assoc_req->HTCaps.present;
-#ifdef WLAN_FEATURE_11AC
 	sta_ds->mlmStaContext.vhtCapability = assoc_req->VHTCaps.present;
-#endif
 	sta_ds->qos.addtsPresent =
 		(assoc_req->addtsPresent == 0) ? false : true;
 	sta_ds->qos.addts = assoc_req->addtsReq;
@@ -1340,7 +1338,6 @@ static bool lim_update_sta_ds(tpAniSirGlobal mac_ctx, tpSirMacMgmtHdr hdr,
 		sta_ds->htSecondaryChannelOffset =
 			(sta_ds->htSupportedChannelWidthSet) ?
 				session->htSecondaryChannelOffset : 0;
-#ifdef WLAN_FEATURE_11AC
 		if (assoc_req->operMode.present) {
 			sta_ds->vhtSupportedChannelWidthSet =
 				(uint8_t) ((assoc_req->operMode.chanWidth ==
@@ -1371,7 +1368,6 @@ static bool lim_update_sta_ds(tpAniSirGlobal mac_ctx, tpSirMacMgmtHdr hdr,
 			session->htSupportedChannelWidthSet) ?
 			sta_ds->htSupportedChannelWidthSet :
 			session->htSupportedChannelWidthSet;
-#endif
 		sta_ds->baPolicyFlag = 0xFF;
 		sta_ds->htLdpcCapable =
 			(uint8_t) assoc_req->HTCaps.advCodingCap;
@@ -1398,20 +1394,11 @@ static bool lim_update_sta_ds(tpAniSirGlobal mac_ctx, tpSirMacMgmtHdr hdr,
 		else
 			sta_ds->vht_su_bfee_capable = 0;
 	}
-
-#ifdef WLAN_FEATURE_11AC
 	if (lim_populate_matching_rate_set(mac_ctx, sta_ds,
 			&(assoc_req->supportedRates),
 			&(assoc_req->extendedRates),
 			assoc_req->HTCaps.supportedMCSSet,
 			session, &assoc_req->VHTCaps) != eSIR_SUCCESS)
-#else
-	if (lim_populate_matching_rate_set(mac_ctx, sta_ds,
-			&(assoc_req->supportedRates),
-			&(assoc_req->extendedRates),
-			assoc_req->HTCaps.supportedMCSSet,
-			session) != eSIR_SUCCESS)
-#endif
 	{
 		/* Could not update hash table entry at DPH with rateset */
 		lim_log(mac_ctx, LOGE,
@@ -1431,7 +1418,6 @@ static bool lim_update_sta_ds(tpAniSirGlobal mac_ctx, tpSirMacMgmtHdr hdr,
 			assoc_req = session->parsedAssocReq[sta_ds->assocId];
 		return false;
 	}
-#ifdef WLAN_FEATURE_11AC
 	if (assoc_req->operMode.present) {
 		sta_ds->vhtSupportedRxNss = assoc_req->operMode.rxNSS + 1;
 	} else {
@@ -1439,10 +1425,8 @@ static bool lim_update_sta_ds(tpAniSirGlobal mac_ctx, tpSirMacMgmtHdr hdr,
 			((sta_ds->supportedRates.vhtRxMCSMap & MCSMAPMASK2x2)
 				== MCSMAPMASK2x2) ? 1 : 2;
 	}
-#endif
 
 	/* Add STA context at MAC HW (BMU, RHP & TFP) */
-
 	sta_ds->qosMode = false;
 	sta_ds->lleEnabled = false;
 	if (assoc_req->capabilityInfo.qos && (qos_mode == eHAL_SET)) {
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 8faefd1cf15f..725e996e49de 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
@@ -190,7 +190,6 @@ void lim_update_assoc_sta_datas(tpAniSirGlobal mac_ctx,
 		lim_update_stads_htcap(mac_ctx, sta_ds, assoc_rsp,
 				       session_entry);
 
-#ifdef WLAN_FEATURE_11AC
 	if (assoc_rsp->VHTCaps.present)
 		vht_caps = &assoc_rsp->VHTCaps;
 	else if (assoc_rsp->vendor2_ie.VHTCaps.present)
@@ -225,20 +224,9 @@ void lim_update_assoc_sta_datas(tpAniSirGlobal mac_ctx,
 			FL("could not get rateset and extended rate set"));
 		return;
 	}
-#else
-	if (lim_populate_peer_rate_set(mac_ctx, &sta_ds->supportedRates,
-		assoc_rsp->HTCaps.supportedMCSSet,
-		false, session_entry) != eSIR_SUCCESS) {
-		lim_log(mac_ctx, LOGP,
-			FL("could not get rateset and extended rate set"));
-		return;
-	}
-#endif
-#ifdef WLAN_FEATURE_11AC
 	sta_ds->vhtSupportedRxNss =
 		((sta_ds->supportedRates.vhtRxMCSMap & MCSMAPMASK2x2)
 		 == MCSMAPMASK2x2) ? 1 : 2;
-#endif
 	/* If one of the rates is 11g rates, set the ERP mode. */
 	if ((phy_mode == WNI_CFG_PHY_MODE_11G) &&
 		sirIsArate(sta_ds->supportedRates.llaRates[0] & 0x7f))
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 003034de9b85..d5df1d4f2cfc 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
@@ -550,13 +550,8 @@ static void mlm_add_sta(tpAniSirGlobal mac_ctx, tpAddStaParams sta_param,
 	sta_param->enableHtSmps = session_entry->enableHtSmps;
 	sta_param->htSmpsconfig = session_entry->htSmpsvalue;
 
-#ifdef WLAN_FEATURE_11AC
 	lim_populate_own_rate_set(mac_ctx, &sta_param->supportedRates, NULL,
 				  false, session_entry, NULL);
-#else
-	lim_populate_own_rate_set(mac_ctx, &sta_param->supportedRates, NULL,
-				  false, session_entry);
-#endif
 	lim_fill_supported_rates_info(mac_ctx, NULL, &sta_param->supportedRates,
 				      session_entry);
 
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 e70c24f7e814..99d3be57e22f 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
@@ -2804,21 +2804,13 @@ lim_process_sta_mlm_add_bss_rsp_ft(tpAniSirGlobal pMac, tpSirMsgQ limMsgQ,
 
 	pAddStaParams->shortPreambleSupported =
 		(uint8_t) psessionEntry->beaconParams.fShortPreamble;
-#ifdef WLAN_FEATURE_11AC
 	lim_populate_peer_rate_set(pMac, &pAddStaParams->supportedRates, NULL,
 				   false, psessionEntry, NULL);
-#else
-	lim_populate_peer_rate_set(pMac, &pAddStaParams->supportedRates, NULL,
-				   false, psessionEntry);
-#endif
 
 	if (psessionEntry->htCapability) {
 		pAddStaParams->htCapable = psessionEntry->htCapability;
-#ifdef WLAN_FEATURE_11AC
 		pAddStaParams->vhtCapable = psessionEntry->vhtCapability;
 		pAddStaParams->ch_width = psessionEntry->ch_width;
-#endif
-
 		pAddStaParams->greenFieldCapable =
 			lim_get_ht_capability(pMac, eHT_GREENFIELD,
 					      psessionEntry);
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 d9291d2d3e3a..24c4f3f4e4a1 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
@@ -1151,10 +1151,8 @@ static QDF_STATUS lim_send_hal_start_scan_offload_req(tpAniSirGlobal pMac,
 	tSirMsgQ msg;
 	uint16_t i, len;
 	uint16_t ht_cap_len = 0, addn_ie_len = 0;
-#ifdef WLAN_FEATURE_11AC
 	uint8_t *vht_cap_ie;
 	uint16_t vht_cap_len = 0;
-#endif /* WLAN_FEATURE_11AC */
 	tSirRetStatus status, rc = eSIR_SUCCESS;
 	tDot11fIEExtCap extracted_extcap = {0};
 	bool extcap_present = true;
@@ -1198,7 +1196,6 @@ static QDF_STATUS lim_send_hal_start_scan_offload_req(tpAniSirGlobal pMac,
 		addn_ie_len += ht_cap_len;
 	}
 
-#ifdef WLAN_FEATURE_11AC
 	if (IS_DOT11_MODE_VHT(pScanReq->dot11mode)) {
 		lim_log(pMac, LOG1,
 			FL("Adding VHT Caps IE since dot11mode=%d"),
@@ -1209,7 +1206,6 @@ static QDF_STATUS lim_send_hal_start_scan_offload_req(tpAniSirGlobal pMac,
 		len += vht_cap_len;
 		addn_ie_len += vht_cap_len;
 	}
-#endif /* WLAN_FEATURE_11AC */
 
 	pScanOffloadReq = qdf_mem_malloc(len);
 	if (NULL == pScanOffloadReq) {
@@ -1291,7 +1287,6 @@ static QDF_STATUS lim_send_hal_start_scan_offload_req(tpAniSirGlobal pMac,
 		pScanOffloadReq->uIEFieldLen += ht_cap_len;
 	}
 
-#ifdef WLAN_FEATURE_11AC
 	/* Copy VHT Capability info if dot11mode is VHT Capable */
 	if (IS_DOT11_MODE_VHT(pScanReq->dot11mode)) {
 		/* Populate EID and Length field here */
@@ -1304,7 +1299,6 @@ static QDF_STATUS lim_send_hal_start_scan_offload_req(tpAniSirGlobal pMac,
 		lim_set_vht_caps(pMac, NULL, vht_cap_ie, vht_cap_len);
 		pScanOffloadReq->uIEFieldLen += vht_cap_len;
 	}
-#endif /* WLAN_FEATURE_11AC */
 
 	rc = wma_post_ctrl_msg(pMac, &msg);
 	if (rc != eSIR_SUCCESS) {
@@ -1691,7 +1685,6 @@ __lim_process_sme_join_req(tpAniSirGlobal mac_ctx, uint32_t *msg_buf)
 			session->nss = 2;
 		else
 			session->nss = 1;
-#ifdef WLAN_FEATURE_11AC
 		session->vhtCapability =
 			IS_DOT11_MODE_VHT(session->dot11mode);
 		QDF_TRACE(QDF_MODULE_ID_PE, QDF_TRACE_LEVEL_INFO_MED,
@@ -1740,8 +1733,6 @@ __lim_process_sme_join_req(tpAniSirGlobal mac_ctx, uint32_t *msg_buf)
 				  sme_join_req->txBFCsnValue);
 			session->txbf_csn_value = sme_join_req->txBFCsnValue;
 		}
-#endif
-
 		/*Phy mode */
 		session->gLimPhyMode = bss_desc.nwType;
 		handle_ht_capabilityand_ht_info(mac_ctx, session);
diff --git a/core/mac/src/pe/lim/lim_process_tdls.c b/core/mac/src/pe/lim/lim_process_tdls.c
index 26abe4dc5d71..44973cd2fd54 100644
--- a/core/mac/src/pe/lim/lim_process_tdls.c
+++ b/core/mac/src/pe/lim/lim_process_tdls.c
@@ -564,7 +564,6 @@ static void populate_dot11f_tdls_ht_vht_cap(tpAniSirGlobal pMac,
 	}
 	lim_log(pMac, LOG1, FL("HT present = %hu, Chan Width = %hu"),
 		htCap->present, htCap->supportedChannelWidthSet);
-#ifdef WLAN_FEATURE_11AC
 	if (((psessionEntry->currentOperChannel <= SIR_11B_CHANNEL_END) &&
 	     pMac->roam.configParam.enableVhtFor24GHz) ||
 	    (psessionEntry->currentOperChannel >= SIR_11B_CHANNEL_END)) {
@@ -585,7 +584,6 @@ static void populate_dot11f_tdls_ht_vht_cap(tpAniSirGlobal pMac,
 	}
 	lim_log(pMac, LOG1, FL("VHT present = %hu, Chan Width = %hu"),
 		vhtCap->present, vhtCap->supportedChannelWidthSet);
-#endif
 }
 
 /*
@@ -2101,7 +2099,7 @@ lim_tdls_populate_matching_rate_set(tpAniSirGlobal mac_ctx, tpDphHashNode stads,
 
 	if ((temp_rate_set.numRates + temp_rate_set2.numRates) > 12) {
 		lim_log(mac_ctx, LOGE, FL("more than 12 rates in CFG"));
-		goto error;
+		return eSIR_FAILURE;
 	}
 
 	/**
@@ -2198,7 +2196,7 @@ lim_tdls_populate_matching_rate_set(tpAniSirGlobal mac_ctx, tpDphHashNode stads,
 			/* Could not get rateset from CFG. Log error. */
 			lim_log(mac_ctx, LOGP,
 				FL("could not retrieve supportedMCSSet"));
-			goto error;
+			return eSIR_FAILURE;
 		}
 
 		for (i = 0; i < val; i++)
@@ -2212,10 +2210,8 @@ lim_tdls_populate_matching_rate_set(tpAniSirGlobal mac_ctx, tpDphHashNode stads,
 				stads->supportedRates.supportedMCSSet[i]);
 		}
 	}
-#ifdef WLAN_FEATURE_11AC
 	lim_populate_vht_mcs_set(mac_ctx, &stads->supportedRates, vht_caps,
 				 session_entry);
-#endif
 	/**
 	 * Set the erpEnabled bit if the phy is in G mode and at least
 	 * one A rate is supported
@@ -2224,9 +2220,6 @@ lim_tdls_populate_matching_rate_set(tpAniSirGlobal mac_ctx, tpDphHashNode stads,
 		stads->erpEnabled = eHAL_SET;
 
 	return eSIR_SUCCESS;
-
-error:
-	return eSIR_FAILURE;
 }
 
 /*
@@ -2241,10 +2234,8 @@ static void lim_tdls_update_hash_node_info(tpAniSirGlobal pMac,
 	tDot11fIEHTCaps *htCaps;
 	tDot11fIEVHTCaps *pVhtCaps = NULL;
 	tDot11fIEVHTCaps *pVhtCaps_txbf = NULL;
-#ifdef WLAN_FEATURE_11AC
 	tDot11fIEVHTCaps vhtCap;
 	uint8_t cbMode;
-#endif
 	tpDphHashNode pSessStaDs = NULL;
 	uint16_t aid;
 
@@ -2284,7 +2275,6 @@ static void lim_tdls_update_hash_node_info(tpAniSirGlobal pMac,
 		pStaDs->mlmStaContext.htCapability = 0;
 		pMac->lim.gLimTdlsLinkMode = TDLS_LINK_MODE_BG;
 	}
-#ifdef WLAN_FEATURE_11AC
 	lim_tdls_populate_dot11f_vht_caps(pMac, pTdlsAddStaReq, &vhtCap);
 	pVhtCaps = &vhtCap;
 	if (pVhtCaps->present) {
@@ -2328,7 +2318,6 @@ static void lim_tdls_update_hash_node_info(tpAniSirGlobal pMac,
 		pStaDs->vhtSupportedChannelWidthSet =
 			WNI_CFG_VHT_CHANNEL_WIDTH_20_40MHZ;
 	}
-#endif
 	/*Calculate the Secondary Coannel Offset */
 	cbMode = lim_select_cb_mode(pStaDs, psessionEntry,
 				    psessionEntry->currentOperChannel,
@@ -2336,15 +2325,11 @@ static void lim_tdls_update_hash_node_info(tpAniSirGlobal pMac,
 
 	pStaDs->htSecondaryChannelOffset = cbMode;
 
-#ifdef WLAN_FEATURE_11AC
 	if (pStaDs->mlmStaContext.vhtCapability) {
 		pStaDs->htSecondaryChannelOffset = lim_get_htcb_state(cbMode);
 	}
-#endif
-
 	pSessStaDs = dph_lookup_hash_entry(pMac, psessionEntry->bssId, &aid,
 					   &psessionEntry->dph.dphHashTable);
-
 	/* Lets enable QOS parameter */
 	pStaDs->qosMode = 1;
 	pStaDs->wmeEnabled = 1;
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 93911d2c10b4..1126512f9121 100644
--- a/core/mac/src/pe/lim/lim_prop_exts_utils.c
+++ b/core/mac/src/pe/lim/lim_prop_exts_utils.c
@@ -111,7 +111,6 @@ lim_extract_ap_capability(tpAniSirGlobal mac_ctx, uint8_t *p_ie,
 		else
 			mac_ctx->lim.htCapabilityPresentInBeacon = 0;
 
-#ifdef WLAN_FEATURE_11AC
 		QDF_TRACE(QDF_MODULE_ID_PE, QDF_TRACE_LEVEL_INFO_MED,
 			  "beacon.VHTCaps.present = %d BSS_VHT_Capable:%d",
 			  beacon_struct->VHTCaps.present,
@@ -195,7 +194,6 @@ lim_extract_ap_capability(tpAniSirGlobal mac_ctx, uint8_t *p_ie,
 				lim_log(mac_ctx, LOGP,
 					FL("Set VHT_SU_BEAMFORMEE_CAP Fail"));
 		}
-#endif
 		/* Extract the UAPSD flag from WMM Parameter element */
 		if (beacon_struct->wmeEdcaPresent)
 			*uapsd = beacon_struct->edcaParams.qosInfo.uapsd;
@@ -240,24 +238,18 @@ lim_extract_ap_capability(tpAniSirGlobal mac_ctx, uint8_t *p_ie,
 ePhyChanBondState lim_get_htcb_state(ePhyChanBondState aniCBMode)
 {
 	switch (aniCBMode) {
-#ifdef WLAN_FEATURE_11AC
 	case PHY_QUADRUPLE_CHANNEL_20MHZ_HIGH_40MHZ_LOW:
 	case PHY_QUADRUPLE_CHANNEL_20MHZ_HIGH_40MHZ_CENTERED:
 	case PHY_QUADRUPLE_CHANNEL_20MHZ_HIGH_40MHZ_HIGH:
-#endif
 	case PHY_DOUBLE_CHANNEL_HIGH_PRIMARY:
 		return PHY_DOUBLE_CHANNEL_HIGH_PRIMARY;
-#ifdef WLAN_FEATURE_11AC
 	case PHY_QUADRUPLE_CHANNEL_20MHZ_LOW_40MHZ_LOW:
 	case PHY_QUADRUPLE_CHANNEL_20MHZ_LOW_40MHZ_CENTERED:
 	case PHY_QUADRUPLE_CHANNEL_20MHZ_LOW_40MHZ_HIGH:
-#endif
 	case PHY_DOUBLE_CHANNEL_LOW_PRIMARY:
 		return PHY_DOUBLE_CHANNEL_LOW_PRIMARY;
-#ifdef WLAN_FEATURE_11AC
 	case PHY_QUADRUPLE_CHANNEL_20MHZ_CENTERED_40MHZ_CENTERED:
 		return PHY_SINGLE_CHANNEL_CENTERED;
-#endif
 	default:
 		return PHY_SINGLE_CHANNEL_CENTERED;
 	}
@@ -284,10 +276,8 @@ tStaRateMode lim_get_sta_peer_type(tpAniSirGlobal pMac,
 				   tpDphHashNode pStaDs, tpPESession psessionEntry)
 {
 	tStaRateMode staPeerType = eSTA_11b;
-#ifdef WLAN_FEATURE_11AC
 	if (pStaDs->mlmStaContext.vhtCapability)
 		staPeerType = eSTA_11ac;
-#endif
 	else if (pStaDs->mlmStaContext.htCapability)
 		staPeerType = eSTA_11n;
 	else if (pStaDs->erpEnabled)
diff --git a/core/mac/src/pe/lim/lim_prop_exts_utils.h b/core/mac/src/pe/lim/lim_prop_exts_utils.h
index 6c0fd89b1886..50502536a12b 100644
--- a/core/mac/src/pe/lim/lim_prop_exts_utils.h
+++ b/core/mac/src/pe/lim/lim_prop_exts_utils.h
@@ -57,8 +57,6 @@ void lim_extract_ap_capability(tpAniSirGlobal, uint8_t *, uint16_t, uint8_t *,
 			       uint16_t *, uint8_t *, int8_t *, tpPESession);
 
 tStaRateMode lim_get_sta_peer_type(tpAniSirGlobal, tpDphHashNode, tpPESession);
-#ifdef WLAN_FEATURE_11AC
 ePhyChanBondState lim_get_htcb_state(ePhyChanBondState aniCBMode);
-#endif
 
 #endif /* __LIM_PROP_EXTS_UTILS_H */
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 56f8c82e91d7..e36f2a629d63 100644
--- a/core/mac/src/pe/lim/lim_send_management_frames.c
+++ b/core/mac/src/pe/lim/lim_send_management_frames.c
@@ -323,7 +323,6 @@ lim_send_probe_req_mgmt_frame(tpAniSirGlobal mac_ctx,
 				eHT_CHANNEL_WIDTH_40MHZ;
 		}
 	}
-#ifdef WLAN_FEATURE_11AC
 	if (pesession != NULL) {
 		pesession->vhtCapability = IS_DOT11_MODE_VHT(dot11mode);
 		/* Include VHT Capability IE */
@@ -339,7 +338,6 @@ lim_send_probe_req_mgmt_frame(tpAniSirGlobal mac_ctx,
 			is_vht_enabled = true;
 		}
 	}
-#endif
 	if (pesession != NULL)
 		populate_dot11f_ext_cap(mac_ctx, is_vht_enabled, &pr.ExtCap,
 			pesession);
@@ -648,7 +646,6 @@ lim_send_probe_rsp_mgmt_frame(tpAniSirGlobal mac_ctx,
 		populate_dot11f_ht_caps(mac_ctx, pe_session, &frm->HTCaps);
 		populate_dot11f_ht_info(mac_ctx, &frm->HTInfo, pe_session);
 	}
-#ifdef WLAN_FEATURE_11AC
 	if (pe_session->vhtCapability) {
 		lim_log(mac_ctx, LOG1, FL("Populate VHT IE in Probe Response"));
 		populate_dot11f_vht_caps(mac_ctx, pe_session, &frm->VHTCaps);
@@ -661,7 +658,6 @@ lim_send_probe_rsp_mgmt_frame(tpAniSirGlobal mac_ctx,
 		 */
 		is_vht_enabled = true;
 	}
-#endif
 
 	populate_dot11f_ext_cap(mac_ctx, is_vht_enabled, &frm->ExtCap,
 		pe_session);
@@ -1211,7 +1207,6 @@ lim_send_assoc_rsp_mgmt_frame(tpAniSirGlobal mac_ctx,
 			populate_dot11f_ht_info(mac_ctx, &frm.HTInfo,
 				pe_session);
 		}
-#ifdef WLAN_FEATURE_11AC
 		if (sta->mlmStaContext.vhtCapability &&
 		    pe_session->vhtCapability) {
 			lim_log(mac_ctx, LOG1,
@@ -1222,8 +1217,6 @@ lim_send_assoc_rsp_mgmt_frame(tpAniSirGlobal mac_ctx,
 				&frm.VHTOperation);
 			is_vht = true;
 		}
-#endif
-
 		populate_dot11f_ext_cap(mac_ctx, is_vht, &frm.ExtCap,
 			pe_session);
 
@@ -1768,7 +1761,6 @@ lim_send_assoc_req_mgmt_frame(tpAniSirGlobal mac_ctx,
 		lim_log(mac_ctx, LOG1, FL("Populate HT Caps in Assoc Request"));
 		populate_dot11f_ht_caps(mac_ctx, pe_session, &frm->HTCaps);
 	}
-#ifdef WLAN_FEATURE_11AC
 	if (pe_session->vhtCapability &&
 	    pe_session->vhtCapabilityPresentInBeacon) {
 		lim_log(mac_ctx, LOG1, FL("Populate VHT IEs in Assoc Request"));
@@ -1790,9 +1782,6 @@ lim_send_assoc_req_mgmt_frame(tpAniSirGlobal mac_ctx,
 				&frm->vendor2_ie.VHTCaps);
 		vht_enabled = true;
 	}
-
-#endif
-
 	populate_dot11f_ext_cap(mac_ctx, vht_enabled, &frm->ExtCap, pe_session);
 
 	if (pe_session->pLimJoinReq->is11Rconnection) {
@@ -2200,8 +2189,6 @@ lim_send_reassoc_req_with_ft_ies_mgmt_frame(tpAniSirGlobal mac_ctx,
 		populate_mdie(mac_ctx, &frm.MobilityDomain,
 			pe_session->pLimReAssocReq->bssDescription.mdie);
 	}
-
-#ifdef WLAN_FEATURE_11AC
 	if (pe_session->vhtCapability &&
 	    pe_session->vhtCapabilityPresentInBeacon) {
 		lim_log(mac_ctx, LOG1,
@@ -2225,8 +2212,6 @@ lim_send_reassoc_req_with_ft_ies_mgmt_frame(tpAniSirGlobal mac_ctx,
 				&frm.vendor2_ie.VHTCaps);
 		vht_enabled = true;
 	}
-#endif
-
 	status = dot11f_get_packed_re_assoc_request_size(mac_ctx, &frm,
 			&payload);
 	if (DOT11F_FAILED(status)) {
@@ -2579,17 +2564,13 @@ lim_send_reassoc_req_mgmt_frame(tpAniSirGlobal pMac,
 	    pMac->lim.htCapabilityPresentInBeacon) {
 		populate_dot11f_ht_caps(pMac, psessionEntry, &frm.HTCaps);
 	}
-#ifdef WLAN_FEATURE_11AC
 	if (psessionEntry->vhtCapability &&
 	    psessionEntry->vhtCapabilityPresentInBeacon) {
 		lim_log(pMac, LOGW, FL("Populate VHT IEs in Re-Assoc Request"));
 		populate_dot11f_vht_caps(pMac, psessionEntry, &frm.VHTCaps);
 		isVHTEnabled = true;
 	}
-#endif
-
 	populate_dot11f_ext_cap(pMac, isVHTEnabled, &frm.ExtCap, psessionEntry);
-
 	nStatus = dot11f_get_packed_re_assoc_request_size(pMac, &frm, &nPayload);
 	if (DOT11F_FAILED(nStatus)) {
 		lim_log(pMac, LOGP, FL("Failed to calculate the packed size f"
diff --git a/core/mac/src/pe/lim/lim_send_messages.c b/core/mac/src/pe/lim/lim_send_messages.c
index e04af171c9b5..5151cd45149c 100644
--- a/core/mac/src/pe/lim/lim_send_messages.c
+++ b/core/mac/src/pe/lim/lim_send_messages.c
@@ -62,11 +62,9 @@ static tBeaconFilterIe beacon_filter_table[] = {
 	{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_PWR_CONSTRAINT_EID, 0, {0, 0, 0, 0} }
-#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} }
-#endif
+	{SIR_MAC_PWR_CONSTRAINT_EID, 0, {0, 0, 0, 0} },
+	{SIR_MAC_VHT_OPMODE_EID, 0, {0, 0, 0, 0} },
+	{SIR_MAC_VHT_OPERATION_EID, 0, {0, 0, VHTOP_CHWIDTH_MASK, 0} }
 };
 
 /**
@@ -620,7 +618,6 @@ tSirRetStatus lim_send_beacon_filter_info(tpAniSirGlobal pMac,
 	return retCode;
 }
 
-#ifdef WLAN_FEATURE_11AC
 tSirRetStatus lim_send_mode_update(tpAniSirGlobal pMac,
 				   tUpdateVHTOpMode *pTempParam,
 				   tpPESession psessionEntry)
@@ -775,8 +772,6 @@ tSirRetStatus lim_set_user_pos(tpAniSirGlobal pMac,
 	return retCode;
 }
 
-#endif
-
 #ifdef WLAN_FEATURE_11W
 /**
  * lim_send_exclude_unencrypt_ind() - sends WMA_EXCLUDE_UNENCRYPTED_IND to HAL
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 73adb6ea9983..411e407c85d1 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
@@ -351,14 +351,12 @@ static void lim_handle_join_rsp_status(tpAniSirGlobal mac_ctx,
 				session_entry->htSecondaryChannelOffset;
 			ht_profile->dot11mode = session_entry->dot11mode;
 			ht_profile->htCapability = session_entry->htCapability;
-#ifdef WLAN_FEATURE_11AC
 			ht_profile->vhtCapability =
 				session_entry->vhtCapability;
 			ht_profile->vhtTxChannelWidthSet =
 				session_entry->vhtTxChannelWidthSet;
 			ht_profile->apCenterChan = session_entry->ch_center_freq_seg0;
 			ht_profile->apChanWidth = session_entry->ch_width;
-#endif
 		}
 #endif
 	} else {
@@ -641,7 +639,6 @@ lim_send_sme_start_bss_rsp(tpAniSirGlobal pMac,
 					psessionEntry->dot11mode;
 				pSirSmeRsp->HTProfile.htCapability =
 					psessionEntry->htCapability;
-#ifdef WLAN_FEATURE_11AC
 				pSirSmeRsp->HTProfile.vhtCapability =
 					psessionEntry->vhtCapability;
 				pSirSmeRsp->HTProfile.vhtTxChannelWidthSet =
@@ -650,13 +647,10 @@ lim_send_sme_start_bss_rsp(tpAniSirGlobal pMac,
 					psessionEntry->ch_center_freq_seg0;
 				pSirSmeRsp->HTProfile.apChanWidth =
 					psessionEntry->ch_width;
-#endif
 			}
 #endif
 		}
-
 	}
-
 	pSirSmeRsp->messageType = msgType;
 	pSirSmeRsp->length = size;
 
diff --git a/core/mac/src/pe/lim/lim_utils.c b/core/mac/src/pe/lim/lim_utils.c
index bb560d56e555..81769c79a6b5 100644
--- a/core/mac/src/pe/lim/lim_utils.c
+++ b/core/mac/src/pe/lim/lim_utils.c
@@ -2126,9 +2126,7 @@ lim_update_channel_switch(struct sAniSirGlobal *mac_ctx,
 	uint16_t beacon_period;
 	tDot11fIEChanSwitchAnn *chnl_switch;
 	tLimChannelSwitchInfo *ch_switch_params;
-#ifdef WLAN_FEATURE_11AC
 	tDot11fIEWiderBWChanSwitchAnn *widerchnl_switch;
-#endif
 
 	beacon_period = psession_entry->beaconParams.beaconInterval;
 
@@ -2141,7 +2139,6 @@ lim_update_channel_switch(struct sAniSirGlobal *mac_ctx,
 	ch_switch_params->switchTimeoutValue =
 		SYS_MS_TO_TICKS(beacon_period) * (chnl_switch->switchCount);
 	ch_switch_params->switchMode = chnl_switch->switchMode;
-#ifdef WLAN_FEATURE_11AC
 	widerchnl_switch = &(beacon->WiderBWChanSwitchAnn);
 	if (beacon->WiderBWChanSwitchAnnPresent) {
 		psession_entry->gLimWiderBWChannelSwitch.newChanWidth =
@@ -2151,8 +2148,6 @@ lim_update_channel_switch(struct sAniSirGlobal *mac_ctx,
 		psession_entry->gLimWiderBWChannelSwitch.newCenterChanFreq1 =
 				widerchnl_switch->newCenterChanFreq1;
 	}
-#endif
-
 	/* Only primary channel switch element is present */
 	ch_switch_params->state =
 			eLIM_CHANNEL_SWITCH_PRIMARY_ONLY;
@@ -2179,7 +2174,6 @@ lim_update_channel_switch(struct sAniSirGlobal *mac_ctx,
 			ch_switch_params->ch_center_freq_seg0 =
 				ch_switch_params->primaryChannel - 2;
 		}
-#ifdef WLAN_FEATURE_11AC
 		if (psession_entry->vhtCapability &&
 			beacon->WiderBWChanSwitchAnnPresent) {
 			ch_switch_params->ch_width =
@@ -2190,7 +2184,6 @@ lim_update_channel_switch(struct sAniSirGlobal *mac_ctx,
 			ch_switch_params->ch_center_freq_seg1 =
 				psession_entry->gLimWiderBWChannelSwitch.
 						newCenterChanFreq1;
-#endif
 		}
 	}
 	if (eSIR_SUCCESS != lim_start_channel_switch(mac_ctx, psession_entry))
@@ -6428,7 +6421,6 @@ void lim_pmf_sa_query_timer_handler(void *pMacGlobal, uint32_t param)
 }
 #endif
 
-#ifdef WLAN_FEATURE_11AC
 bool lim_check_vht_op_mode_change(tpAniSirGlobal pMac, tpPESession psessionEntry,
 				  uint8_t chanWidth, uint8_t staId,
 				  uint8_t *peerMac)
@@ -6486,7 +6478,6 @@ bool lim_check_membership_user_position(tpAniSirGlobal pMac,
 
 	return true;
 }
-#endif
 
 void lim_get_short_slot_from_phy_mode(tpAniSirGlobal pMac, tpPESession psessionEntry,
 				      uint32_t phyMode, uint8_t *pShortSlotEnabled)
@@ -6652,7 +6643,6 @@ void lim_set_ht_caps(tpAniSirGlobal p_mac, tpPESession p_session_entry,
 	}
 }
 
-#ifdef WLAN_FEATURE_11AC
 void lim_set_vht_caps(tpAniSirGlobal p_mac, tpPESession p_session_entry,
 		      uint8_t *p_ie_start, uint32_t num_bytes)
 {
@@ -6715,7 +6705,6 @@ void lim_set_vht_caps(tpAniSirGlobal p_mac, tpPESession p_session_entry,
 		vht_mcs->txHighest = u_vht_data_rate_info.u_value;
 	}
 }
-#endif /* WLAN_FEATURE_11AC */
 
 /**
  * lim_validate_received_frame_a1_addr() - To validate received frame's A1 addr
diff --git a/core/mac/src/pe/lim/lim_utils.h b/core/mac/src/pe/lim/lim_utils.h
index 7d4ea1d3606b..999ea46f49df 100644
--- a/core/mac/src/pe/lim/lim_utils.h
+++ b/core/mac/src/pe/lim/lim_utils.h
@@ -442,7 +442,6 @@ bool lim_isconnected_on_dfs_channel(uint8_t currentChannel);
 uint8_t lim_get_current_operating_channel(tpAniSirGlobal pMac);
 uint32_t lim_get_max_rate_flags(tpAniSirGlobal mac_ctx, tpDphHashNode sta_ds);
 
-#ifdef WLAN_FEATURE_11AC
 bool lim_check_vht_op_mode_change(tpAniSirGlobal pMac,
 		tpPESession psessionEntry,
 		uint8_t chanWidth, uint8_t staId,
@@ -453,7 +452,6 @@ bool lim_check_membership_user_position(tpAniSirGlobal pMac,
 		tpPESession psessionEntry,
 		uint32_t membership, uint32_t userPosition,
 		uint8_t staId);
-#endif
 
 #ifdef FEATURE_WLAN_DIAG_SUPPORT
 
@@ -561,12 +559,10 @@ void lim_set_ht_caps(tpAniSirGlobal p_mac,
 		uint8_t *p_ie_start,
 		uint32_t num_bytes);
 
-#ifdef WLAN_FEATURE_11AC
 void lim_set_vht_caps(tpAniSirGlobal p_mac,
 		tpPESession p_session_entry,
 		uint8_t *p_ie_start,
 		uint32_t num_bytes);
-#endif /* WLAN_FEATURE_11AC */
 bool lim_validate_received_frame_a1_addr(tpAniSirGlobal mac_ctx,
 		tSirMacAddr a1, tpPESession session);
 void lim_set_stads_rtt_cap(tpDphHashNode sta_ds, struct s_ext_cap *ext_cap,
diff --git a/core/mac/src/pe/sch/sch_beacon_gen.c b/core/mac/src/pe/sch/sch_beacon_gen.c
index 7f3a7b394c63..d8339aa08e3c 100644
--- a/core/mac/src/pe/sch/sch_beacon_gen.c
+++ b/core/mac/src/pe/sch/sch_beacon_gen.c
@@ -340,7 +340,6 @@ sch_set_fixed_beacon_fields(tpAniSirGlobal mac_ctx, tpPESession session)
 			populate_dot11f_ext_chan_switch_ann(mac_ctx,
 					&bcn_2->ExtChanSwitchAnn, session);
 			*/
-#ifdef WLAN_FEATURE_11AC
 			/*
 			 * TODO: If in 11AC mode, wider bw channel switch
 			 * announcement needs to be called
@@ -349,7 +348,6 @@ sch_set_fixed_beacon_fields(tpAniSirGlobal mac_ctx, tpPESession session)
 			populate_dot11f_wider_bw_chan_switch_ann(mac_ctx,
 					&bcn_2->WiderBWChanSwitchAnn, session);
 			*/
-#endif
 			/*
 			 * Populate the Channel Switch Wrapper Element if
 			 * SAP operates in 40/80 Mhz Channel Width.
@@ -383,7 +381,6 @@ sch_set_fixed_beacon_fields(tpAniSirGlobal mac_ctx, tpPESession session)
 		populate_dot11f_ht_caps(mac_ctx, session, &bcn_2->HTCaps);
 		populate_dot11f_ht_info(mac_ctx, &bcn_2->HTInfo, session);
 	}
-#ifdef WLAN_FEATURE_11AC
 	if (session->vhtCapability) {
 		sch_log(mac_ctx, LOGW, FL("Populate VHT IEs in Beacon"));
 		populate_dot11f_vht_caps(mac_ctx, session, &bcn_2->VHTCaps);
@@ -398,7 +395,6 @@ sch_set_fixed_beacon_fields(tpAniSirGlobal mac_ctx, tpPESession session)
 			populate_dot11f_operating_mode(mac_ctx,
 						&bcn_2->OperatingMode, session);
 	}
-#endif
 	populate_dot11f_ext_cap(mac_ctx, is_vht_enabled, &bcn_2->ExtCap,
 				session);
 	populate_dot11f_ext_supp_rates(mac_ctx,
@@ -722,7 +718,6 @@ void lim_update_probe_rsp_template_ie_bitmap_beacon2(tpAniSirGlobal pMac,
 		qdf_mem_copy((void *)&prb_rsp->HTInfo, (void *)&beacon2->HTInfo,
 			     sizeof(beacon2->HTInfo));
 	}
-#ifdef WLAN_FEATURE_11AC
 	if (beacon2->VHTCaps.present) {
 		set_probe_rsp_ie_bitmap(DefProbeRspIeBitmap,
 					SIR_MAC_VHT_CAPABILITIES_EID);
@@ -744,8 +739,6 @@ void lim_update_probe_rsp_template_ie_bitmap_beacon2(tpAniSirGlobal pMac,
 			     (void *)&beacon2->VHTExtBssLoad,
 			     sizeof(beacon2->VHTExtBssLoad));
 	}
-#endif
-
 	/* WMM IE */
 	if (beacon2->WMMParams.present) {
 		set_probe_rsp_ie_bitmap(DefProbeRspIeBitmap, SIR_MAC_WPA_EID);
diff --git a/core/mac/src/pe/sch/sch_beacon_process.c b/core/mac/src/pe/sch/sch_beacon_process.c
index 7b8c2661a0bf..157ab11ca8da 100644
--- a/core/mac/src/pe/sch/sch_beacon_process.c
+++ b/core/mac/src/pe/sch/sch_beacon_process.c
@@ -719,9 +719,7 @@ static void __sch_beacon_process_for_session(tpAniSirGlobal mac_ctx,
 	uint8_t bssIdx = 0;
 	tUpdateBeaconParams beaconParams;
 	uint8_t sendProbeReq = false;
-#ifdef WLAN_FEATURE_11AC
 	tpSirMacMgmtHdr pMh = WMA_GET_RX_MAC_HEADER(rx_pkt_info);
-#endif
 	int8_t regMax = 0, maxTxPower = 0;
 	qdf_mem_zero(&beaconParams, sizeof(tUpdateBeaconParams));
 	beaconParams.paramChangeBitmap = 0;
@@ -759,15 +757,12 @@ static void __sch_beacon_process_for_session(tpAniSirGlobal mac_ctx,
 			lim_cancel_dot11h_channel_switch(mac_ctx, session);
 		}
 	}
-#ifdef WLAN_FEATURE_11AC
 	if (LIM_IS_STA_ROLE(session)
 	    || LIM_IS_BT_AMP_STA_ROLE(session)
 	    || LIM_IS_IBSS_ROLE(session))
 		sch_bcn_process_sta_bt_amp_sta_ibss(mac_ctx, bcn,
 					rx_pkt_info, session, &bssIdx,
 					&beaconParams, &sendProbeReq, pMh);
-#endif
-
 	/* Obtain the Max Tx power for the current regulatory  */
 	regMax = cfg_get_regulatory_max_transmit_power(mac_ctx,
 					session->currentOperChannel);
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 44d2bf0f88bf..e170a11bbaa4 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
@@ -457,11 +457,9 @@ uint8_t *mac_trace_get_wma_msg_string(uint16_t wma_msg)
 		CASE_RETURN_STRING(WMA_GTK_OFFLOAD_GETINFO_RSP);
 #endif /* WLAN_FEATURE_GTK_OFFLOAD */
 		CASE_RETURN_STRING(WMA_SET_TM_LEVEL_REQ);
-#ifdef WLAN_FEATURE_11AC
 		CASE_RETURN_STRING(WMA_UPDATE_OP_MODE);
 		CASE_RETURN_STRING(WMA_UPDATE_MEMBERSHIP);
 		CASE_RETURN_STRING(WMA_UPDATE_USERPOS);
-#endif
 		CASE_RETURN_STRING(WMA_START_SCAN_OFFLOAD_REQ);
 		CASE_RETURN_STRING(WMA_STOP_SCAN_OFFLOAD_REQ);
 		CASE_RETURN_STRING(WMA_UPDATE_CHAN_LIST_REQ);
@@ -543,9 +541,7 @@ uint8_t *mac_trace_get_wma_msg_string(uint16_t wma_msg)
 		CASE_RETURN_STRING(WMA_ROAM_OFFLOAD_SYNCH_IND);
 #endif
 		CASE_RETURN_STRING(WMA_HIDDEN_SSID_VDEV_RESTART);
-#ifdef WLAN_FEATURE_11AC
 		CASE_RETURN_STRING(WMA_UPDATE_RX_NSS);
-#endif
 #ifdef WLAN_FEATURE_NAN
 		CASE_RETURN_STRING(WMA_NAN_REQUEST);
 #endif
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 431bba7871f3..7bec234109a7 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
@@ -366,7 +366,6 @@ populate_dot11f_avoid_channel_ie(tpAniSirGlobal mac_ctx,
 }
 #endif /* FEATURE_AP_MCC_CH_AVOIDANCE */
 
-#ifdef WLAN_FEATURE_11AC
 void
 populate_dot11f_wider_bw_chan_switch_ann(tpAniSirGlobal pMac,
 					 tDot11fIEWiderBWChanSwitchAnn *pDot11f,
@@ -380,7 +379,6 @@ populate_dot11f_wider_bw_chan_switch_ann(tpAniSirGlobal pMac,
 	pDot11f->newCenterChanFreq1 =
 		psessionEntry->gLimWiderBWChannelSwitch.newCenterChanFreq1;
 }
-#endif
 
 tSirRetStatus
 populate_dot11f_country(tpAniSirGlobal pMac,
@@ -826,8 +824,6 @@ populate_dot11f_ht_caps(tpAniSirGlobal pMac,
 
 } /* End populate_dot11f_ht_caps. */
 
-#ifdef WLAN_FEATURE_11AC
-
 void lim_log_vht_cap(tpAniSirGlobal pMac, tDot11fIEVHTCaps *pDot11f)
 {
 #ifdef DUMP_MGMT_CNTNTS
@@ -1216,10 +1212,8 @@ populate_dot11f_ext_cap(tpAniSirGlobal pMac,
 	}
 
 	p_ext_cap = (struct s_ext_cap *)pDot11f->bytes;
-#ifdef WLAN_FEATURE_11AC
 	if (isVHTEnabled == true)
 		p_ext_cap->oper_mode_notification = 1;
-#endif
 
 	if (wlan_cfg_get_int(pMac, WNI_CFG_RTT3_ENABLE, &val) != eSIR_SUCCESS) {
 		lim_log(pMac, LOGE,
@@ -1267,7 +1261,6 @@ populate_dot11f_operating_mode(tpAniSirGlobal pMac,
 	return eSIR_SUCCESS;
 }
 
-#endif
 tSirRetStatus
 populate_dot11f_ht_info(tpAniSirGlobal pMac,
 			tDot11fIEHTInfo *pDot11f, tpPESession psessionEntry)
@@ -2200,19 +2193,14 @@ sir_convert_probe_req_frame2_struct(tpAniSirGlobal pMac,
 		memcpy(&pProbeReq->probeReqWscIeInfo, &pr.WscProbeReq,
 		       sizeof(tDot11fIEWscProbeReq));
 	}
-#ifdef WLAN_FEATURE_11AC
 	if (pr.VHTCaps.present) {
 		qdf_mem_copy(&pProbeReq->VHTCaps, &pr.VHTCaps,
 			     sizeof(tDot11fIEVHTCaps));
 	}
-#endif
-
 	if (pr.P2PProbeReq.present) {
 		pProbeReq->p2pIePresent = 1;
 	}
-
 	return eSIR_SUCCESS;
-
 } /* End sir_convert_probe_req_frame2_struct. */
 
 tSirRetStatus sir_convert_probe_frame2_struct(tpAniSirGlobal pMac,
@@ -2456,7 +2444,6 @@ tSirRetStatus sir_convert_probe_frame2_struct(tpAniSirGlobal pMac,
 		qdf_mem_copy(&pProbeResp->P2PProbeRes, &pr->P2PProbeRes,
 			     sizeof(tDot11fIEP2PProbeRes));
 	}
-#ifdef WLAN_FEATURE_11AC
 	if (pr->VHTCaps.present) {
 		qdf_mem_copy(&pProbeResp->VHTCaps, &pr->VHTCaps,
 			     sizeof(tDot11fIEVHTCaps));
@@ -2469,7 +2456,6 @@ tSirRetStatus sir_convert_probe_frame2_struct(tpAniSirGlobal pMac,
 		qdf_mem_copy(&pProbeResp->VHTExtBssLoad, &pr->VHTExtBssLoad,
 			     sizeof(tDot11fIEVHTExtBssLoad));
 	}
-#endif
 	pProbeResp->Vendor1IEPresent = pr->Vendor1IE.present;
 	pProbeResp->Vendor3IEPresent = pr->Vendor3IE.present;
 
@@ -2660,7 +2646,6 @@ sir_convert_assoc_req_frame2_struct(tpAniSirGlobal pMac,
 		qdf_mem_free(ar);
 		return eSIR_FAILURE;
 	}
-#ifdef WLAN_FEATURE_11AC
 	if (ar->VHTCaps.present) {
 		qdf_mem_copy(&pAssocReq->VHTCaps, &ar->VHTCaps,
 			     sizeof(tDot11fIEVHTCaps));
@@ -2674,7 +2659,6 @@ sir_convert_assoc_req_frame2_struct(tpAniSirGlobal pMac,
 			FL("Received Assoc Req with Operating Mode IE\n"));
 		lim_log_operating_mode(pMac, &pAssocReq->operMode);
 	}
-#endif
 	if (ar->ExtCap.present) {
 		struct s_ext_cap *ext_cap;
 		qdf_mem_copy(&pAssocReq->ExtCap.bytes, &ar->ExtCap.bytes,
@@ -2853,7 +2837,6 @@ sir_convert_assoc_resp_frame2_struct(tpAniSirGlobal pMac,
 	}
 #endif
 
-#ifdef WLAN_FEATURE_11AC
 	if (ar.VHTCaps.present) {
 		qdf_mem_copy(&pAssocRsp->VHTCaps, &ar.VHTCaps,
 			     sizeof(tDot11fIEVHTCaps));
@@ -2867,7 +2850,6 @@ sir_convert_assoc_resp_frame2_struct(tpAniSirGlobal pMac,
 			FL("Received Assoc Response with VHT Operation"));
 		lim_log_vht_operation(pMac, &pAssocRsp->VHTOperation);
 	}
-#endif
 
 	if (ar.ExtCap.present) {
 		struct s_ext_cap *ext_cap;
@@ -3070,7 +3052,6 @@ sir_convert_reassoc_req_frame2_struct(tpAniSirGlobal pMac,
 	}
 #endif
 
-#ifdef WLAN_FEATURE_11AC
 	if (ar.VHTCaps.present) {
 		qdf_mem_copy(&pAssocReq->VHTCaps, &ar.VHTCaps,
 			     sizeof(tDot11fIEVHTCaps));
@@ -3082,8 +3063,6 @@ sir_convert_reassoc_req_frame2_struct(tpAniSirGlobal pMac,
 			FL("Received Assoc Req with Operating Mode IE\n"));
 		lim_log_operating_mode(pMac, &pAssocReq->operMode);
 	}
-#endif
-
 	if (ar.ExtCap.present) {
 		struct s_ext_cap *ext_cap;
 		qdf_mem_copy(&pAssocReq->ExtCap.bytes, &ar.ExtCap.bytes,
@@ -3600,7 +3579,6 @@ sir_parse_beacon_ie(tpAniSirGlobal pMac,
 		convert_erp_info(pMac, &pBeaconStruct->erpIEInfo,
 				 &pBies->ERPInfo);
 	}
-#ifdef WLAN_FEATURE_11AC
 	if (pBies->VHTCaps.present) {
 		pBeaconStruct->VHTCaps.present = 1;
 		qdf_mem_copy(&pBeaconStruct->VHTCaps, &pBies->VHTCaps,
@@ -3623,8 +3601,6 @@ sir_parse_beacon_ie(tpAniSirGlobal pMac,
 			     &pBies->OperatingMode,
 			     sizeof(tDot11fIEOperatingMode));
 	}
-#endif
-
 	if (pBies->MobilityDomain.present) {
 		pBeaconStruct->mdiePresent = 1;
 		qdf_mem_copy(pBeaconStruct->mdie, &pBies->MobilityDomain.MDID,
@@ -3925,8 +3901,6 @@ sir_convert_beacon_frame2_struct(tpAniSirGlobal pMac,
 			     &pBeacon->QBSSLoad, sizeof(tDot11fIEQBSSLoad));
 	}
 #endif
-
-#ifdef WLAN_FEATURE_11AC
 	if (pBeacon->VHTCaps.present) {
 		qdf_mem_copy(&pBeaconStruct->VHTCaps, &pBeacon->VHTCaps,
 			     sizeof(tDot11fIEVHTCaps));
@@ -3952,8 +3926,6 @@ sir_convert_beacon_frame2_struct(tpAniSirGlobal pMac,
 			     &pBeacon->WiderBWChanSwitchAnn,
 			     sizeof(tDot11fIEWiderBWChanSwitchAnn));
 	}
-#endif
-
 	/* IBSS Peer Params */
 	if (pBeacon->IBSSParams.present) {
 		pBeaconStruct->IBSSParams.present = 1;
diff --git a/core/sap/src/sap_fsm.c b/core/sap/src/sap_fsm.c
index 112a3b8b24d4..f13d8d0698c1 100644
--- a/core/sap/src/sap_fsm.c
+++ b/core/sap/src/sap_fsm.c
@@ -1734,7 +1734,6 @@ uint8_t sap_get_bonding_channels(ptSapContext sapContext, uint8_t channel,
 		channels[0] = channel;
 		channels[1] = channel + 4;
 		break;
-#ifdef WLAN_FEATURE_11AC
 	case PHY_QUADRUPLE_CHANNEL_20MHZ_LOW_40MHZ_LOW:
 		numChannel = 4;
 		channels[0] = channel;
@@ -1763,7 +1762,6 @@ uint8_t sap_get_bonding_channels(ptSapContext sapContext, uint8_t channel,
 		channels[2] = channel - 4;
 		channels[3] = channel;
 		break;
-#endif
 	default:
 		numChannel = 1;
 		channels[0] = channel;
diff --git a/core/sme/inc/csr_api.h b/core/sme/inc/csr_api.h
index cd8691475971..19884c35231b 100644
--- a/core/sme/inc/csr_api.h
+++ b/core/sme/inc/csr_api.h
@@ -195,7 +195,6 @@ typedef enum {
 	eCSR_INI_SINGLE_CHANNEL_CENTERED = 0,
 	eCSR_INI_DOUBLE_CHANNEL_HIGH_PRIMARY,
 	eCSR_INI_DOUBLE_CHANNEL_LOW_PRIMARY,
-#ifdef WLAN_FEATURE_11AC
 	eCSR_INI_QUADRUPLE_CHANNEL_20MHZ_LOW_40MHZ_CENTERED,
 	eCSR_INI_QUADRUPLE_CHANNEL_20MHZ_CENTERED_40MHZ_CENTERED,
 	eCSR_INI_QUADRUPLE_CHANNEL_20MHZ_HIGH_40MHZ_CENTERED,
@@ -203,7 +202,6 @@ typedef enum {
 	eCSR_INI_QUADRUPLE_CHANNEL_20MHZ_HIGH_40MHZ_LOW,
 	eCSR_INI_QUADRUPLE_CHANNEL_20MHZ_LOW_40MHZ_HIGH,
 	eCSR_INI_QUADRUPLE_CHANNEL_20MHZ_HIGH_40MHZ_HIGH,
-#endif
 	eCSR_INI_CHANNEL_BONDING_STATE_MAX
 } eIniChanBondState;
 
@@ -938,12 +936,10 @@ typedef struct tagCsrRoamHTProfile {
 	uint8_t htSupportedChannelWidthSet;
 	uint8_t htRecommendedTxWidthSet;
 	ePhyChanBondState htSecondaryChannelOffset;
-#ifdef WLAN_FEATURE_11AC
 	uint8_t vhtCapability;
 	uint8_t vhtTxChannelWidthSet;
 	uint8_t apCenterChan;
 	uint8_t apChanWidth;
-#endif
 } tCsrRoamHTProfile;
 #endif
 typedef struct tagCsrRoamConnectedProfile {
@@ -1146,7 +1142,6 @@ typedef struct tagCsrConfigParam {
 	 * request from HDD
 	 */
 	bool fScanTwice;
-#ifdef WLAN_FEATURE_11AC
 	uint32_t nVhtChannelWidth;
 	uint8_t enableTxBF;
 	uint8_t enable_txbf_sap_mode;
@@ -1156,7 +1151,6 @@ typedef struct tagCsrConfigParam {
 	uint8_t enableMuBformee;
 	uint8_t enableVhtpAid;
 	uint8_t enableVhtGid;
-#endif
 	uint8_t enableAmpduPs;
 	uint8_t enableHtSmps;
 	uint8_t htSmps;
diff --git a/core/sme/inc/csr_internal.h b/core/sme/inc/csr_internal.h
index b9939a6a105e..acc4a890420c 100644
--- a/core/sme/inc/csr_internal.h
+++ b/core/sme/inc/csr_internal.h
@@ -105,14 +105,10 @@ typedef enum {
 	eCSR_CFG_DOT11_MODE_11B,
 	eCSR_CFG_DOT11_MODE_11G,
 	eCSR_CFG_DOT11_MODE_11N,
-#ifdef WLAN_FEATURE_11AC
 	eCSR_CFG_DOT11_MODE_11AC,
-#endif
 	eCSR_CFG_DOT11_MODE_11G_ONLY,
 	eCSR_CFG_DOT11_MODE_11N_ONLY,
-#ifdef WLAN_FEATURE_11AC
 	eCSR_CFG_DOT11_MODE_11AC_ONLY,
-#endif
 	/* This value can never set to CFG. Its for CSR's internal use */
 	eCSR_CFG_DOT11_MODE_AUTO,
 } eCsrCfgDot11Mode;
@@ -594,7 +590,6 @@ typedef struct tagCsrConfig {
 	bool doBMPSWorkaround;
 	/* To enable scanning 2g channels twice on single scan req from HDD */
 	bool fScanTwice;
-#ifdef WLAN_FEATURE_11AC
 	uint32_t nVhtChannelWidth;
 	uint8_t txBFEnable;
 	uint8_t enable_txbf_sap_mode;
@@ -604,7 +599,6 @@ typedef struct tagCsrConfig {
 	uint8_t txMuBformee;
 	uint8_t enableVhtpAid;
 	uint8_t enableVhtGid;
-#endif
 	uint8_t enableAmpduPs;
 	uint8_t enableHtSmps;
 	uint8_t htSmps;
@@ -1091,18 +1085,11 @@ typedef struct tagCsrRoamStruct {
 #define CSR_IS_PHY_MODE_A_ONLY(pMac) \
 	(eCSR_DOT11_MODE_11a == (pMac)->roam.configParam.phyMode)
 
-#ifdef WLAN_FEATURE_11AC
 #define CSR_IS_PHY_MODE_DUAL_BAND(phyMode) \
 	((eCSR_DOT11_MODE_abg & (phyMode)) || \
 	 (eCSR_DOT11_MODE_11n & (phyMode)) || \
 	 (eCSR_DOT11_MODE_11ac & (phyMode)) || \
 	 (eCSR_DOT11_MODE_AUTO & (phyMode)))
-#else
-#define CSR_IS_PHY_MODE_DUAL_BAND(phyMode) \
-	((eCSR_DOT11_MODE_abg & (phyMode)) ||  \
-	 (eCSR_DOT11_MODE_11n & (phyMode)) || \
-	 (eCSR_DOT11_MODE_AUTO & (phyMode)))
-#endif
 
 #define CSR_IS_PHY_MODE_11n(phy_mode) \
 	((eCSR_DOT11_MODE_11n == phy_mode) || \
diff --git a/core/sme/src/csr/csr_api_roam.c b/core/sme/src/csr/csr_api_roam.c
index b12f9971cd42..47f8827ad10e 100644
--- a/core/sme/src/csr/csr_api_roam.c
+++ b/core/sme/src/csr/csr_api_roam.c
@@ -1344,10 +1344,8 @@ static void init_config_param(tpAniSirGlobal pMac)
 	pMac->roam.configParam.neighborRoamConfig.nRoamBmissFirstBcnt = 10;
 	pMac->roam.configParam.neighborRoamConfig.nRoamBmissFinalBcnt = 10;
 	pMac->roam.configParam.neighborRoamConfig.nRoamBeaconRssiWeight = 14;
-#ifdef WLAN_FEATURE_11AC
 	pMac->roam.configParam.nVhtChannelWidth =
 		WNI_CFG_VHT_CHANNEL_WIDTH_80MHZ + 1;
-#endif
 
 	pMac->roam.configParam.addTSWhenACMIsOff = 0;
 	pMac->roam.configParam.fScanTwice = false;
@@ -1625,7 +1623,6 @@ ePhyChanBondState csr_convert_cb_ini_value_to_phy_cb_state(uint32_t cbIniValue)
 	case eCSR_INI_DOUBLE_CHANNEL_LOW_PRIMARY:
 		phyCbState = PHY_DOUBLE_CHANNEL_LOW_PRIMARY;
 		break;
-#ifdef WLAN_FEATURE_11AC
 	case eCSR_INI_QUADRUPLE_CHANNEL_20MHZ_LOW_40MHZ_CENTERED:
 		phyCbState = PHY_QUADRUPLE_CHANNEL_20MHZ_LOW_40MHZ_CENTERED;
 		break;
@@ -1648,7 +1645,6 @@ ePhyChanBondState csr_convert_cb_ini_value_to_phy_cb_state(uint32_t cbIniValue)
 	case eCSR_INI_QUADRUPLE_CHANNEL_20MHZ_HIGH_40MHZ_HIGH:
 		phyCbState = PHY_QUADRUPLE_CHANNEL_20MHZ_HIGH_40MHZ_HIGH;
 		break;
-#endif
 	default:
 		/* If an invalid value is passed, disable CHANNEL BONDING */
 		phyCbState = PHY_SINGLE_CHANNEL_CENTERED;
@@ -1674,7 +1670,6 @@ uint32_t csr_convert_phy_cb_state_to_ini_value(ePhyChanBondState phyCbState)
 	case PHY_DOUBLE_CHANNEL_LOW_PRIMARY:
 		cbIniValue = eCSR_INI_DOUBLE_CHANNEL_LOW_PRIMARY;
 		break;
-#ifdef WLAN_FEATURE_11AC
 	case PHY_QUADRUPLE_CHANNEL_20MHZ_LOW_40MHZ_CENTERED:
 		cbIniValue =
 			eCSR_INI_QUADRUPLE_CHANNEL_20MHZ_LOW_40MHZ_CENTERED;
@@ -1699,7 +1694,6 @@ uint32_t csr_convert_phy_cb_state_to_ini_value(ePhyChanBondState phyCbState)
 	case PHY_QUADRUPLE_CHANNEL_20MHZ_HIGH_40MHZ_HIGH:
 		cbIniValue = eCSR_INI_QUADRUPLE_CHANNEL_20MHZ_HIGH_40MHZ_HIGH;
 		break;
-#endif
 	default:
 		/* return some invalid value */
 		cbIniValue = eCSR_INI_CHANNEL_BONDING_STATE_MAX;
@@ -2001,7 +1995,6 @@ QDF_STATUS csr_change_default_config_param(tpAniSirGlobal pMac,
 		/* BMPS_WORKAROUND_NOT_NEEDED */
 		pMac->roam.configParam.doBMPSWorkaround = 0;
 
-#ifdef WLAN_FEATURE_11AC
 		pMac->roam.configParam.nVhtChannelWidth =
 			pParam->nVhtChannelWidth;
 		pMac->roam.configParam.txBFEnable = pParam->enableTxBF;
@@ -2014,7 +2007,6 @@ QDF_STATUS csr_change_default_config_param(tpAniSirGlobal pMac,
 		pMac->roam.configParam.txMuBformee = pParam->enableMuBformee;
 		pMac->roam.configParam.enableVhtpAid = pParam->enableVhtpAid;
 		pMac->roam.configParam.enableVhtGid = pParam->enableVhtGid;
-#endif
 		pMac->roam.configParam.enableAmpduPs = pParam->enableAmpduPs;
 		pMac->roam.configParam.enableHtSmps = pParam->enableHtSmps;
 		pMac->roam.configParam.htSmps = pParam->htSmps;
@@ -2174,7 +2166,6 @@ QDF_STATUS csr_get_config_param(tpAniSirGlobal pMac, tCsrConfigParam *pParam)
 	qdf_mem_copy(&pParam->neighborRoamConfig,
 		     &cfg_params->neighborRoamConfig,
 		     sizeof(tCsrNeighborRoamConfigParams));
-#ifdef WLAN_FEATURE_11AC
 	pParam->nVhtChannelWidth = cfg_params->nVhtChannelWidth;
 	pParam->enableTxBF = cfg_params->txBFEnable;
 	pParam->enable_txbf_sap_mode =
@@ -2184,7 +2175,6 @@ QDF_STATUS csr_get_config_param(tpAniSirGlobal pMac, tCsrConfigParam *pParam)
 	pParam->enableVhtFor24GHz = cfg_params->enableVhtFor24GHz;
 	pParam->ignore_peer_erp_info = cfg_params->ignore_peer_erp_info;
 	pParam->enable2x2 = cfg_params->enable2x2;
-#endif
 	qdf_mem_copy(&cfg_params->csr11rConfig, &pParam->csr11rConfig,
 		     sizeof(tCsr11rConfigParams));
 	pParam->isFastTransitionEnabled = cfg_params->isFastTransitionEnabled;
@@ -4166,7 +4156,6 @@ uint32_t csr_roam_get_phy_mode_from_dot11_mode(eCsrCfgDot11Mode dot11Mode,
 	return WNI_CFG_PHY_MODE_11A;
 }
 
-#ifdef WLAN_FEATURE_11AC
 ePhyChanBondState csr_get_htcb_state_from_vhtcb_state(ePhyChanBondState aniCBMode)
 {
 	switch (aniCBMode) {
@@ -4183,7 +4172,6 @@ ePhyChanBondState csr_get_htcb_state_from_vhtcb_state(ePhyChanBondState aniCBMod
 		return PHY_SINGLE_CHANNEL_CENTERED;
 	}
 }
-#endif
 
 /* pIes may be NULL */
 QDF_STATUS csr_roam_set_bss_config_cfg(tpAniSirGlobal pMac, uint32_t sessionId,
@@ -5690,12 +5678,10 @@ static void csr_roam_copy_ht_profile(tCsrRoamHTProfile *dst_profile,
 		src_profile->htRecommendedTxWidthSet;
 	dst_profile->htSecondaryChannelOffset =
 		src_profile->htSecondaryChannelOffset;
-#ifdef WLAN_FEATURE_11AC
 	dst_profile->vhtCapability = src_profile->vhtCapability;
 	dst_profile->vhtTxChannelWidthSet = src_profile->vhtTxChannelWidthSet;
 	dst_profile->apCenterChan = src_profile->apCenterChan;
 	dst_profile->apChanWidth = src_profile->apChanWidth;
-#endif
 }
 #endif
 
@@ -11587,7 +11573,6 @@ csr_compute_mode_and_band(tpAniSirGlobal mac_ctx,
 		*dot11_mode = eCSR_CFG_DOT11_MODE_11N;
 		*band = CSR_GET_BAND(opr_ch);
 		break;
-#ifdef WLAN_FEATURE_11AC
 	case eCSR_CFG_DOT11_MODE_11AC:
 		if (IS_FEATURE_SUPPORTED_BY_FW(DOT11AC)) {
 			/*
@@ -11620,9 +11605,7 @@ csr_compute_mode_and_band(tpAniSirGlobal mac_ctx,
 		}
 		*band = CSR_GET_BAND(opr_ch);
 		break;
-#endif
 	case eCSR_CFG_DOT11_MODE_AUTO:
-#ifdef WLAN_FEATURE_11AC
 		if (IS_FEATURE_SUPPORTED_BY_FW(DOT11AC)) {
 			/*
 			 * If the operating channel is in 2.4 GHz band,
@@ -11638,9 +11621,6 @@ csr_compute_mode_and_band(tpAniSirGlobal mac_ctx,
 		} else {
 			*dot11_mode = eCSR_CFG_DOT11_MODE_11N;
 		}
-#else
-		*dot11_mode = eCSR_CFG_DOT11_MODE_11N;
-#endif
 		*band = CSR_GET_BAND(opr_ch);
 		break;
 	default:
@@ -11760,10 +11740,7 @@ csr_roam_get_phy_mode_band_for_bss(tpAniSirGlobal mac_ctx,
 		&& (profile->EncryptionType.encryptionType[0] ==
 		eCSR_ENCRYPT_TYPE_NONE)))
 		&& ((eCSR_CFG_DOT11_MODE_11N == cfg_dot11_mode) ||
-#ifdef WLAN_FEATURE_11AC
-	     (eCSR_CFG_DOT11_MODE_11AC == cfg_dot11_mode)
-#endif
-	     )) {
+	     (eCSR_CFG_DOT11_MODE_11AC == cfg_dot11_mode))) {
 		/* We cannot do 11n here */
 		if (CDS_IS_CHANNEL_24GHZ(opr_chn))
 			cfg_dot11_mode = eCSR_CFG_DOT11_MODE_11G;
@@ -13800,7 +13777,6 @@ QDF_STATUS csr_send_join_req_msg(tpAniSirGlobal pMac, uint32_t sessionId,
 		}
 		qdf_mem_copy(&csr_join_req->htConfig,
 				&pSession->htConfig, sizeof(tSirHTConfig));
-#ifdef WLAN_FEATURE_11AC
 		csr_join_req->txBFIniFeatureEnabled =
 				(uint8_t) pMac->roam.configParam.txBFEnable;
 
@@ -13827,7 +13803,6 @@ QDF_STATUS csr_send_join_req_msg(tpAniSirGlobal pMac, uint32_t sessionId,
 		csr_join_req->enableVhtGid =
 			(uint8_t) pMac->roam.configParam.enableVhtGid;
 
-#endif
 		csr_join_req->enableAmpduPs =
 			(uint8_t) pMac->roam.configParam.enableAmpduPs;
 
diff --git a/core/sme/src/csr/csr_api_scan.c b/core/sme/src/csr/csr_api_scan.c
index 557cad320f19..12a6c8094870 100644
--- a/core/sme/src/csr/csr_api_scan.c
+++ b/core/sme/src/csr/csr_api_scan.c
@@ -4407,18 +4407,14 @@ static bool csr_scan_is_bss_allowed(tpAniSirGlobal pMac,
 			fAllowed = (bool) ((eCSR_DOT11_MODE_11n == phyMode));
 			break;
 
-#ifdef WLAN_FEATURE_11AC
 		case eCSR_DOT11_MODE_11ac_ONLY:
 			fAllowed = (bool) ((eCSR_DOT11_MODE_11ac == phyMode));
 			break;
-#endif
 		case eCSR_DOT11_MODE_11b_ONLY:
 			fAllowed = (bool) (eCSR_DOT11_MODE_11b == phyMode);
 			break;
 		case eCSR_DOT11_MODE_11n:
-#ifdef WLAN_FEATURE_11AC
 		case eCSR_DOT11_MODE_11ac:
-#endif
 		default:
 			fAllowed = true;
 			break;
diff --git a/core/sme/src/csr/csr_util.c b/core/sme/src/csr/csr_util.c
index 9a67586bc7b9..134b995c8efc 100644
--- a/core/sme/src/csr/csr_util.c
+++ b/core/sme/src/csr/csr_util.c
@@ -512,19 +512,14 @@ void csr_get_ch_from_ht_profile(tpAniSirGlobal pMac, tCsrRoamHTProfile *htp,
 		goto ret;
 
 	sms_log(pMac, LOG1, FL("##HTC: %d scbw: %d rcbw: %d sco: %d"
-#ifdef WLAN_FEATURE_11AC
 				"VHTC: %d apc: %d apbw: %d"
-#endif
 			      ),
 			htp->htCapability, htp->htSupportedChannelWidthSet,
 			htp->htRecommendedTxWidthSet,
 			htp->htSecondaryChannelOffset,
-#ifdef WLAN_FEATURE_11AC
 			htp->vhtCapability, htp->apCenterChan, htp->apChanWidth
-#endif
 	       );
 
-#ifdef WLAN_FEATURE_11AC
 	if (htp->vhtCapability) {
 		cch = htp->apCenterChan;
 		if (htp->apChanWidth == WNI_CFG_VHT_CHANNEL_WIDTH_80MHZ)
@@ -539,9 +534,7 @@ void csr_get_ch_from_ht_profile(tpAniSirGlobal pMac, tCsrRoamHTProfile *htp,
 			else
 				*hbw = HALF_BW_OF(eCSR_BW_20MHz_VAL);
 		}
-	} else
-#endif
-		if (htp->htCapability) {
+	} else if (htp->htCapability) {
 			if (htp->htSupportedChannelWidthSet ==
 					eHT_CHANNEL_WIDTH_40MHZ) {
 				*hbw = HALF_BW_OF(eCSR_BW_40MHz_VAL);
@@ -588,9 +581,7 @@ static void csr_calc_chb_for_sap_phymode(tpAniSirGlobal mac_ctx,
 		else if (*chb == PHY_DOUBLE_CHANNEL_HIGH_PRIMARY)
 			*sap_cch = CSR_GET_HT40_MINUS_CCH(*sap_ch);
 
-	}
-#ifdef WLAN_FEATURE_11AC
-	else if (*sap_phymode == eCSR_DOT11_MODE_11ac ||
+	} else if (*sap_phymode == eCSR_DOT11_MODE_11ac ||
 			*sap_phymode == eCSR_DOT11_MODE_11ac_ONLY) {
 		/*11AC only 80/40/20 Mhz supported in Rome */
 		if (mac_ctx->roam.configParam.nVhtChannelWidth ==
@@ -630,7 +621,6 @@ static void csr_calc_chb_for_sap_phymode(tpAniSirGlobal mac_ctx,
 				*sap_cch = CSR_GET_HT40_MINUS_CCH(*sap_ch);
 		}
 	}
-#endif
 }
 
 /**
@@ -1338,14 +1328,9 @@ eCsrPhyMode csr_translate_to_phy_mode_from_bss_desc(tSirBssDescription *pSirBssD
 	case eSIR_11N_NW_TYPE:
 		phyMode = eCSR_DOT11_MODE_11n;
 		break;
-#ifdef WLAN_FEATURE_11AC
 	case eSIR_11AC_NW_TYPE:
 	default:
 		phyMode = eCSR_DOT11_MODE_11ac;
-#else
-	default:
-		phyMode = eCSR_DOT11_MODE_11n;
-#endif
 		break;
 	}
 	return phyMode;
@@ -1432,11 +1417,9 @@ QDF_STATUS csr_get_phy_mode_from_bss(tpAniSirGlobal pMac,
 	if (pIes) {
 		if (pIes->HTCaps.present) {
 			phyMode = eCSR_DOT11_MODE_11n;
-#ifdef WLAN_FEATURE_11AC
 			if (IS_BSS_VHT_CAPABLE(pIes->VHTCaps) ||
 				IS_BSS_VHT_CAPABLE(pIes->vendor2_ie.VHTCaps))
 				phyMode = eCSR_DOT11_MODE_11ac;
-#endif
 		}
 		*pPhyMode = phyMode;
 	}
@@ -1527,18 +1510,12 @@ bool csr_get_phy_mode_in_use(eCsrPhyMode phyModeIn, eCsrPhyMode bssPhyMode,
 			cfgDot11Mode = eCSR_CFG_DOT11_MODE_11A;
 			break;
 		case eCSR_DOT11_MODE_11n:
-#ifdef WLAN_FEATURE_11AC
 		case eCSR_DOT11_MODE_11ac:
-#endif
 			cfgDot11Mode = eCSR_CFG_DOT11_MODE_11N;
 			break;
 
 		default:
-#ifdef WLAN_FEATURE_11AC
 			cfgDot11Mode = eCSR_CFG_DOT11_MODE_11AC;
-#else
-			cfgDot11Mode = eCSR_CFG_DOT11_MODE_11N;
-#endif
 			break;
 		}
 		break;
@@ -1551,7 +1528,6 @@ bool csr_get_phy_mode_in_use(eCsrPhyMode phyModeIn, eCsrPhyMode bssPhyMode,
 		}
 
 		break;
-#ifdef WLAN_FEATURE_11AC
 	case eCSR_DOT11_MODE_11ac:
 		fMatch = true;
 		switch (bssPhyMode) {
@@ -1580,7 +1556,6 @@ bool csr_get_phy_mode_in_use(eCsrPhyMode phyModeIn, eCsrPhyMode bssPhyMode,
 			cfgDot11Mode = eCSR_CFG_DOT11_MODE_11AC;
 		}
 		break;
-#endif
 
 	default:
 		fMatch = true;
@@ -1597,11 +1572,9 @@ bool csr_get_phy_mode_in_use(eCsrPhyMode phyModeIn, eCsrPhyMode bssPhyMode,
 		case eCSR_DOT11_MODE_11n:
 			cfgDot11Mode = eCSR_CFG_DOT11_MODE_11N;
 			break;
-#ifdef WLAN_FEATURE_11AC
 		case eCSR_DOT11_MODE_11ac:
 			cfgDot11Mode = eCSR_CFG_DOT11_MODE_11AC;
 			break;
-#endif
 		default:
 			cfgDot11Mode = eCSR_CFG_DOT11_MODE_AUTO;
 			break;
@@ -1610,12 +1583,10 @@ bool csr_get_phy_mode_in_use(eCsrPhyMode phyModeIn, eCsrPhyMode bssPhyMode,
 	}
 
 	if (fMatch && pCfgDot11ModeToUse) {
-#ifdef WLAN_FEATURE_11AC
 		if (cfgDot11Mode == eCSR_CFG_DOT11_MODE_11AC
 		    && (!IS_FEATURE_SUPPORTED_BY_FW(DOT11AC)))
 			*pCfgDot11ModeToUse = eCSR_CFG_DOT11_MODE_11N;
 		else
-#endif
 			*pCfgDot11ModeToUse = cfgDot11Mode;
 	}
 	return fMatch;
@@ -1656,12 +1627,7 @@ bool csr_is_phy_mode_match(tpAniSirGlobal pMac, uint32_t phyMode,
 			phyMode = eCSR_DOT11_MODE_abg;
 		else if (eCSR_CFG_DOT11_MODE_AUTO ==
 				pMac->roam.configParam.uCfgDot11Mode)
-#ifdef WLAN_FEATURE_11AC
 			phyMode = eCSR_DOT11_MODE_11ac;
-#else
-			phyMode = eCSR_DOT11_MODE_11n;
-#endif
-
 		else
 			/* user's pick */
 			phyMode = pMac->roam.configParam.phyMode;
@@ -1707,11 +1673,8 @@ bool csr_is_phy_mode_match(tpAniSirGlobal pMac, uint32_t phyMode,
 					pProfile->negotiatedUCEncryptionType))
 					&& ((eCSR_CFG_DOT11_MODE_11N ==
 						cfgDot11ModeToUse) ||
-#ifdef WLAN_FEATURE_11AC
 					(eCSR_CFG_DOT11_MODE_11AC ==
-						cfgDot11ModeToUse)
-#endif
-				)) {
+						cfgDot11ModeToUse))) {
 				/* We cannot do 11n here */
 				if (!CDS_IS_CHANNEL_5GHZ
 						(pSirBssDesc->channelId)) {
@@ -1735,16 +1698,11 @@ eCsrCfgDot11Mode csr_find_best_phy_mode(tpAniSirGlobal pMac, uint32_t phyMode)
 	eCsrBand eBand = pMac->roam.configParam.eBand;
 
 	if ((0 == phyMode) ||
-#ifdef WLAN_FEATURE_11AC
 	    (eCSR_DOT11_MODE_11ac & phyMode) ||
-#endif
 	    (eCSR_DOT11_MODE_AUTO & phyMode)) {
-#ifdef WLAN_FEATURE_11AC
 		if (IS_FEATURE_SUPPORTED_BY_FW(DOT11AC)) {
 			cfgDot11ModeToUse = eCSR_CFG_DOT11_MODE_11AC;
-		} else
-#endif
-		{
+		} else {
 			/* Default to 11N mode if user has configured 11ac mode
 			 * and FW doesn't supports 11ac mode .
 			 */
@@ -5360,7 +5318,6 @@ eCsrCfgDot11Mode csr_get_cfg_dot11_mode_from_csr_phy_mode(tCsrRoamProfile *pProf
 		cfgDot11Mode = eCSR_CFG_DOT11_MODE_AUTO;
 		break;
 
-#ifdef WLAN_FEATURE_11AC
 	case eCSR_DOT11_MODE_11ac:
 		if (IS_FEATURE_SUPPORTED_BY_FW(DOT11AC)) {
 			cfgDot11Mode = eCSR_CFG_DOT11_MODE_11AC;
@@ -5375,7 +5332,6 @@ eCsrCfgDot11Mode csr_get_cfg_dot11_mode_from_csr_phy_mode(tCsrRoamProfile *pProf
 			cfgDot11Mode = eCSR_CFG_DOT11_MODE_11N;
 		}
 		break;
-#endif
 	default:
 		/* No need to assign anything here */
 		break;
diff --git a/core/wma/inc/wma.h b/core/wma/inc/wma.h
index 06f390f8484c..87b0fb396c12 100644
--- a/core/wma/inc/wma.h
+++ b/core/wma/inc/wma.h
@@ -1234,10 +1234,8 @@ typedef struct {
 	qdf_list_t wma_hold_req_queue;
 	qdf_spinlock_t wma_hold_req_q_lock;
 	uint32_t ht_cap_info;
-#ifdef WLAN_FEATURE_11AC
 	uint32_t vht_cap_info;
 	uint32_t vht_supp_mcs;
-#endif
 	uint32_t num_rf_chains;
 #if defined(QCA_WIFI_FTM)
 	struct utf_event_info utf_event_info;
diff --git a/core/wma/inc/wma_if.h b/core/wma/inc/wma_if.h
index 848f9c8925bc..542a1e890ed4 100644
--- a/core/wma/inc/wma_if.h
+++ b/core/wma/inc/wma_if.h
@@ -797,7 +797,6 @@ typedef struct {
 	uint8_t smeSessionId;
 } tUpdateBeaconParams, *tpUpdateBeaconParams;
 
-#ifdef WLAN_FEATURE_11AC
 /**
  * struct tUpdateVHTOpMode - VHT operating mode
  * @opMode: VHT operating mode
@@ -854,8 +853,6 @@ typedef struct {
 	tSirMacAddr peer_mac;
 } tUpdateUserPos, *tpUpdateUserPos;
 
-#endif /* WLAN_FEATURE_11AC */
-
 /**
  * struct tUpdateCFParams -CF parameters
  * @bssIdx: BSSID index
diff --git a/core/wma/inc/wma_internal.h b/core/wma/inc/wma_internal.h
index 195bef70836f..9e97d2a7580f 100644
--- a/core/wma/inc/wma_internal.h
+++ b/core/wma/inc/wma_internal.h
@@ -128,7 +128,6 @@ struct index_data_rate_type {
 	uint16_t ht40_rate[2];
 };
 
-#ifdef WLAN_FEATURE_11AC
 /**
  * struct index_vht_data_rate_type - vht data rate type
  * @mcs_index: mcs rate index
@@ -142,7 +141,6 @@ struct index_vht_data_rate_type {
 	uint16_t ht40_rate[2];
 	uint16_t ht80_rate[2];
 };
-#endif
 
 /*
  * wma_main.c functions declarations
diff --git a/core/wma/inc/wma_tgt_cfg.h b/core/wma/inc/wma_tgt_cfg.h
index 6b4cf5c3ffa4..94c5b05fca14 100644
--- a/core/wma/inc/wma_tgt_cfg.h
+++ b/core/wma/inc/wma_tgt_cfg.h
@@ -89,7 +89,6 @@ struct wma_tgt_ht_cap {
 	uint32_t num_rf_chains;
 };
 
-#ifdef WLAN_FEATURE_11AC
 /**
  * struct wma_tgt_vht_cap - vht capabalities
  * @vht_max_mpdu: vht max mpdu
@@ -121,7 +120,6 @@ struct wma_tgt_vht_cap {
 	uint32_t vht_max_ampdu_len_exp;
 	uint32_t vht_txop_ps;
 };
-#endif /* WLAN_FEATURE_11AC */
 
 /**
  * struct wma_dfs_radar_ind - dfs radar indication
@@ -157,9 +155,7 @@ struct wma_tgt_cfg {
 	struct qdf_mac_addr hw_macaddr;
 	struct wma_tgt_services services;
 	struct wma_tgt_ht_cap ht_cap;
-#ifdef WLAN_FEATURE_11AC
 	struct wma_tgt_vht_cap vht_cap;
-#endif
 	uint8_t max_intf_count;
 #ifdef WLAN_FEATURE_LPSS
 	uint8_t lpss_support;
diff --git a/core/wma/inc/wma_types.h b/core/wma/inc/wma_types.h
index 8b0ce3ccb0ad..f018b0c7bbb7 100644
--- a/core/wma/inc/wma_types.h
+++ b/core/wma/inc/wma_types.h
@@ -311,12 +311,10 @@
 
 #define WMA_SET_TM_LEVEL_REQ       SIR_HAL_SET_TM_LEVEL_REQ
 
-#ifdef WLAN_FEATURE_11AC
 #define WMA_UPDATE_OP_MODE         SIR_HAL_UPDATE_OP_MODE
 #define WMA_UPDATE_RX_NSS          SIR_HAL_UPDATE_RX_NSS
 #define WMA_UPDATE_MEMBERSHIP      SIR_HAL_UPDATE_MEMBERSHIP
 #define WMA_UPDATE_USERPOS         SIR_HAL_UPDATE_USERPOS
-#endif
 
 #ifdef WLAN_FEATURE_NAN
 #define WMA_NAN_REQUEST            SIR_HAL_NAN_REQUEST
diff --git a/core/wma/src/wma_dev_if.c b/core/wma/src/wma_dev_if.c
index e353d42f6ebd..e80e1393e865 100644
--- a/core/wma/src/wma_dev_if.c
+++ b/core/wma/src/wma_dev_if.c
@@ -3804,12 +3804,10 @@ static void wma_add_sta_req_sta_mode(tp_wma_handle wma, tpAddStaParams params)
 	if (params->enableHtSmps)
 		wma_set_mimops(wma, params->smesessionId, params->htSmpsconfig);
 
-#ifdef WLAN_FEATURE_11AC
 	/* Partial AID match power save, enable when SU bformee */
 	if (params->enableVhtpAid && params->vhtTxBFCapable)
 		wma_set_ppsconfig(params->smesessionId,
 				  WMA_VHT_PPS_PAID_MATCH, 1);
-#endif
 
 	/* Enable AMPDU power save, if htCapable/vhtCapable */
 	if (params->enableAmpduPs && (params->htCapable || params->vhtCapable))
diff --git a/core/wma/src/wma_main.c b/core/wma/src/wma_main.c
index 2fd6f9314eb6..0299508559db 100644
--- a/core/wma/src/wma_main.c
+++ b/core/wma/src/wma_main.c
@@ -3372,7 +3372,6 @@ static inline void wma_update_target_ht_cap(tp_wma_handle wh,
 
 }
 
-#ifdef WLAN_FEATURE_11AC
 /**
  * wma_update_target_vht_cap() - update vht capabality from wma handle
  * @wh: wma handle
@@ -3433,7 +3432,6 @@ static inline void wma_update_target_vht_cap(tp_wma_handle wh,
 		 cfg->vht_txop_ps, cfg->vht_su_bformee, cfg->vht_mu_bformee,
 		 cfg->vht_max_ampdu_len_exp);
 }
-#endif /* #ifdef WLAN_FEATURE_11AC */
 
 /**
  * wma_update_hdd_cfg() - update HDD config
@@ -3473,9 +3471,7 @@ static void wma_update_hdd_cfg(tp_wma_handle wma_handle)
 
 	wma_update_target_services(wma_handle, &tgt_cfg.services);
 	wma_update_target_ht_cap(wma_handle, &tgt_cfg.ht_cap);
-#ifdef WLAN_FEATURE_11AC
 	wma_update_target_vht_cap(wma_handle, &tgt_cfg.vht_cap);
-#endif /* #ifdef WLAN_FEATURE_11AC */
 
 	tgt_cfg.target_fw_version = wma_handle->target_fw_version;
 #ifdef WLAN_FEATURE_LPSS
@@ -3734,10 +3730,8 @@ int wma_rx_service_ready_event(void *handle, uint8_t *cmd_param_info,
 	qdf_mem_copy(&wma_handle->reg_cap, param_buf->hal_reg_capabilities,
 		     sizeof(HAL_REG_CAPABILITIES));
 	wma_handle->ht_cap_info = ev->ht_cap_info;
-#ifdef WLAN_FEATURE_11AC
 	wma_handle->vht_cap_info = ev->vht_cap_info;
 	wma_handle->vht_supp_mcs = ev->vht_supp_mcs;
-#endif /* WLAN_FEATURE_11AC */
 	wma_handle->num_rf_chains = ev->num_rf_chains;
 
 	wma_handle->target_fw_version = ev->fw_build_vers;
@@ -4695,7 +4689,6 @@ QDF_STATUS wma_mc_process_msg(void *cds_context, cds_msg_t *msg)
 					  (tUpdateRxNss *) msg->bodyptr);
 		qdf_mem_free(msg->bodyptr);
 		break;
-#ifdef WLAN_FEATURE_11AC
 	case WMA_UPDATE_MEMBERSHIP:
 		wma_process_update_membership(wma_handle,
 			(tUpdateMembership *) msg->bodyptr);
@@ -4704,7 +4697,6 @@ QDF_STATUS wma_mc_process_msg(void *cds_context, cds_msg_t *msg)
 		wma_process_update_userpos(wma_handle,
 					   (tUpdateUserPos *) msg->bodyptr);
 		break;
-#endif /* WLAN_FEATURE_11AC */
 	case WMA_UPDATE_BEACON_IND:
 		wma_process_update_beacon_params(wma_handle,
 			(tUpdateBeaconParams *) msg->bodyptr);
diff --git a/core/wma/src/wma_mgmt.c b/core/wma/src/wma_mgmt.c
index 5c4251cc5b5a..c3bf626ab369 100644
--- a/core/wma/src/wma_mgmt.c
+++ b/core/wma/src/wma_mgmt.c
@@ -901,7 +901,6 @@ QDF_STATUS wma_send_peer_assoc(tp_wma_handle wma,
 		}
 	}
 
-#ifdef WLAN_FEATURE_11AC
 	if (params->vhtCapable) {
 		cmd->peer_flags |= (WMI_PEER_HT | WMI_PEER_VHT | WMI_PEER_QOS);
 		cmd->peer_rate_caps |= WMI_RC_HT_FLAG;
@@ -915,7 +914,6 @@ QDF_STATUS wma_send_peer_assoc(tp_wma_handle wma,
 		cmd->peer_flags |= WMI_PEER_160MHZ;
 
 	cmd->peer_vht_caps = params->vht_caps;
-#endif /* WLAN_FEATURE_11AC */
 
 	if (params->rmfEnabled)
 		cmd->peer_flags |= WMI_PEER_PMF;
@@ -2498,7 +2496,6 @@ void wma_process_update_rx_nss(tp_wma_handle wma_handle,
 			   update_rx_nss->smesessionId);
 }
 
-#ifdef WLAN_FEATURE_11AC
 /**
  * wma_process_update_membership() - process update group membership cmd
  * @wma_handle: wma handle
@@ -2538,7 +2535,6 @@ void wma_process_update_userpos(tp_wma_handle wma_handle,
 	wma_set_ppsconfig(userpos->smesessionId, WMA_VHT_PPS_GID_MATCH, 1);
 
 }
-#endif /* WLAN_FEATURE_11AC */
 
 /**
  * wma_set_htconfig() - set ht config parameters to target
diff --git a/core/wma/src/wma_utils.c b/core/wma/src/wma_utils.c
index 8457bd4d5ca7..02cdce327744 100644
--- a/core/wma/src/wma_utils.c
+++ b/core/wma/src/wma_utils.c
@@ -96,7 +96,6 @@ static struct index_data_rate_type mcs_nss2[] = {
 	{7,  {1300, 1440}, {2700, 3000} }
 };
 
-#ifdef WLAN_FEATURE_11AC
 /* MCS Based VHT rate table */
 /* MCS parameters with Nss = 1*/
 static struct index_vht_data_rate_type vht_mcs_nss1[] = {
@@ -127,7 +126,6 @@ static struct index_vht_data_rate_type vht_mcs_nss2[] = {
 	{8,  {1560, 1733}, {3240, 3600}, {7020, 7800} },
 	{9,  {1730, 1920}, {3600, 4000}, {7800, 8667} }
 };
-#endif /* WLAN_FEATURE_11AC */
 
 #ifdef BIG_ENDIAN_HOST
 
@@ -216,7 +214,6 @@ static uint8_t wma_get_mcs_idx(uint16_t maxRate, uint8_t rate_flags,
 
 	*mcsRateFlag = rate_flags;
 	*mcsRateFlag &= ~eHAL_TX_RATE_SGI;
-#ifdef WLAN_FEATURE_11AC
 	for (index = 0; index < MAX_VHT_MCS_IDX; index++) {
 		if (rate_flags & eHAL_TX_RATE_VHT80) {
 			/* check for vht80 nss1/2 rate set */
@@ -257,7 +254,6 @@ static uint8_t wma_get_mcs_idx(uint16_t maxRate, uint8_t rate_flags,
 			}
 		}
 	}
-#endif /* WLAN_FEATURE_11AC */
 	for (index = 0; index < MAX_HT_MCS_IDX; index++) {
 		if (rate_flags & eHAL_TX_RATE_HT40) {
 			/* check for ht40 nss1/2 rate set */