Merge "qcacld-3.0: Fix implicit enum conversion in csr_fetch_valid_ch_lst" into wlan-cld3.driver.lnx.2.0

core/hdd/inc/wlan_hdd_main.h

@@ -1699,7 +1699,7 @@ struct hdd_context {
 	uint8_t bt_a2dp_active:1;
 	uint8_t bt_vo_active:1;
 	struct hdd_nud_stats_context nud_stats_context;
-	eCsrBand curr_band;
+	enum band_info curr_band;
 	bool fw_mem_dump_enabled;
 	bool imps_enabled;
 	int user_configured_pkt_filter_rules;
@@ -2526,7 +2526,7 @@ bool hdd_set_connection_in_progress(bool value);
 int wlan_hdd_sap_get_valid_channellist(struct hdd_adapter *adapter,
 				       uint32_t *channel_count,
 				       uint8_t *channel_list,
-				       eCsrBand band);
+				       enum band_info band);
 /**
  * wlan_hdd_init_chan_info() - initialize channel info variables
  * @hdd_ctx: hdd ctx

core/hdd/src/wlan_hdd_assoc.c

@@ -263,8 +263,8 @@ bool hdd_conn_is_connected(struct hdd_station_ctx *sta_ctx)
  * hdd_conn_get_connected_band() - get current connection radio band
  * @sta_ctx:    pointer to global HDD Station context
  *
- * Return: eCSR_BAND_24 or eCSR_BAND_5G based on current AP connection
- *	eCSR_BAND_ALL if not connected
+ * Return: BAND_2G or BAND_5G based on current AP connection
+ *	BAND_ALL if not connected
  */
 enum band_info hdd_conn_get_connected_band(struct hdd_station_ctx *sta_ctx)
 {
@@ -277,7 +277,7 @@ enum band_info hdd_conn_get_connected_band(struct hdd_station_ctx *sta_ctx)
 		return BAND_2G;
 	else if (staChannel >= 36 && staChannel <= 184)
 		return BAND_5G;
-	else   /* If station is not connected return as eCSR_BAND_ALL */
+	else   /* If station is not connected return as BAND_ALL */
 		return BAND_ALL;
 }
 

core/hdd/src/wlan_hdd_cfg.c

@@ -8617,7 +8617,7 @@ QDF_STATUS hdd_set_sme_config(struct hdd_context *hdd_ctx)
 	smeConfig->csrConfig.ProprietaryRatesEnabled = 0;
 	smeConfig->csrConfig.HeartbeatThresh50 = 40;
 	smeConfig->csrConfig.bandCapability = pConfig->nBandCapability;
-	if (pConfig->nBandCapability == eCSR_BAND_24) {
+	if (pConfig->nBandCapability == BAND_2G) {
 		smeConfig->csrConfig.Is11hSupportEnabled = 0;
 	} else {
 		smeConfig->csrConfig.Is11hSupportEnabled =

core/hdd/src/wlan_hdd_cfg80211.c

@@ -1769,20 +1769,20 @@ static void wlan_hdd_cfg80211_start_pending_acs(struct work_struct *work);
 
 
 static void hdd_update_acs_channel_list(tsap_Config_t *sap_config,
-					eCsrBand band)
+					enum band_info band)
 {
 	int i, temp_count = 0;
 	int acs_list_count = sap_config->acs_cfg.ch_list_count;
 
 	for (i = 0; i < acs_list_count; i++) {
-		if (eCSR_BAND_24 == band) {
+		if (BAND_2G == band) {
 			if (WLAN_REG_IS_24GHZ_CH(
 				sap_config->acs_cfg.ch_list[i])) {
 				sap_config->acs_cfg.ch_list[temp_count] =
 					sap_config->acs_cfg.ch_list[i];
 				temp_count++;
 			}
-		} else if (eCSR_BAND_5G == band) {
+		} else if (BAND_5G == band) {
 			if (WLAN_REG_IS_5GHZ_CH(
 				sap_config->acs_cfg.ch_list[i])) {
 				sap_config->acs_cfg.ch_list[temp_count] =
@@ -1856,12 +1856,12 @@ int wlan_hdd_cfg80211_start_acs(struct hdd_adapter *adapter)
 				sap_config->acs_cfg.band =
 					QCA_ACS_MODE_IEEE80211A;
 				hdd_update_acs_channel_list(sap_config,
-					eCSR_BAND_5G);
+					BAND_5G);
 			} else {
 				sap_config->acs_cfg.band =
 					QCA_ACS_MODE_IEEE80211G;
 				hdd_update_acs_channel_list(sap_config,
-					eCSR_BAND_24);
+					BAND_2G);
 			}
 		}
 	}
@@ -2178,25 +2178,25 @@ fail:
 
 static void hdd_get_scan_band(struct hdd_context *hdd_ctx,
 			      tsap_Config_t *sap_config,
-			      eCsrBand *band)
+			      enum band_info *band)
 {
 	/* Get scan band */
 	if ((sap_config->acs_cfg.band == QCA_ACS_MODE_IEEE80211B) ||
 	   (sap_config->acs_cfg.band == QCA_ACS_MODE_IEEE80211G)) {
-		*band = eCSR_BAND_24;
+		*band = BAND_2G;
 	} else if (sap_config->acs_cfg.band == QCA_ACS_MODE_IEEE80211A) {
-		*band = eCSR_BAND_5G;
+		*band = BAND_5G;
 	} else if (sap_config->acs_cfg.band == QCA_ACS_MODE_IEEE80211ANY) {
-		*band = eCSR_BAND_ALL;
+		*band = BAND_ALL;
 	}
 	/* Auto is not supported currently */
-	if (!((*band == eCSR_BAND_24) || (eCSR_BAND_5G == *band))) {
+	if (!((*band == BAND_2G) || (BAND_5G == *band))) {
 		hdd_err("invalid band");
 		if (HDD_EXTERNAL_ACS_FREQ_BAND_24GHZ ==
 			hdd_ctx->config->external_acs_freq_band)
-			hdd_update_acs_channel_list(sap_config, eCSR_BAND_24);
+			hdd_update_acs_channel_list(sap_config, BAND_2G);
 		else
-			hdd_update_acs_channel_list(sap_config, eCSR_BAND_5G);
+			hdd_update_acs_channel_list(sap_config, BAND_5G);
 	}
 }
 
@@ -2230,7 +2230,7 @@ int hdd_cfg80211_update_acs_config(struct hdd_adapter *adapter,
 	uint8_t vendor_weight_list[QDF_MAX_NUM_CHAN] = {0};
 	struct hdd_vendor_acs_chan_params acs_chan_params;
 	struct hdd_context *hdd_ctx = WLAN_HDD_GET_CTX(adapter);
-	eCsrBand band = eCSR_BAND_24;
+	enum band_info band = BAND_2G;
 	eCsrPhyMode phy_mode;
 	enum qca_wlan_vendor_attr_external_acs_policy acs_policy;
 	uint32_t i;
@@ -2260,12 +2260,12 @@ int hdd_cfg80211_update_acs_config(struct hdd_adapter *adapter,
 				sap_config->acs_cfg.band =
 					QCA_ACS_MODE_IEEE80211A;
 				hdd_update_acs_channel_list(sap_config,
-					eCSR_BAND_5G);
+					BAND_5G);
 			} else {
 				sap_config->acs_cfg.band =
 					QCA_ACS_MODE_IEEE80211G;
 				hdd_update_acs_channel_list(sap_config,
-					eCSR_BAND_24);
+					BAND_2G);
 			}
 		}
 	}
@@ -9300,7 +9300,7 @@ static void wlan_hdd_get_chanlist_without_nol(struct hdd_adapter *adapter,
 int wlan_hdd_sap_get_valid_channellist(struct hdd_adapter *adapter,
 				       uint32_t *channel_count,
 				       uint8_t *channel_list,
-				       eCsrBand band)
+				       enum band_info band)
 {
 	tsap_Config_t *sap_config;
 	struct hdd_context *hdd_ctx = WLAN_HDD_GET_CTX(adapter);
@@ -9322,11 +9322,11 @@ int wlan_hdd_sap_get_valid_channellist(struct hdd_adapter *adapter,
 
 	for (i = 0; i < chan_count; i++) {
 		if (*channel_count < QDF_MAX_NUM_CHAN) {
-			if ((eCSR_BAND_24 == band) &&
+			if ((BAND_2G == band) &&
 			    (WLAN_REG_IS_24GHZ_CH(tmp_chan_list[i]))) {
 				channel_list[*channel_count] = tmp_chan_list[i];
 				*channel_count += 1;
-			} else if ((eCSR_BAND_5G == band) &&
+			} else if ((BAND_5G == band) &&
 				(WLAN_REG_IS_5GHZ_CH(tmp_chan_list[i]))) {
 				channel_list[*channel_count] = tmp_chan_list[i];
 				*channel_count += 1;
@@ -9844,11 +9844,11 @@ uint8_t hdd_get_sap_operating_band(struct hdd_context *hdd_ctx)
 		}
 		operating_channel = adapter->session.ap.operating_channel;
 		if (IS_24G_CH(operating_channel))
-			sap_operating_band = eCSR_BAND_24;
+			sap_operating_band = BAND_2G;
 		else if (IS_5G_CH(operating_channel))
-			sap_operating_band = eCSR_BAND_5G;
+			sap_operating_band = BAND_5G;
 		else
-			sap_operating_band = eCSR_BAND_ALL;
+			sap_operating_band = BAND_ALL;
 		status = hdd_get_next_adapter(hdd_ctx, adapter_node,
 				&next);
 		adapter_node = next;
@@ -12944,7 +12944,7 @@ struct hdd_context *hdd_cfg80211_wiphy_alloc(int priv_size)
  * private ioctl to change the band value
  */
 int wlan_hdd_cfg80211_update_band(struct hdd_context *hdd_ctx, struct wiphy *wiphy,
-		eCsrBand eBand)
+		enum band_info eBand)
 {
 	int i, j;
 	enum channel_state channelEnabledState;
@@ -12964,7 +12964,7 @@ int wlan_hdd_cfg80211_update_band(struct hdd_context *hdd_ctx, struct wiphy *wip
 					band->channels[j].hw_value);
 
 			if (HDD_NL80211_BAND_2GHZ == i &&
-				eCSR_BAND_5G == eBand) {
+				BAND_5G == eBand) {
 				/* 5G only */
 #ifdef WLAN_ENABLE_SOCIAL_CHANNELS_5G_ONLY
 				/* Enable Social channels for P2P */
@@ -12980,7 +12980,7 @@ int wlan_hdd_cfg80211_update_band(struct hdd_context *hdd_ctx, struct wiphy *wip
 					IEEE80211_CHAN_DISABLED;
 				continue;
 			} else if (HDD_NL80211_BAND_5GHZ == i &&
-					eCSR_BAND_24 == eBand) {
+					BAND_2G == eBand) {
 				/* 2G only */
 				band->channels[j].flags |=
 					IEEE80211_CHAN_DISABLED;
@@ -13221,7 +13221,7 @@ int wlan_hdd_cfg80211_init(struct device *dev,
 			struct ieee80211_supported_band *band = wiphy->bands[i];
 
 			if (HDD_NL80211_BAND_2GHZ == i &&
-				eCSR_BAND_5G == pCfg->nBandCapability) {
+				BAND_5G == pCfg->nBandCapability) {
 				/* 5G only */
 #ifdef WLAN_ENABLE_SOCIAL_CHANNELS_5G_ONLY
 				/* Enable social channels for P2P */
@@ -13235,7 +13235,7 @@ int wlan_hdd_cfg80211_init(struct device *dev,
 					IEEE80211_CHAN_DISABLED;
 				continue;
 			} else if (HDD_NL80211_BAND_5GHZ == i &&
-					eCSR_BAND_24 == pCfg->nBandCapability) {
+					BAND_2G == pCfg->nBandCapability) {
 				/* 2G only */
 				band->channels[j].flags |=
 					IEEE80211_CHAN_DISABLED;

core/hdd/src/wlan_hdd_cfg80211.h

@@ -404,7 +404,7 @@ int wlan_hdd_enable_dfs_chan_scan(struct hdd_context *hdd_ctx,
 
 int wlan_hdd_cfg80211_update_band(struct hdd_context *hdd_ctx,
 				  struct wiphy *wiphy,
-				  eCsrBand eBand);
+				  enum band_info eBand);
 
 /**
  * wlan_hdd_try_disconnect() - try disconnnect from previous connection

core/hdd/src/wlan_hdd_hostapd.c

@@ -4810,7 +4810,7 @@ static int __iw_get_channel_list(struct net_device *dev,
 	tHalHandle hal = WLAN_HDD_GET_HAL_CTX(hostapd_adapter);
 	struct channel_list_info *channel_list =
 					(struct channel_list_info *) extra;
-	eCsrBand cur_band = eCSR_BAND_ALL;
+	enum band_info cur_band = BAND_ALL;
 	struct hdd_context *hdd_ctx;
 	int ret;
 	bool is_dfs_mode_enabled = false;
@@ -4832,15 +4832,15 @@ static int __iw_get_channel_list(struct net_device *dev,
 	}
 	wrqu->data.length = sizeof(struct channel_list_info);
 
-	if (eCSR_BAND_24 == cur_band) {
+	if (BAND_2G == cur_band) {
 		band_start_channel = CHAN_ENUM_1;
 		band_end_channel = CHAN_ENUM_14;
-	} else if (eCSR_BAND_5G == cur_band) {
+	} else if (BAND_5G == cur_band) {
 		band_start_channel = CHAN_ENUM_36;
 		band_end_channel = CHAN_ENUM_184;
 	}
 
-	if (cur_band != eCSR_BAND_24) {
+	if (cur_band != BAND_2G) {
 		if (hdd_ctx->config->dot11p_mode)
 			band_end_channel = CHAN_ENUM_184;
 		else

core/hdd/src/wlan_hdd_ioctl.c

@@ -545,19 +545,19 @@ hdd_parse_get_ibss_peer_info(uint8_t *pValue, struct qdf_mac_addr *pPeerMacAddr)
 
 static void hdd_get_band_helper(struct hdd_context *hdd_ctx, int *pBand)
 {
-	eCsrBand band = -1;
+	enum band_info band = -1;
 
 	sme_get_freq_band((tHalHandle) (hdd_ctx->hHal), &band);
 	switch (band) {
-	case eCSR_BAND_ALL:
+	case BAND_ALL:
 		*pBand = WLAN_HDD_UI_BAND_AUTO;
 		break;
 
-	case eCSR_BAND_24:
+	case BAND_2G:
 		*pBand = WLAN_HDD_UI_BAND_2_4_GHZ;
 		break;
 
-	case eCSR_BAND_5G:
+	case BAND_5G:
 		*pBand = WLAN_HDD_UI_BAND_5_GHZ;
 		break;
 

core/hdd/src/wlan_hdd_main.c

@@ -1099,10 +1099,10 @@ static void hdd_update_vdev_nss(struct hdd_context *hdd_ctx)
 		max_supp_nss = 2;
 
 	sme_update_vdev_type_nss(hdd_ctx->hHal, max_supp_nss,
-			cfg_ini->vdev_type_nss_2g, eCSR_BAND_24);
+			cfg_ini->vdev_type_nss_2g, BAND_2G);
 
 	sme_update_vdev_type_nss(hdd_ctx->hHal, max_supp_nss,
-			cfg_ini->vdev_type_nss_5g, eCSR_BAND_5G);
+			cfg_ini->vdev_type_nss_5g, BAND_5G);
 }
 
 /**
@@ -1709,11 +1709,11 @@ void hdd_update_tgt_cfg(void *context, void *param)
 	 * setting if INI setting is a subset
 	 */
 
-	if ((hdd_ctx->config->nBandCapability == eCSR_BAND_ALL) &&
-	    (temp_band_cap != eCSR_BAND_ALL))
+	if ((hdd_ctx->config->nBandCapability == BAND_ALL) &&
+	    (temp_band_cap != BAND_ALL))
 		hdd_ctx->config->nBandCapability = temp_band_cap;
-	else if ((hdd_ctx->config->nBandCapability != eCSR_BAND_ALL) &&
-		 (temp_band_cap != eCSR_BAND_ALL) &&
+	else if ((hdd_ctx->config->nBandCapability != BAND_ALL) &&
+		 (temp_band_cap != BAND_ALL) &&
 		 (hdd_ctx->config->nBandCapability != temp_band_cap)) {
 		hdd_warn("ini BandCapability not supported by the target");
 	}
@@ -6346,7 +6346,7 @@ bool hdd_is_5g_supported(struct hdd_context *hdd_ctx)
 	if (!hdd_ctx)
 		return true;
 
-	if (hdd_ctx->curr_band != eCSR_BAND_24)
+	if (hdd_ctx->curr_band != BAND_2G)
 		return true;
 	else
 		return false;

core/hdd/src/wlan_hdd_wext.c

@@ -5106,7 +5106,7 @@ int wlan_hdd_update_phymode(struct net_device *net, tHalHandle hal,
 	uint32_t vhtchanwidth;
 	eCsrPhyMode phymode = -EIO, old_phymode;
 	enum hdd_dot11_mode hdd_dot11mode = phddctx->config->dot11Mode;
-	eCsrBand curr_band = eCSR_BAND_ALL;
+	enum band_info curr_band = BAND_ALL;
 	int retval = 0;
 
 	old_phymode = sme_get_phy_mode(hal);
@@ -5121,11 +5121,11 @@ int wlan_hdd_update_phymode(struct net_device *net, tHalHandle hal,
 						   nChannelBondingMode5GHz))
 		ch_bond5g = true;
 
-	if (phddctx->config->nBandCapability == eCSR_BAND_ALL)
+	if (phddctx->config->nBandCapability == BAND_ALL)
 		band_24 = band_5g = true;
-	else if (phddctx->config->nBandCapability == eCSR_BAND_24)
+	else if (phddctx->config->nBandCapability == BAND_2G)
 		band_24 = true;
-	else if (phddctx->config->nBandCapability == eCSR_BAND_5G)
+	else if (phddctx->config->nBandCapability == BAND_5G)
 		band_5g = true;
 
 	vhtchanwidth = phddctx->config->vhtChannelWidth;
@@ -5139,7 +5139,7 @@ int wlan_hdd_update_phymode(struct net_device *net, tHalHandle hal,
 			phymode = eCSR_DOT11_MODE_AUTO;
 			hdd_dot11mode = eHDD_DOT11_MODE_AUTO;
 			chwidth = WNI_CFG_CHANNEL_BONDING_MODE_ENABLE;
-			curr_band = eCSR_BAND_ALL;
+			curr_band = BAND_ALL;
 			vhtchanwidth = eHT_CHANNEL_WIDTH_80MHZ;
 		} else {
 			sme_set_phy_mode(hal, old_phymode);
@@ -5152,7 +5152,7 @@ int wlan_hdd_update_phymode(struct net_device *net, tHalHandle hal,
 			phymode = eCSR_DOT11_MODE_11a;
 			hdd_dot11mode = eHDD_DOT11_MODE_11a;
 			chwidth = WNI_CFG_CHANNEL_BONDING_MODE_DISABLE;
-			curr_band = eCSR_BAND_5G;
+			curr_band = BAND_5G;
 		} else {
 			sme_set_phy_mode(hal, old_phymode);
 			return -EIO;
@@ -5164,7 +5164,7 @@ int wlan_hdd_update_phymode(struct net_device *net, tHalHandle hal,
 			phymode = eCSR_DOT11_MODE_11b;
 			hdd_dot11mode = eHDD_DOT11_MODE_11b;
 			chwidth = WNI_CFG_CHANNEL_BONDING_MODE_DISABLE;
-			curr_band = eCSR_BAND_24;
+			curr_band = BAND_2G;
 		} else {
 			sme_set_phy_mode(hal, old_phymode);
 			return -EIO;
@@ -5176,7 +5176,7 @@ int wlan_hdd_update_phymode(struct net_device *net, tHalHandle hal,
 			phymode = eCSR_DOT11_MODE_11g;
 			hdd_dot11mode = eHDD_DOT11_MODE_11g;
 			chwidth = WNI_CFG_CHANNEL_BONDING_MODE_DISABLE;
-			curr_band = eCSR_BAND_24;
+			curr_band = BAND_2G;
 		} else {
 			sme_set_phy_mode(hal, old_phymode);
 			return -EIO;
@@ -5192,7 +5192,7 @@ int wlan_hdd_update_phymode(struct net_device *net, tHalHandle hal,
 			phymode = eCSR_DOT11_MODE_11n;
 			hdd_dot11mode = eHDD_DOT11_MODE_11n;
 			chwidth = WNI_CFG_CHANNEL_BONDING_MODE_DISABLE;
-			curr_band = eCSR_BAND_5G;
+			curr_band = BAND_5G;
 		} else {
 			sme_set_phy_mode(hal, old_phymode);
 			return -EIO;
@@ -5204,7 +5204,7 @@ int wlan_hdd_update_phymode(struct net_device *net, tHalHandle hal,
 			phymode = eCSR_DOT11_MODE_11n;
 			hdd_dot11mode = eHDD_DOT11_MODE_11n;
 			chwidth = WNI_CFG_CHANNEL_BONDING_MODE_ENABLE;
-			curr_band = eCSR_BAND_5G;
+			curr_band = BAND_5G;
 		} else {
 			sme_set_phy_mode(hal, old_phymode);
 			return -EIO;
@@ -5216,7 +5216,7 @@ int wlan_hdd_update_phymode(struct net_device *net, tHalHandle hal,
 			phymode = eCSR_DOT11_MODE_11n;
 			hdd_dot11mode = eHDD_DOT11_MODE_11n;
 			chwidth = WNI_CFG_CHANNEL_BONDING_MODE_DISABLE;
-			curr_band = eCSR_BAND_24;
+			curr_band = BAND_2G;
 		} else {
 			sme_set_phy_mode(hal, old_phymode);
 			return -EIO;
@@ -5228,7 +5228,7 @@ int wlan_hdd_update_phymode(struct net_device *net, tHalHandle hal,
 			phymode = eCSR_DOT11_MODE_11n;
 			hdd_dot11mode = eHDD_DOT11_MODE_11n;
 			chwidth = WNI_CFG_CHANNEL_BONDING_MODE_ENABLE;
-			curr_band = eCSR_BAND_24;
+			curr_band = BAND_2G;
 		} else {
 			sme_set_phy_mode(hal, old_phymode);
 			return -EIO;
@@ -5242,7 +5242,7 @@ int wlan_hdd_update_phymode(struct net_device *net, tHalHandle hal,
 			phymode = eCSR_DOT11_MODE_11ac;
 			hdd_dot11mode = eHDD_DOT11_MODE_11ac;
 			chwidth = WNI_CFG_CHANNEL_BONDING_MODE_ENABLE;
-			curr_band = eCSR_BAND_5G;
+			curr_band = BAND_5G;
 		} else {
 			sme_set_phy_mode(hal, old_phymode);
 			return -EIO;
@@ -5254,7 +5254,7 @@ int wlan_hdd_update_phymode(struct net_device *net, tHalHandle hal,
 			phymode = eCSR_DOT11_MODE_AUTO;
 			hdd_dot11mode = eHDD_DOT11_MODE_AUTO;
 			chwidth = WNI_CFG_CHANNEL_BONDING_MODE_ENABLE;
-			curr_band = eCSR_BAND_24;
+			curr_band = BAND_2G;
 		} else {
 			sme_set_phy_mode(hal, old_phymode);
 			return -EIO;
@@ -5267,7 +5267,7 @@ int wlan_hdd_update_phymode(struct net_device *net, tHalHandle hal,
 			hdd_dot11mode = eHDD_DOT11_MODE_AUTO;
 			chwidth = WNI_CFG_CHANNEL_BONDING_MODE_ENABLE;
 			vhtchanwidth = eHT_CHANNEL_WIDTH_80MHZ;
-			curr_band = eCSR_BAND_5G;
+			curr_band = BAND_5G;
 		} else {
 			sme_set_phy_mode(hal, old_phymode);
 			return -EIO;
@@ -5279,7 +5279,7 @@ int wlan_hdd_update_phymode(struct net_device *net, tHalHandle hal,
 			phymode = eCSR_DOT11_MODE_11n;
 			hdd_dot11mode = eHDD_DOT11_MODE_11n;
 			chwidth = WNI_CFG_CHANNEL_BONDING_MODE_ENABLE;
-			curr_band = eCSR_BAND_ALL;
+			curr_band = BAND_ALL;
 		} else {
 			sme_set_phy_mode(hal, old_phymode);
 			return -EIO;
@@ -5341,14 +5341,14 @@ int wlan_hdd_update_phymode(struct net_device *net, tHalHandle hal,
 #endif
 		sme_config->csrConfig.eBand = curr_band;
 		sme_config->csrConfig.bandCapability = curr_band;
-		if (curr_band == eCSR_BAND_24)
+		if (curr_band == BAND_2G)
 			sme_config->csrConfig.Is11hSupportEnabled = 0;
 		else
 			sme_config->csrConfig.Is11hSupportEnabled =
 				phddctx->config->Is11hSupportEnabled;
-		if (curr_band == eCSR_BAND_24)
+		if (curr_band == BAND_2G)
 			sme_config->csrConfig.channelBondingMode24GHz = chwidth;
-		else if (curr_band == eCSR_BAND_24)
+		else if (curr_band == BAND_2G)
 			sme_config->csrConfig.channelBondingMode5GHz = chwidth;
 		else {
 			sme_config->csrConfig.channelBondingMode24GHz = chwidth;
@@ -5752,7 +5752,7 @@ static int __iw_setint_getnone(struct net_device *dev,
 	{
 		hdd_debug("Setting maximum tx power %d dBm for 2.4 GHz band",
 			   set_value);
-		if (sme_set_max_tx_power_per_band(eCSR_BAND_24, set_value) !=
+		if (sme_set_max_tx_power_per_band(BAND_2G, set_value) !=
 		    QDF_STATUS_SUCCESS) {
 			hdd_err("Setting max tx power failed for 2.4 GHz band");
 			ret = -EIO;
@@ -5765,7 +5765,7 @@ static int __iw_setint_getnone(struct net_device *dev,
 	{
 		hdd_debug("Setting maximum tx power %d dBm for 5.0 GHz band",
 			   set_value);
-		if (sme_set_max_tx_power_per_band(eCSR_BAND_5G, set_value) !=
+		if (sme_set_max_tx_power_per_band(BAND_5G, set_value) !=
 		    QDF_STATUS_SUCCESS) {
 			hdd_err("Setting max tx power failed for 5.0 GHz band");
 			ret = -EIO;
@@ -8142,7 +8142,7 @@ static int __iw_get_char_setnone(struct net_device *dev,
 		struct hdd_context *hddctx = WLAN_HDD_GET_CTX(adapter);
 		tHalHandle hal = WLAN_HDD_GET_HAL_CTX(adapter);
 		eCsrPhyMode phymode;
-		eCsrBand currBand;
+		enum band_info currBand;
 		tSmeConfigParams *sme_config;
 
 		sme_config = qdf_mem_malloc(sizeof(*sme_config));
@@ -8176,14 +8176,14 @@ static int __iw_get_char_setnone(struct net_device *dev,
 			break;
 		case eCSR_DOT11_MODE_11n:
 		case eCSR_DOT11_MODE_11n_ONLY:
-			if (currBand == eCSR_BAND_24) {
+			if (currBand == BAND_2G) {
 				if (ch_bond24)
 					snprintf(extra, WE_MAX_STR_LEN,
 						 "11NGHT40");
 				else
 					snprintf(extra, WE_MAX_STR_LEN,
 						 "11NGHT20");
-			} else if (currBand == eCSR_BAND_5G) {
+			} else if (currBand == BAND_5G) {
 				if (ch_bond5g)
 					snprintf(extra, WE_MAX_STR_LEN,
 						 "11NAHT40");

core/mac/inc/sir_api.h

@@ -420,12 +420,6 @@ typedef struct sSirSupportedRates {
 #endif
 } tSirSupportedRates, *tpSirSupportedRates;
 
-typedef enum eSirRFBand {
-	SIR_BAND_UNKNOWN,
-	SIR_BAND_2_4_GHZ,
-	SIR_BAND_5_GHZ,
-} tSirRFBand;
-
 typedef struct sSirRemainOnChnReq {
 	uint16_t messageType;
 	uint16_t length;

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

@@ -287,10 +287,11 @@ static inline void lim_get_phy_mode(tpAniSirGlobal pMac, uint32_t *phyMode,
 }
 
 /* ----------------------------------------------------------------------- */
-static inline void lim_get_rf_band_new(tpAniSirGlobal pMac, tSirRFBand *band,
-					    tpPESession psessionEntry)
+static inline void lim_get_rf_band_new(tpAniSirGlobal pMac,
+				       enum band_info *band,
+				       tpPESession psessionEntry)
 {
-	*band = psessionEntry ? psessionEntry->limRFBand : SIR_BAND_UNKNOWN;
+	*band = psessionEntry ? psessionEntry->limRFBand : BAND_UNKNOWN;
 }
 
 /*--------------------------------------------------------------------------

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

@@ -147,7 +147,7 @@ typedef struct sPESession       /* Added to Support BT-AMP */
 	uint8_t htRecommendedTxWidthSet;
 	/* Identifies the 40 MHz extension channel */
 	ePhyChanBondState htSecondaryChannelOffset;
-	tSirRFBand limRFBand;
+	enum band_info limRFBand;
 	uint8_t limIbssActive;  /* TO SUPPORT CONCURRENCY */
 
 	/* These global varibales moved to session Table to support BT-AMP : Oct 9th review */

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

@@ -1013,7 +1013,7 @@ lim_decide_ap_protection_on_delete(tpAniSirGlobal mac_ctx,
 {
 	uint32_t phy_mode;
 	tHalBitVal erp_enabled = eHAL_CLEAR;
-	tSirRFBand rf_band = SIR_BAND_UNKNOWN;
+	enum band_info rf_band = BAND_UNKNOWN;
 	uint32_t i;
 
 	if (NULL == sta_ds)
@@ -1023,7 +1023,7 @@ lim_decide_ap_protection_on_delete(tpAniSirGlobal mac_ctx,
 	lim_get_phy_mode(mac_ctx, &phy_mode, session_entry);
 	erp_enabled = sta_ds->erpEnabled;
 
-	if ((SIR_BAND_5_GHZ == rf_band) &&
+	if ((BAND_5G == rf_band) &&
 		(true == session_entry->htCapability) &&
 		(session_entry->beaconParams.llaCoexist) &&
 		(false == sta_ds->mlmStaContext.htCapability)) {
@@ -1055,7 +1055,7 @@ lim_decide_ap_protection_on_delete(tpAniSirGlobal mac_ctx,
 	}
 
 	/* we are HT or 11G and 11B station is getting deleted */
-	if ((SIR_BAND_2_4_GHZ == rf_band) &&
+	if ((BAND_2G == rf_band) &&
 		(phy_mode == WNI_CFG_PHY_MODE_11G ||
 		session_entry->htCapability) &&
 		(erp_enabled == eHAL_CLEAR)) {
@@ -1085,7 +1085,7 @@ lim_decide_ap_protection_on_delete(tpAniSirGlobal mac_ctx,
 	 * we are HT AP and non-11B station is leaving.
 	 * 11g station is leaving
 	 */
-	if ((SIR_BAND_2_4_GHZ == rf_band) &&
+	if ((BAND_2G == rf_band) &&
 		session_entry->htCapability &&
 		!sta_ds->mlmStaContext.htCapability) {
 		pe_debug("(%d) A 11g STA is disassociated. Addr is %pM",

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

@@ -595,7 +595,7 @@ void lim_fill_ft_session(tpAniSirGlobal pMac,
 	pftSessionEntry->limRFBand = lim_get_rf_band(
 				pftSessionEntry->currentOperChannel);
 
-	if (pftSessionEntry->limRFBand == SIR_BAND_2_4_GHZ) {
+	if (pftSessionEntry->limRFBand == BAND_2G) {
 		cbEnabledMode = pMac->roam.configParam.channelBondingMode24GHz;
 	} else {
 		cbEnabledMode = pMac->roam.configParam.channelBondingMode5GHz;
@@ -721,7 +721,7 @@ void lim_fill_ft_session(tpAniSirGlobal pMac,
 #ifdef WLAN_FEATURE_11W
 	pftSessionEntry->limRmfEnabled = psessionEntry->limRmfEnabled;
 #endif
-	if ((pftSessionEntry->limRFBand == SIR_BAND_2_4_GHZ) &&
+	if ((pftSessionEntry->limRFBand == BAND_2G) &&
 		(pftSessionEntry->htSupportedChannelWidthSet ==
 		eHT_CHANNEL_WIDTH_40MHZ))
 		lim_init_obss_params(pMac, pftSessionEntry);

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

@@ -845,7 +845,7 @@ lim_ibss_decide_protection(tpAniSirGlobal pMac, tpDphHashNode pStaDs,
 			   tpUpdateBeaconParams pBeaconParams,
 			   tpPESession psessionEntry)
 {
-	tSirRFBand rfBand = SIR_BAND_UNKNOWN;
+	enum band_info rfBand = BAND_UNKNOWN;
 	uint32_t phyMode;
 	tLimProtStaCacheType protStaCacheType =
 		eLIM_PROT_STA_CACHE_TYPE_INVALID;
@@ -858,7 +858,7 @@ lim_ibss_decide_protection(tpAniSirGlobal pMac, tpDphHashNode pStaDs,
 	}
 
 	lim_get_rf_band_new(pMac, &rfBand, psessionEntry);
-	if (SIR_BAND_2_4_GHZ == rfBand) {
+	if (BAND_2G == rfBand) {
 		lim_get_phy_mode(pMac, &phyMode, psessionEntry);
 
 		/* We are 11G or 11n. Check if we need protection from 11b Stations. */
@@ -1704,14 +1704,14 @@ void lim_ibss_decide_protection_on_delete(tpAniSirGlobal mac_ctx,
 {
 	uint32_t phymode;
 	tHalBitVal erpenabled = eHAL_CLEAR;
-	tSirRFBand rfband = SIR_BAND_UNKNOWN;
+	enum band_info rfband = BAND_UNKNOWN;
 	uint32_t i;
 
 	if (NULL == stads)
 		return;
 
 	lim_get_rf_band_new(mac_ctx, &rfband, session);
-	if (SIR_BAND_2_4_GHZ != rfband)
+	if (BAND_2G != rfband)
 		return;
 
 	lim_get_phy_mode(mac_ctx, &phymode, session);

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

@@ -100,9 +100,9 @@ static void lim_convert_supported_channels(tpAniSirGlobal mac_ctx,
 		if (chn_count <= 1)
 			continue;
 		next_ch_no = first_ch_no;
-		if (SIR_BAND_5_GHZ == lim_get_rf_band(first_ch_no))
+		if (BAND_5G == lim_get_rf_band(first_ch_no))
 			channel_offset =  SIR_11A_FREQUENCY_OFFSET;
-		else if (SIR_BAND_2_4_GHZ == lim_get_rf_band(first_ch_no))
+		else if (BAND_2G == lim_get_rf_band(first_ch_no))
 			channel_offset = SIR_11B_FREQUENCY_OFFSET;
 		else
 			continue;
@@ -2081,7 +2081,7 @@ static void lim_fill_assoc_ind_vht_info(tpAniSirGlobal mac_ctx,
 {
 	uint8_t chan;
 
-	if (session_entry->limRFBand == SIR_BAND_2_4_GHZ) {
+	if (session_entry->limRFBand == BAND_2G) {
 		if (session_entry->vhtCapability && assoc_req->VHTCaps.present)
 			assoc_ind->chan_info.info = MODE_11AC_VHT20_2G;
 		else if (session_entry->htCapability

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

@@ -1085,7 +1085,7 @@ __lim_handle_sme_start_bss_request(tpAniSirGlobal mac_ctx, uint32_t *msg_buf)
 		session->lim11hEnable = 0;
 		if (mlm_start_req->bssType != eSIR_IBSS_MODE &&
 		    (CHAN_HOP_ALL_BANDS_ENABLE ||
-		     SIR_BAND_5_GHZ == session->limRFBand)) {
+		     BAND_5G == session->limRFBand)) {
 			if (wlan_cfg_get_int(mac_ctx,
 				WNI_CFG_11H_ENABLED, &val) != eSIR_SUCCESS)
 				pe_err("Fail to get WNI_CFG_11H_ENABLED");
@@ -1922,7 +1922,7 @@ __lim_process_sme_join_req(tpAniSirGlobal mac_ctx, uint32_t *msg_buf)
 			lim_get_rf_band(session->currentOperChannel);
 
 		/* Initialize 11h Enable Flag */
-		if (SIR_BAND_5_GHZ == session->limRFBand) {
+		if (BAND_5G == session->limRFBand) {
 			if (wlan_cfg_get_int(mac_ctx, WNI_CFG_11H_ENABLED,
 				&val) != eSIR_SUCCESS) {
 				pe_err("Fail to get WNI_CFG_11H_ENABLED");
@@ -5151,7 +5151,7 @@ static void lim_process_sme_channel_change_request(tpAniSirGlobal mac_ctx,
 		lim_get_rf_band(session_entry->currentOperChannel);
 	/* Initialize 11h Enable Flag */
 	if (CHAN_HOP_ALL_BANDS_ENABLE ||
-	    SIR_BAND_5_GHZ == session_entry->limRFBand) {
+	    BAND_5G == session_entry->limRFBand) {
 		if (wlan_cfg_get_int(mac_ctx, WNI_CFG_11H_ENABLED, &val) !=
 				eSIR_SUCCESS)
 			pe_err("Fail to get WNI_CFG_11H_ENABLED");

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

@@ -241,9 +241,9 @@ static void populate_dot11f_tdls_offchannel_params(
 	}
 
 	if (IS_5G_CH(psessionEntry->currentOperChannel))
-		band = eCSR_BAND_5G;
+		band = BAND_5G;
 	else
-		band = eCSR_BAND_24;
+		band = BAND_2G;
 
 	nss_5g = QDF_MIN(pMac->vdev_type_nss_5g.tdls,
 			 pMac->user_configured_nss);
@@ -252,7 +252,7 @@ static void populate_dot11f_tdls_offchannel_params(
 
 	/* validating the channel list for DFS and 2G channels */
 	for (i = 0U; i < numChans; i++) {
-		if ((band == eCSR_BAND_5G) &&
+		if ((band == BAND_5G) &&
 		    (NSS_2x2_MODE == nss_5g) &&
 		    (NSS_1x1_MODE == nss_2g) &&
 		    (wlan_reg_is_dfs_ch(pMac->pdev, validChan[i]))) {
@@ -883,7 +883,7 @@ static tSirRetStatus lim_send_tdls_dis_rsp_frame(tpAniSirGlobal pMac,
 						       &tdlsDisRsp.SuppChannels,
 						       &tdlsDisRsp.
 						       SuppOperatingClasses);
-		if (pMac->roam.configParam.bandCapability != eCSR_BAND_24) {
+		if (pMac->roam.configParam.bandCapability != BAND_2G) {
 			tdlsDisRsp.ht2040_bss_coexistence.present = 1;
 			tdlsDisRsp.ht2040_bss_coexistence.info_request = 1;
 		}
@@ -1248,7 +1248,7 @@ tSirRetStatus lim_send_tdls_link_setup_req_frame(tpAniSirGlobal pMac,
 						     &tdlsSetupReq.SuppChannels,
 						     &tdlsSetupReq.
 						     SuppOperatingClasses);
-		if (pMac->roam.configParam.bandCapability != eCSR_BAND_24) {
+		if (pMac->roam.configParam.bandCapability != BAND_2G) {
 			tdlsSetupReq.ht2040_bss_coexistence.present = 1;
 			tdlsSetupReq.ht2040_bss_coexistence.info_request = 1;
 		}
@@ -1694,7 +1694,7 @@ static tSirRetStatus lim_send_tdls_setup_rsp_frame(tpAniSirGlobal pMac,
 						    &tdlsSetupRsp.SuppChannels,
 						    &tdlsSetupRsp.
 						    SuppOperatingClasses);
-		if (pMac->roam.configParam.bandCapability != eCSR_BAND_24) {
+		if (pMac->roam.configParam.bandCapability != BAND_2G) {
 			tdlsSetupRsp.ht2040_bss_coexistence.present = 1;
 			tdlsSetupRsp.ht2040_bss_coexistence.info_request = 1;
 		}

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

@@ -409,10 +409,10 @@ void lim_send_reassoc_req_with_ft_ies_mgmt_frame(tpAniSirGlobal mac_ctx,
 			   (uint8_t *) frame, (bytes + ft_ies_length));
 
 	if ((NULL != pe_session->ftPEContext.pFTPreAuthReq) &&
-	    (SIR_BAND_5_GHZ == lim_get_rf_band(
+	    (BAND_5G == lim_get_rf_band(
 	     pe_session->ftPEContext.pFTPreAuthReq->preAuthchannelNum)))
 		tx_flag |= HAL_USE_BD_RATE2_FOR_MANAGEMENT_FRAME;
-	else if ((SIR_BAND_5_GHZ ==
+	else if ((BAND_5G ==
 		  lim_get_rf_band(pe_session->currentOperChannel))
 		 || (pe_session->pePersona == QDF_P2P_CLIENT_MODE)
 		 || (pe_session->pePersona == QDF_P2P_GO_MODE))
@@ -760,7 +760,7 @@ void lim_send_reassoc_req_mgmt_frame(tpAniSirGlobal pMac,
 		psessionEntry->assocReqLen = nPayload;
 	}
 
-	if ((SIR_BAND_5_GHZ ==
+	if ((BAND_5G ==
 		lim_get_rf_band(psessionEntry->currentOperChannel))
 			|| (psessionEntry->pePersona == QDF_P2P_CLIENT_MODE) ||
 			(psessionEntry->pePersona == QDF_P2P_GO_MODE))

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

@@ -439,7 +439,7 @@ lim_send_probe_req_mgmt_frame(tpAniSirGlobal mac_ctx,
 	/* If this probe request is sent during P2P Search State, then we need
 	 * to send it at OFDM rate.
 	 */
-	if ((SIR_BAND_5_GHZ == lim_get_rf_band(channel))
+	if ((BAND_5G == lim_get_rf_band(channel))
 	    || ((mac_ctx->lim.gpLimMlmScanReq != NULL) &&
 		mac_ctx->lim.gpLimMlmScanReq->p2pSearch)
 		/*
@@ -855,7 +855,7 @@ lim_send_probe_rsp_mgmt_frame(tpAniSirGlobal mac_ctx,
 		}
 	}
 
-	if ((SIR_BAND_5_GHZ == lim_get_rf_band(pe_session->currentOperChannel))
+	if ((BAND_5G == lim_get_rf_band(pe_session->currentOperChannel))
 	    || (pe_session->pePersona == QDF_P2P_CLIENT_MODE) ||
 	    (pe_session->pePersona == QDF_P2P_GO_MODE)
 	    )
@@ -1066,7 +1066,7 @@ lim_send_addts_req_action_frame(tpAniSirGlobal pMac,
 	pe_debug("Sending an Add TS Request frame to");
 	lim_print_mac_addr(pMac, peerMacAddr, LOGD);
 
-	if ((SIR_BAND_5_GHZ ==
+	if ((BAND_5G ==
 	     lim_get_rf_band(psessionEntry->currentOperChannel))
 	    || (psessionEntry->pePersona == QDF_P2P_CLIENT_MODE)
 	    || (psessionEntry->pePersona == QDF_P2P_GO_MODE)
@@ -1417,7 +1417,7 @@ lim_send_assoc_rsp_mgmt_frame(tpAniSirGlobal mac_ctx,
 		qdf_mem_copy(frame + sizeof(tSirMacMgmtHdr) + payload,
 			     &add_ie[0], addn_ie_len);
 
-	if ((SIR_BAND_5_GHZ ==
+	if ((BAND_5G ==
 		lim_get_rf_band(pe_session->currentOperChannel)) ||
 			(pe_session->pePersona == QDF_P2P_CLIENT_MODE) ||
 			(pe_session->pePersona == QDF_P2P_GO_MODE))
@@ -1563,7 +1563,7 @@ lim_send_delts_req_action_frame(tpAniSirGlobal pMac,
 	pe_debug("Sending DELTS REQ (size %d) to ", nBytes);
 	lim_print_mac_addr(pMac, pMacHdr->da, LOGD);
 
-	if ((SIR_BAND_5_GHZ ==
+	if ((BAND_5G ==
 	     lim_get_rf_band(psessionEntry->currentOperChannel))
 	    || (psessionEntry->pePersona == QDF_P2P_CLIENT_MODE)
 	    || (psessionEntry->pePersona == QDF_P2P_GO_MODE)
@@ -2039,7 +2039,7 @@ lim_send_assoc_req_mgmt_frame(tpAniSirGlobal mac_ctx,
 		pe_session->assocReqLen = payload;
 	}
 
-	if ((SIR_BAND_5_GHZ == lim_get_rf_band(pe_session->currentOperChannel))
+	if ((BAND_5G == lim_get_rf_band(pe_session->currentOperChannel))
 	    || (pe_session->pePersona == QDF_P2P_CLIENT_MODE)
 	    || (pe_session->pePersona == QDF_P2P_GO_MODE)
 	    )
@@ -2416,10 +2416,10 @@ alloc_packet:
 			   frame, frame_len);
 
 	if ((NULL != session->ftPEContext.pFTPreAuthReq) &&
-	    (SIR_BAND_5_GHZ == lim_get_rf_band(
+	    (BAND_5G == lim_get_rf_band(
 	     session->ftPEContext.pFTPreAuthReq->preAuthchannelNum)))
 		tx_flag |= HAL_USE_BD_RATE2_FOR_MANAGEMENT_FRAME;
-	else if ((SIR_BAND_5_GHZ ==
+	else if ((BAND_5G ==
 		  lim_get_rf_band(session->currentOperChannel))
 		  || (session->pePersona == QDF_P2P_CLIENT_MODE)
 		  || (session->pePersona == QDF_P2P_GO_MODE))
@@ -2806,7 +2806,7 @@ lim_send_disassoc_mgmt_frame(tpAniSirGlobal pMac,
 		waitForAck, MAC_ADDR_ARRAY(pMacHdr->da),
 		MAC_ADDR_ARRAY(psessionEntry->selfMacAddr));
 
-	if ((SIR_BAND_5_GHZ == lim_get_rf_band(psessionEntry->currentOperChannel))
+	if ((BAND_5G == lim_get_rf_band(psessionEntry->currentOperChannel))
 	    || (psessionEntry->pePersona == QDF_P2P_CLIENT_MODE) ||
 	    (psessionEntry->pePersona == QDF_P2P_GO_MODE)
 	    ) {
@@ -2978,7 +2978,7 @@ lim_send_deauth_mgmt_frame(tpAniSirGlobal pMac,
 		MAC_ADDR_ARRAY(pMacHdr->da),
 		MAC_ADDR_ARRAY(psessionEntry->selfMacAddr));
 
-	if ((SIR_BAND_5_GHZ == lim_get_rf_band(psessionEntry->currentOperChannel))
+	if ((BAND_5G == lim_get_rf_band(psessionEntry->currentOperChannel))
 	    || (psessionEntry->pePersona == QDF_P2P_CLIENT_MODE) ||
 	    (psessionEntry->pePersona == QDF_P2P_GO_MODE)
 	    ) {
@@ -3503,7 +3503,7 @@ lim_send_channel_switch_mgmt_frame(tpAniSirGlobal pMac,
 			nStatus);
 	}
 
-	if ((SIR_BAND_5_GHZ == lim_get_rf_band(psessionEntry->currentOperChannel))
+	if ((BAND_5G == lim_get_rf_band(psessionEntry->currentOperChannel))
 	    || (psessionEntry->pePersona == QDF_P2P_CLIENT_MODE) ||
 	    (psessionEntry->pePersona == QDF_P2P_GO_MODE)
 	    ) {
@@ -3622,7 +3622,7 @@ lim_send_extended_chan_switch_action_frame(tpAniSirGlobal mac_ctx,
 		 status);
 	}
 
-	if ((SIR_BAND_5_GHZ ==
+	if ((BAND_5G ==
 		lim_get_rf_band(session_entry->currentOperChannel)) ||
 		(session_entry->pePersona == QDF_P2P_CLIENT_MODE) ||
 		(session_entry->pePersona == QDF_P2P_GO_MODE)) {
@@ -3774,7 +3774,7 @@ lim_p2p_oper_chan_change_confirm_action_frame(tpAniSirGlobal mac_ctx,
 		 status);
 	}
 
-	if ((SIR_BAND_5_GHZ ==
+	if ((BAND_5G ==
 		lim_get_rf_band(session_entry->currentOperChannel)) ||
 		(session_entry->pePersona == QDF_P2P_CLIENT_MODE) ||
 		(session_entry->pePersona == QDF_P2P_GO_MODE)) {
@@ -3882,7 +3882,7 @@ lim_send_vht_opmode_notification_frame(tpAniSirGlobal pMac,
 		pe_warn("There were warnings while packing a Operating Mode (0x%08x)",
 			nStatus);
 	}
-	if ((SIR_BAND_5_GHZ == lim_get_rf_band(psessionEntry->currentOperChannel))
+	if ((BAND_5G == lim_get_rf_band(psessionEntry->currentOperChannel))
 	    || (psessionEntry->pePersona == QDF_P2P_CLIENT_MODE) ||
 	    (psessionEntry->pePersona == QDF_P2P_GO_MODE)
 	    ) {
@@ -4015,7 +4015,7 @@ lim_send_neighbor_report_request_frame(tpAniSirGlobal pMac,
 	pe_debug("Sending a Neighbor Report Request to");
 	lim_print_mac_addr(pMac, peer, LOGD);
 
-	if ((SIR_BAND_5_GHZ == lim_get_rf_band(psessionEntry->currentOperChannel))
+	if ((BAND_5G == lim_get_rf_band(psessionEntry->currentOperChannel))
 	    || (psessionEntry->pePersona == QDF_P2P_CLIENT_MODE) ||
 	    (psessionEntry->pePersona == QDF_P2P_GO_MODE)
 	    ) {
@@ -4163,7 +4163,7 @@ lim_send_link_report_action_frame(tpAniSirGlobal pMac,
 	pe_warn("Sending a Link Report to");
 	lim_print_mac_addr(pMac, peer, LOGW);
 
-	if ((SIR_BAND_5_GHZ == lim_get_rf_band(psessionEntry->currentOperChannel))
+	if ((BAND_5G == lim_get_rf_band(psessionEntry->currentOperChannel))
 	    || (psessionEntry->pePersona == QDF_P2P_CLIENT_MODE) ||
 	    (psessionEntry->pePersona == QDF_P2P_GO_MODE)) {
 		txFlag |= HAL_USE_BD_RATE2_FOR_MANAGEMENT_FRAME;
@@ -4349,7 +4349,7 @@ lim_send_radio_measure_report_action_frame(tpAniSirGlobal pMac,
 	pe_warn("Sending a Radio Measure Report to");
 	lim_print_mac_addr(pMac, peer, LOGW);
 
-	if ((SIR_BAND_5_GHZ == lim_get_rf_band(psessionEntry->currentOperChannel))
+	if ((BAND_5G == lim_get_rf_band(psessionEntry->currentOperChannel))
 	    || (psessionEntry->pePersona == QDF_P2P_CLIENT_MODE) ||
 	    (psessionEntry->pePersona == QDF_P2P_GO_MODE)
 	    ) {
@@ -4484,7 +4484,7 @@ tSirRetStatus lim_send_sa_query_request_frame(tpAniSirGlobal pMac, uint8_t *tran
 	pe_debug("Sending an SA Query Request from ");
 	lim_print_mac_addr(pMac, psessionEntry->selfMacAddr, LOGD);
 
-	if ((SIR_BAND_5_GHZ == lim_get_rf_band(psessionEntry->currentOperChannel))
+	if ((BAND_5G == lim_get_rf_band(psessionEntry->currentOperChannel))
 #ifdef WLAN_FEATURE_P2P
 	    || (psessionEntry->pePersona == QDF_P2P_CLIENT_MODE) ||
 	    (psessionEntry->pePersona == QDF_P2P_GO_MODE)
@@ -4615,7 +4615,7 @@ tSirRetStatus lim_send_sa_query_response_frame(tpAniSirGlobal pMac,
 	pe_debug("Sending a SA Query Response to");
 	lim_print_mac_addr(pMac, peer, LOGD);
 
-	if ((SIR_BAND_5_GHZ == lim_get_rf_band(psessionEntry->currentOperChannel))
+	if ((BAND_5G == lim_get_rf_band(psessionEntry->currentOperChannel))
 #ifdef WLAN_FEATURE_P2P
 	    || (psessionEntry->pePersona == QDF_P2P_CLIENT_MODE) ||
 	    (psessionEntry->pePersona == QDF_P2P_GO_MODE)
@@ -4761,7 +4761,7 @@ QDF_STATUS lim_send_addba_response_frame(tpAniSirGlobal mac_ctx,
 	}
 
 
-	if ((SIR_BAND_5_GHZ == lim_get_rf_band(session->currentOperChannel))
+	if ((BAND_5G == lim_get_rf_band(session->currentOperChannel))
 #ifdef WLAN_FEATURE_P2P
 	    || (session->pePersona == QDF_P2P_CLIENT_MODE) ||
 	    (session->pePersona == QDF_P2P_GO_MODE)

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

@@ -1228,7 +1228,7 @@ lim_decide_ap_protection(tpAniSirGlobal pMac, tSirMacAddr peerMacAddr,
 {
 	uint16_t tmpAid;
 	tpDphHashNode pStaDs;
-	tSirRFBand rfBand = SIR_BAND_UNKNOWN;
+	enum band_info rfBand = BAND_UNKNOWN;
 	uint32_t phyMode;
 	tLimProtStaCacheType protStaCacheType =
 		eLIM_PROT_STA_CACHE_TYPE_INVALID;
@@ -1245,7 +1245,7 @@ lim_decide_ap_protection(tpAniSirGlobal pMac, tSirMacAddr peerMacAddr,
 	}
 	lim_get_rf_band_new(pMac, &rfBand, psessionEntry);
 	/* if we are in 5 GHZ band */
-	if (SIR_BAND_5_GHZ == rfBand) {
+	if (BAND_5G == rfBand) {
 		/* We are 11N. we need to protect from 11A and Ht20. we don't need any other protection in 5 GHZ. */
 		/* HT20 case is common between both the bands and handled down as common code. */
 		if (true == psessionEntry->htCapability) {
@@ -1258,7 +1258,7 @@ lim_decide_ap_protection(tpAniSirGlobal pMac, tSirMacAddr peerMacAddr,
 				return;
 			}
 		}
-	} else if (SIR_BAND_2_4_GHZ == rfBand) {
+	} else if (BAND_2G == rfBand) {
 		lim_get_phy_mode(pMac, &phyMode, psessionEntry);
 
 		/* We are 11G. Check if we need protection from 11b Stations. */
@@ -1611,13 +1611,13 @@ lim_decide_sta_protection_on_assoc(tpAniSirGlobal pMac,
 				   tpSchBeaconStruct pBeaconStruct,
 				   tpPESession psessionEntry)
 {
-	tSirRFBand rfBand = SIR_BAND_UNKNOWN;
+	enum band_info rfBand = BAND_UNKNOWN;
 	uint32_t phyMode = WNI_CFG_PHY_MODE_NONE;
 
 	lim_get_rf_band_new(pMac, &rfBand, psessionEntry);
 	lim_get_phy_mode(pMac, &phyMode, psessionEntry);
 
-	if (SIR_BAND_5_GHZ == rfBand) {
+	if (BAND_5G == rfBand) {
 		if ((eSIR_HT_OP_MODE_MIXED == pBeaconStruct->HTInfo.opMode) ||
 		    (eSIR_HT_OP_MODE_OVERLAP_LEGACY ==
 		     pBeaconStruct->HTInfo.opMode)) {
@@ -1629,7 +1629,7 @@ lim_decide_sta_protection_on_assoc(tpAniSirGlobal pMac,
 				psessionEntry->beaconParams.ht20Coexist = true;
 		}
 
-	} else if (SIR_BAND_2_4_GHZ == rfBand) {
+	} else if (BAND_2G == rfBand) {
 		/* spec 7.3.2.13 */
 		/* UseProtection will be set when nonERP STA is associated. */
 		/* NonERPPresent bit will be set when: */
@@ -1846,13 +1846,13 @@ lim_decide_sta_protection(tpAniSirGlobal mac_ctx,
 				tpPESession psession_entry)
 {
 
-	tSirRFBand rfband = SIR_BAND_UNKNOWN;
+	enum band_info rfband = BAND_UNKNOWN;
 	uint32_t phy_mode = WNI_CFG_PHY_MODE_NONE;
 
 	lim_get_rf_band_new(mac_ctx, &rfband, psession_entry);
 	lim_get_phy_mode(mac_ctx, &phy_mode, psession_entry);
 
-	if ((SIR_BAND_5_GHZ == rfband) &&
+	if ((BAND_5G == rfband) &&
 		/* we are HT capable. */
 		(true == psession_entry->htCapability) &&
 		(beacon_struct->HTInfo.present)) {
@@ -1888,7 +1888,7 @@ lim_decide_sta_protection(tpAniSirGlobal mac_ctx,
 						false, beaconparams,
 						psession_entry);
 		}
-	} else if (SIR_BAND_2_4_GHZ == rfband) {
+	} else if (BAND_2G == rfband) {
 		lim_decide_sta_11bg_protection(mac_ctx, beacon_struct,
 					beaconparams, psession_entry, phy_mode);
 	}

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

@@ -279,17 +279,17 @@ void lim_switch_channel_cback(tpAniSirGlobal pMac, QDF_STATUS status,
 struct csr_roam_session *lim_get_session_by_macaddr(tpAniSirGlobal mac_ctx,
 		tSirMacAddr self_mac);
 
-static inline tSirRFBand lim_get_rf_band(uint8_t channel)
+static inline enum band_info lim_get_rf_band(uint8_t channel)
 {
 	if ((channel >= SIR_11A_CHANNEL_BEGIN) &&
 			(channel <= SIR_11A_CHANNEL_END))
-		return SIR_BAND_5_GHZ;
+		return BAND_5G;
 
 	if ((channel >= SIR_11B_CHANNEL_BEGIN) &&
 			(channel <= SIR_11B_CHANNEL_END))
-		return SIR_BAND_2_4_GHZ;
+		return BAND_2G;
 
-	return SIR_BAND_UNKNOWN;
+	return BAND_UNKNOWN;
 }
 
 static inline tSirRetStatus

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

@@ -240,16 +240,16 @@ ap_beacon_process(tpAniSirGlobal mac_ctx, uint8_t *rx_pkt_info,
 		  tpUpdateBeaconParams bcn_prm, tpPESession session)
 {
 	uint32_t phy_mode;
-	tSirRFBand rf_band = SIR_BAND_UNKNOWN;
+	enum band_info rf_band = BAND_UNKNOWN;
 	/* Get RF band from session */
 	rf_band = session->limRFBand;
 
 	lim_get_phy_mode(mac_ctx, &phy_mode, session);
 
-	if (SIR_BAND_5_GHZ == rf_band)
+	if (BAND_5G == rf_band)
 		ap_beacon_process_5_ghz(mac_ctx, rx_pkt_info, bcn_struct,
 					bcn_prm, session, phy_mode);
-	else if (SIR_BAND_2_4_GHZ == rf_band)
+	else if (BAND_2G == rf_band)
 		ap_beacon_process_24_ghz(mac_ctx, rx_pkt_info, bcn_struct,
 					 bcn_prm, session, phy_mode);
 }

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

@@ -355,12 +355,12 @@ populate_dot11f_country(tpAniSirGlobal pMac,
 	uint32_t len, maxlen;
 	uint16_t item;
 	tSirRetStatus nSirStatus;
-	tSirRFBand rfBand;
+	enum band_info rfBand;
 	uint8_t temp[CFG_MAX_STR_LEN], code[3];
 
 	if (psessionEntry->lim11dEnabled) {
 		lim_get_rf_band_new(pMac, &rfBand, psessionEntry);
-		if (rfBand == SIR_BAND_5_GHZ) {
+		if (rfBand == BAND_5G) {
 			item = WNI_CFG_MAX_TX_POWER_5;
 			maxlen = WNI_CFG_MAX_TX_POWER_5_LEN;
 		} else {
@@ -496,10 +496,10 @@ populate_dot11f_erp_info(tpAniSirGlobal pMac,
 {
 	tSirRetStatus nSirStatus;
 	uint32_t val;
-	tSirRFBand rfBand = SIR_BAND_UNKNOWN;
+	enum band_info rfBand = BAND_UNKNOWN;
 
 	lim_get_rf_band_new(pMac, &rfBand, psessionEntry);
-	if (SIR_BAND_2_4_GHZ == rfBand) {
+	if (BAND_2G == rfBand) {
 		pDot11f->present = 1;
 
 		val = psessionEntry->cfgProtection.fromllb;

core/sme/inc/csr_api.h

@@ -805,13 +805,6 @@ typedef enum {
 	eCSR_SECURITY_SET_KEY_ACTION_DELETE_KEY,
 } eCsrSetKeyAction;
 
-typedef enum {
-	eCSR_BAND_ALL,
-	eCSR_BAND_24,
-	eCSR_BAND_5G,
-	eCSR_BAND_MAX,
-} eCsrBand;
-
 typedef enum {
 	/*
 	 * Roaming because HDD requested for reassoc by changing one of the
@@ -1134,12 +1127,12 @@ typedef struct tagCsrConfigParam {
 	uint32_t channelBondingMode24GHz;
 	uint32_t channelBondingMode5GHz;
 	eCsrPhyMode phyMode;
-	eCsrBand eBand;
+	enum band_info eBand;
 	uint32_t RTSThreshold;
 	uint32_t HeartbeatThresh50;
 	uint32_t HeartbeatThresh24;
 	eCsrCBChoice cbChoice;
-	eCsrBand bandCapability;     /* indicate hw capability */
+	enum band_info bandCapability;     /* indicate hw capability */
 	uint16_t TxRate;
 	eCsrRoamWmmUserModeType WMMSupportMode;
 	bool Is11eSupportEnabled;
@@ -1752,8 +1745,8 @@ QDF_STATUS csr_set_channels(tHalHandle hHal, tCsrConfigParam *pParam);
 /* enum to string conversion for debug output */
 const char *get_e_roam_cmd_status_str(eRoamCmdStatus val);
 const char *get_e_csr_roam_result_str(eCsrRoamResult val);
-QDF_STATUS csr_set_phy_mode(tHalHandle hHal, uint32_t phyMode, eCsrBand eBand,
-			    bool *pfRestartNeeded);
+QDF_STATUS csr_set_phy_mode(tHalHandle hHal, uint32_t phyMode,
+			    enum band_info eBand, bool *pfRestartNeeded);
 typedef void (*csr_roamLinkQualityIndCallback)
 	(eCsrRoamLinkQualityInd ind, void *pContext);
 typedef void (*tCsrStatsCallback)(void *stats, void *pContext);
@@ -1774,8 +1767,9 @@ static inline QDF_STATUS csr_roam_issue_ft_preauth_req(tHalHandle hHal,
 	return QDF_STATUS_E_NOSUPPORT;
 }
 #endif
-QDF_STATUS csr_set_band(tHalHandle hHal, uint8_t sessionId, eCsrBand eBand);
-eCsrBand csr_get_current_band(tHalHandle hHal);
+QDF_STATUS csr_set_band(tHalHandle hHal, uint8_t sessionId,
+			enum band_info eBand);
+enum band_info csr_get_current_band(tHalHandle hHal);
 typedef void (*csr_readyToSuspendCallback)(void *pContext, bool suspended);
 #ifdef WLAN_FEATURE_EXTWOW_SUPPORT
 typedef void (*csr_readyToExtWoWCallback)(void *pContext, bool status);

core/sme/inc/csr_internal.h

@@ -280,7 +280,7 @@ struct bss_config_param {
 	uint32_t uRTSThresh;
 	uint32_t uDeferThresh;
 	enum csr_cfgdot11mode uCfgDot11Mode;
-	eCsrBand eBand;
+	enum band_info eBand;
 	uint8_t standardRate[CSR_DOT11_SUPPORTED_RATES_MAX];
 	uint8_t extendedRate[CSR_DOT11_EXTENDED_SUPPORTED_RATES_MAX];
 	eCsrExposedTxRate txRate;
@@ -456,11 +456,11 @@ struct csr_config {
 	uint32_t RTSThreshold;
 	eCsrPhyMode phyMode;
 	enum csr_cfgdot11mode uCfgDot11Mode;
-	eCsrBand eBand;
+	enum band_info eBand;
 	uint32_t HeartbeatThresh50;
 	uint32_t HeartbeatThresh24;
 	eCsrCBChoice cbChoice;
-	eCsrBand bandCapability;        /* indicate hw capability */
+	enum band_info bandCapability;        /* indicate hw capability */
 	eCsrRoamWmmUserModeType WMMSupportMode;
 	bool Is11eSupportEnabled;
 	bool Is11dSupportEnabled;
@@ -1142,27 +1142,27 @@ struct csr_roamstruct {
  * the 2.4 GHz band, meaning. it is NOT operating in the 5.0 GHz band.
  */
 #define CSR_IS_24_BAND_ONLY(pMac) \
-	(eCSR_BAND_24 == (pMac)->roam.configParam.eBand)
+	(BAND_2G == (pMac)->roam.configParam.eBand)
 
 #define CSR_IS_5G_BAND_ONLY(pMac) \
-	(eCSR_BAND_5G == (pMac)->roam.configParam.eBand)
+	(BAND_5G == (pMac)->roam.configParam.eBand)
 
 #define CSR_IS_RADIO_DUAL_BAND(pMac) \
-	(eCSR_BAND_ALL == (pMac)->roam.configParam.bandCapability)
+	(BAND_ALL == (pMac)->roam.configParam.bandCapability)
 
 #define CSR_IS_RADIO_BG_ONLY(pMac) \
-	(eCSR_BAND_24 == (pMac)->roam.configParam.bandCapability)
+	(BAND_2G == (pMac)->roam.configParam.bandCapability)
 
 /*
  * this function returns true if the NIC is operating exclusively in the 5.0 GHz
  * band, meaning. it is NOT operating in the 2.4 GHz band
  */
 #define CSR_IS_RADIO_A_ONLY(pMac) \
-	(eCSR_BAND_5G == (pMac)->roam.configParam.bandCapability)
+	(BAND_5G == (pMac)->roam.configParam.bandCapability)
 /* this function returns true if the NIC is operating in both bands. */
 #define CSR_IS_OPEARTING_DUAL_BAND(pMac) \
-	((eCSR_BAND_ALL == (pMac)->roam.configParam.bandCapability) && \
-		(eCSR_BAND_ALL == (pMac)->roam.configParam.eBand))
+	((BAND_ALL == (pMac)->roam.configParam.bandCapability) && \
+		(BAND_ALL == (pMac)->roam.configParam.eBand))
 /*
  * this function returns true if the NIC can operate in the 5.0 GHz band
  * (could operate in the 2.4 GHz band also)
@@ -1179,7 +1179,7 @@ struct csr_roamstruct {
 	(CSR_IS_OPEARTING_DUAL_BAND((pMac)) || \
 		CSR_IS_RADIO_BG_ONLY((pMac)) || CSR_IS_24_BAND_ONLY((pMac)))
 #define CSR_GET_BAND(ch_num) \
-	((WLAN_REG_IS_24GHZ_CH(ch_num)) ? eCSR_BAND_24 : eCSR_BAND_5G)
+	((WLAN_REG_IS_24GHZ_CH(ch_num)) ? BAND_2G : BAND_5G)
 #define CSR_IS_11D_INFO_FOUND(pMac) \
 	(0 != (pMac)->scan.channelOf11dInfo)
 #define CSR_IS_ROAMING(pSession) \

core/sme/inc/sme_api.h

@@ -569,13 +569,13 @@ QDF_STATUS sme_8023_multicast_list(tHalHandle hHal, uint8_t sessionId,
 #endif /* WLAN_FEATURE_PACKET_FILTERING */
 bool sme_is_channel_valid(tHalHandle hHal, uint8_t channel);
 QDF_STATUS sme_set_freq_band(tHalHandle hHal, uint8_t sessionId,
-		eCsrBand eBand);
-QDF_STATUS sme_get_freq_band(tHalHandle hHal, eCsrBand *pBand);
+		enum band_info eBand);
+QDF_STATUS sme_get_freq_band(tHalHandle hHal, enum band_info *pBand);
 uint16_t sme_chn_to_freq(uint8_t chanNum);
 bool sme_is_channel_valid(tHalHandle hHal, uint8_t channel);
 QDF_STATUS sme_set_max_tx_power(tHalHandle hHal, struct qdf_mac_addr pBssid,
 		struct qdf_mac_addr pSelfMacAddress, int8_t dB);
-QDF_STATUS sme_set_max_tx_power_per_band(eCsrBand band, int8_t db);
+QDF_STATUS sme_set_max_tx_power_per_band(enum band_info band, int8_t db);
 QDF_STATUS sme_set_tx_power(tHalHandle hHal, uint8_t sessionId,
 		struct qdf_mac_addr bssid,
 		enum QDF_OPMODE dev_mode, int power);
@@ -1281,7 +1281,7 @@ void sme_set_vdev_ies_per_band(tHalHandle hal, uint8_t vdev_id);
 void sme_set_pdev_ht_vht_ies(tHalHandle hHal, bool enable2x2);
 
 void sme_update_vdev_type_nss(tHalHandle hal, uint8_t max_supp_nss,
-		uint32_t vdev_type_nss, eCsrBand band);
+		uint32_t vdev_type_nss, enum band_info band);
 void sme_update_hw_dbs_capable(tHalHandle hal, uint8_t hw_dbs_capable);
 void sme_register_p2p_lo_event(tHalHandle hHal, void *context,
 					p2p_lo_callback callback);

core/sme/inc/sme_inside.h

@@ -253,7 +253,7 @@ QDF_STATUS csr_create_roam_scan_channel_list(tpAniSirGlobal pMac,
 		uint8_t sessionId,
 		uint8_t *pChannelList,
 		uint8_t numChannels,
-		const eCsrBand eBand);
+		const enum band_info eBand);
 #endif
 
 QDF_STATUS p2p_process_remain_on_channel_cmd(tpAniSirGlobal pMac,

core/sme/src/common/sme_api.c

@@ -6180,7 +6180,8 @@ bool sme_is_channel_valid(tHalHandle hHal, uint8_t channel)
  * band value to be configured
  * Return QDF_STATUS
  */
-QDF_STATUS sme_set_freq_band(tHalHandle hHal, uint8_t sessionId, eCsrBand eBand)
+QDF_STATUS sme_set_freq_band(tHalHandle hHal, uint8_t sessionId,
+			     enum band_info eBand)
 {
 	QDF_STATUS status = QDF_STATUS_E_FAILURE;
 	tpAniSirGlobal pMac = PMAC_STRUCT(hHal);
@@ -6201,7 +6202,7 @@ QDF_STATUS sme_set_freq_band(tHalHandle hHal, uint8_t sessionId, eCsrBand eBand)
  * pBand  pointer to hold band value
  * Return QDF_STATUS
  */
-QDF_STATUS sme_get_freq_band(tHalHandle hHal, eCsrBand *pBand)
+QDF_STATUS sme_get_freq_band(tHalHandle hHal, enum band_info *pBand)
 {
 	QDF_STATUS status = QDF_STATUS_E_FAILURE;
 	tpAniSirGlobal pMac = PMAC_STRUCT(hHal);
@@ -6223,7 +6224,7 @@ QDF_STATUS sme_get_freq_band(tHalHandle hHal, eCsrBand *pBand)
  * power to set in dB
  * Return QDF_STATUS
  */
-QDF_STATUS sme_set_max_tx_power_per_band(eCsrBand band, int8_t dB)
+QDF_STATUS sme_set_max_tx_power_per_band(enum band_info band, int8_t dB)
 {
 	struct scheduler_msg msg = {0};
 	tpMaxTxPowerPerBandParams pMaxTxPowerPerBandParams = NULL;
@@ -14411,12 +14412,12 @@ void sme_set_pdev_ht_vht_ies(tHalHandle hal, bool enable2x2)
  * Return: None
  */
 void sme_update_vdev_type_nss(tHalHandle hal, uint8_t max_supp_nss,
-		uint32_t vdev_type_nss, eCsrBand band)
+		uint32_t vdev_type_nss, enum band_info band)
 {
 	tpAniSirGlobal mac_ctx = PMAC_STRUCT(hal);
 	struct vdev_type_nss *vdev_nss;
 
-	if (eCSR_BAND_5G == band)
+	if (BAND_5G == band)
 		vdev_nss = &mac_ctx->vdev_type_nss_5g;
 	else
 		vdev_nss = &mac_ctx->vdev_type_nss_2g;

core/sme/src/csr/csr_api_roam.c

@@ -260,9 +260,11 @@ static QDF_STATUS csr_send_mb_stats_req_msg(tpAniSirGlobal pMac,
 /* pStaEntry is no longer invalid upon the return of this function. */
 static void csr_roam_remove_stat_list_entry(tpAniSirGlobal pMac,
 							tListElem *pEntry);
-static enum csr_cfgdot11mode csr_roam_get_phy_mode_band_for_bss(
-tpAniSirGlobal pMac, tCsrRoamProfile *pProfile, uint8_t operationChn,
-							   eCsrBand *pBand);
+static enum csr_cfgdot11mode
+csr_roam_get_phy_mode_band_for_bss(tpAniSirGlobal pMac,
+				   tCsrRoamProfile *pProfile,
+				   uint8_t operationChn,
+				   enum band_info *pBand);
 static QDF_STATUS csr_roam_get_qos_info_from_bss(
 tpAniSirGlobal pMac, tSirBssDescription *pBssDesc);
 struct csr_statsclient_reqinfo *csr_roam_insert_entry_into_list(
@@ -875,10 +877,10 @@ QDF_STATUS csr_update_channel_list(tpAniSirGlobal pMac)
 				if ((is_unsafe_chan) &&
 				    ((WLAN_REG_IS_24GHZ_CH(channel) &&
 				      roam_policy->sap_operating_band ==
-					eCSR_BAND_24) ||
+					BAND_2G) ||
 					(WLAN_REG_IS_5GHZ_CH(channel) &&
 					 roam_policy->sap_operating_band ==
-					eCSR_BAND_5G))) {
+					BAND_5G))) {
 					QDF_TRACE(QDF_MODULE_ID_SME,
 					QDF_TRACE_LEVEL_DEBUG,
 					FL("ignoring unsafe channel %d"),
@@ -1442,7 +1444,7 @@ static void init_config_param(tpAniSirGlobal pMac)
 		WNI_CFG_CHANNEL_BONDING_MODE_ENABLE;
 
 	pMac->roam.configParam.phyMode = eCSR_DOT11_MODE_AUTO;
-	pMac->roam.configParam.eBand = eCSR_BAND_ALL;
+	pMac->roam.configParam.eBand = BAND_ALL;
 	pMac->roam.configParam.uCfgDot11Mode = eCSR_CFG_DOT11_MODE_AUTO;
 	pMac->roam.configParam.FragmentationThreshold =
 		eCSR_DOT11_FRAG_THRESH_DEFAULT;
@@ -1560,7 +1562,7 @@ static void init_config_param(tpAniSirGlobal pMac)
 		channel_congestion_weightage = CHANNEL_CONGESTION_WEIGHTAGE;
 }
 
-eCsrBand csr_get_current_band(tHalHandle hHal)
+enum band_info csr_get_current_band(tHalHandle hHal)
 {
 	tpAniSirGlobal pMac = PMAC_STRUCT(hHal);
 
@@ -1642,7 +1644,7 @@ QDF_STATUS csr_create_roam_scan_channel_list(tpAniSirGlobal pMac,
 					     uint8_t sessionId,
 					     uint8_t *pChannelList,
 					     uint8_t numChannels,
-					     const eCsrBand eBand)
+					     const enum band_info eBand)
 {
 	QDF_STATUS status = QDF_STATUS_SUCCESS;
 
@@ -1674,14 +1676,14 @@ QDF_STATUS csr_create_roam_scan_channel_list(tpAniSirGlobal pMac,
 						&mergedOutputNumOfChannels);
 		inNumChannels = mergedOutputNumOfChannels;
 	}
-	if (eCSR_BAND_24 == eBand) {
+	if (BAND_2G == eBand) {
 		for (i = 0; i < inNumChannels; i++) {
 			if (WLAN_REG_IS_24GHZ_CH(inPtr[i])
 			    && csr_roam_is_channel_valid(pMac, inPtr[i])) {
 				ChannelList[outNumChannels++] = inPtr[i];
 			}
 		}
-	} else if (eCSR_BAND_5G == eBand) {
+	} else if (BAND_5G == eBand) {
 		for (i = 0; i < inNumChannels; i++) {
 			/* Add 5G Non-DFS channel */
 			if (WLAN_REG_IS_5GHZ_CH(inPtr[i]) &&
@@ -1690,7 +1692,7 @@ QDF_STATUS csr_create_roam_scan_channel_list(tpAniSirGlobal pMac,
 				ChannelList[outNumChannels++] = inPtr[i];
 			}
 		}
-	} else if (eCSR_BAND_ALL == eBand) {
+	} else if (BAND_ALL == eBand) {
 		for (i = 0; i < inNumChannels; i++) {
 			if (csr_roam_is_channel_valid(pMac, inPtr[i]) &&
 			    !wlan_reg_is_dfs_ch(pMac->pdev, inPtr[i])) {
@@ -1710,7 +1712,7 @@ QDF_STATUS csr_create_roam_scan_channel_list(tpAniSirGlobal pMac,
 	 * E.g., if band capability is only 2.4G then all the channels in the
 	 * list are already filtered for 2.4G channels, hence ignore this check
 	 */
-	if ((eCSR_BAND_ALL == eBand) && CSR_IS_ROAM_INTRA_BAND_ENABLED(pMac)) {
+	if ((BAND_ALL == eBand) && CSR_IS_ROAM_INTRA_BAND_ENABLED(pMac)) {
 		csr_neighbor_roam_channels_filter_by_current_band(pMac,
 								sessionId,
 								ChannelList,
@@ -2049,12 +2051,13 @@ bool csr_roam_is_roam_offload_scan_enabled(tpAniSirGlobal mac_ctx)
 	return mac_ctx->roam.configParam.isRoamOffloadScanEnabled;
 }
 
-QDF_STATUS csr_set_band(tHalHandle hHal, uint8_t sessionId, eCsrBand eBand)
+QDF_STATUS csr_set_band(tHalHandle hHal, uint8_t sessionId,
+			enum band_info eBand)
 {
 	tpAniSirGlobal pMac = PMAC_STRUCT(hHal);
 	QDF_STATUS status = QDF_STATUS_SUCCESS;
 
-	if (CSR_IS_PHY_MODE_A_ONLY(pMac) && (eBand == eCSR_BAND_24)) {
+	if (CSR_IS_PHY_MODE_A_ONLY(pMac) && (eBand == BAND_2G)) {
 		/* DOT11 mode configured to 11a only and received
 		 * request to change the band to 2.4 GHz
 		 */
@@ -2064,7 +2067,7 @@ QDF_STATUS csr_set_band(tHalHandle hHal, uint8_t sessionId, eCsrBand eBand)
 		return QDF_STATUS_E_INVAL;
 	}
 	if ((CSR_IS_PHY_MODE_B_ONLY(pMac) ||
-	     CSR_IS_PHY_MODE_G_ONLY(pMac)) && (eBand == eCSR_BAND_5G)) {
+	     CSR_IS_PHY_MODE_G_ONLY(pMac)) && (eBand == BAND_5G)) {
 		/* DOT11 mode configured to 11b/11g only and received
 		 * request to change the band to 5 GHz
 		 */
@@ -3235,21 +3238,21 @@ QDF_STATUS csr_get_config_param(tpAniSirGlobal pMac, tCsrConfigParam *pParam)
 	return QDF_STATUS_SUCCESS;
 }
 
-QDF_STATUS csr_set_phy_mode(tHalHandle hHal, uint32_t phyMode, eCsrBand eBand,
-			    bool *pfRestartNeeded)
+QDF_STATUS csr_set_phy_mode(tHalHandle hHal, uint32_t phyMode,
+			    enum band_info eBand, bool *pfRestartNeeded)
 {
 	QDF_STATUS status = QDF_STATUS_E_INVAL;
 	tpAniSirGlobal pMac = PMAC_STRUCT(hHal);
 	bool fRestartNeeded = false;
 	eCsrPhyMode newPhyMode = eCSR_DOT11_MODE_AUTO;
 
-	if (eCSR_BAND_24 == eBand) {
+	if (BAND_2G == eBand) {
 		if (CSR_IS_RADIO_A_ONLY(pMac))
 			goto end;
 		if (eCSR_DOT11_MODE_11a & phyMode)
 			goto end;
 	}
-	if (eCSR_BAND_5G == eBand) {
+	if (BAND_5G == eBand) {
 		if (CSR_IS_RADIO_BG_ONLY(pMac))
 			goto end;
 		if ((eCSR_DOT11_MODE_11b & phyMode)
@@ -3269,17 +3272,17 @@ QDF_STATUS csr_set_phy_mode(tHalHandle hHal, uint32_t phyMode, eCsrBand eBand,
 		} else if (eCSR_DOT11_MODE_11g_ONLY & phyMode) {
 			if (eCSR_DOT11_MODE_11g_ONLY != phyMode)
 				goto end;
-			if (eCSR_BAND_5G == eBand)
+			if (BAND_5G == eBand)
 				goto end;
 			newPhyMode = eCSR_DOT11_MODE_11g_ONLY;
-			eBand = eCSR_BAND_24;
+			eBand = BAND_2G;
 		} else if (eCSR_DOT11_MODE_11b_ONLY & phyMode) {
 			if (eCSR_DOT11_MODE_11b_ONLY != phyMode)
 				goto end;
-			if (eCSR_BAND_5G == eBand)
+			if (BAND_5G == eBand)
 				goto end;
 			newPhyMode = eCSR_DOT11_MODE_11b_ONLY;
-			eBand = eCSR_BAND_24;
+			eBand = BAND_2G;
 		} else if (eCSR_DOT11_MODE_11n & phyMode) {
 			newPhyMode = eCSR_DOT11_MODE_11n;
 		} else if (eCSR_DOT11_MODE_abg & phyMode) {
@@ -3287,20 +3290,20 @@ QDF_STATUS csr_set_phy_mode(tHalHandle hHal, uint32_t phyMode, eCsrBand eBand,
 		} else if (eCSR_DOT11_MODE_11a & phyMode) {
 			if ((eCSR_DOT11_MODE_11g & phyMode)
 				|| (eCSR_DOT11_MODE_11b & phyMode)) {
-				if (eCSR_BAND_ALL == eBand)
+				if (BAND_ALL == eBand)
 					newPhyMode = eCSR_DOT11_MODE_abg;
 				else
 					goto end;
 			} else {
 				newPhyMode = eCSR_DOT11_MODE_11a;
-				eBand = eCSR_BAND_5G;
+				eBand = BAND_5G;
 			}
 		} else if (eCSR_DOT11_MODE_11g & phyMode) {
 			newPhyMode = eCSR_DOT11_MODE_11g;
-			eBand = eCSR_BAND_24;
+			eBand = BAND_2G;
 		} else if (eCSR_DOT11_MODE_11b & phyMode) {
 			newPhyMode = eCSR_DOT11_MODE_11b;
-			eBand = eCSR_BAND_24;
+			eBand = BAND_2G;
 		} else {
 			sme_err("can't recognize phymode 0x%08X", phyMode);
 			newPhyMode = eCSR_DOT11_MODE_AUTO;
@@ -4281,9 +4284,9 @@ QDF_STATUS csr_roam_prepare_bss_config(tpAniSirGlobal pMac,
 		}
 	}
 	if (WLAN_REG_IS_5GHZ_CH(pBssDesc->channelId))
-		pBssConfig->eBand = eCSR_BAND_5G;
+		pBssConfig->eBand = BAND_5G;
 	else
-		pBssConfig->eBand = eCSR_BAND_24;
+		pBssConfig->eBand = BAND_2G;
 		/* phymode */
 	if (csr_is_phy_mode_match(pMac, pProfile->phyMode, pBssDesc,
 				  pProfile, &cfgDot11Mode, pIes)) {
@@ -4291,7 +4294,7 @@ QDF_STATUS csr_roam_prepare_bss_config(tpAniSirGlobal pMac,
 	} else {
 		sme_warn("Can not find match phy mode");
 		/* force it */
-		if (eCSR_BAND_24 == pBssConfig->eBand)
+		if (BAND_2G == pBssConfig->eBand)
 			pBssConfig->uCfgDot11Mode = eCSR_CFG_DOT11_MODE_11G;
 		else
 			pBssConfig->uCfgDot11Mode = eCSR_CFG_DOT11_MODE_11A;
@@ -4488,7 +4491,7 @@ QDF_STATUS csr_roam_prepare_bss_config_from_profile(
 	pBssConfig->f11hSupport = false;
 	pBssConfig->uPowerLimit = 0;
 	/* heartbeat */
-	if (eCSR_BAND_5G == pBssConfig->eBand) {
+	if (BAND_5G == pBssConfig->eBand) {
 		pBssConfig->uHeartBeatThresh =
 			pMac->roam.configParam.HeartbeatThresh50;
 	} else {
@@ -4948,7 +4951,7 @@ static void csr_set_cfg_rate_set_from_profile(tpAniSirGlobal pMac,
 							  SIR_MAC_RATE_96,
 							  SIR_MAC_RATE_108} };
 	enum csr_cfgdot11mode cfgDot11Mode;
-	eCsrBand eBand;
+	enum band_info eBand;
 	/* leave enough room for the max number of rates */
 	uint8_t OperationalRates[CSR_DOT11_SUPPORTED_RATES_MAX];
 	uint32_t OperationalRatesLength = 0;
@@ -4973,7 +4976,7 @@ static void csr_set_cfg_rate_set_from_profile(tpAniSirGlobal pMac,
 	 * into our Operational Rate set (including the basic rates, which we
 	 * have already verified are supported earlier in the roaming decision).
 	 */
-	if (eCSR_BAND_5G == eBand) {
+	if (BAND_5G == eBand) {
 		/* 11a rates into the Operational Rate Set. */
 		OperationalRatesLength =
 			DefaultSupportedRates11a.supportedRateSet.numRates *
@@ -12744,7 +12747,7 @@ void csr_roam_process_wm_status_change_command(
 static void
 csr_compute_mode_and_band(tpAniSirGlobal mac_ctx,
 			  enum csr_cfgdot11mode *dot11_mode,
-			  eCsrBand *band,
+			  enum band_info *band,
 			  uint8_t opr_ch)
 {
 	bool vht_24_ghz = mac_ctx->roam.configParam.enableVhtFor24GHz;
@@ -12752,15 +12755,15 @@ csr_compute_mode_and_band(tpAniSirGlobal mac_ctx,
 	switch (mac_ctx->roam.configParam.uCfgDot11Mode) {
 	case eCSR_CFG_DOT11_MODE_11A:
 		*dot11_mode = eCSR_CFG_DOT11_MODE_11A;
-		*band = eCSR_BAND_5G;
+		*band = BAND_5G;
 		break;
 	case eCSR_CFG_DOT11_MODE_11B:
 		*dot11_mode = eCSR_CFG_DOT11_MODE_11B;
-		*band = eCSR_BAND_24;
+		*band = BAND_2G;
 		break;
 	case eCSR_CFG_DOT11_MODE_11G:
 		*dot11_mode = eCSR_CFG_DOT11_MODE_11G;
-		*band = eCSR_BAND_24;
+		*band = BAND_2G;
 		break;
 	case eCSR_CFG_DOT11_MODE_11N:
 		*dot11_mode = eCSR_CFG_DOT11_MODE_11N;
@@ -12844,7 +12847,7 @@ csr_compute_mode_and_band(tpAniSirGlobal mac_ctx,
 		 */
 		if (eCSR_OPERATING_CHANNEL_AUTO == opr_ch) {
 			*band = mac_ctx->roam.configParam.eBand;
-			if (eCSR_BAND_24 == *band) {
+			if (BAND_2G == *band) {
 				/*
 				 * See reason in else if ( WLAN_REG_IS_24GHZ_CH
 				 * (opr_ch) ) to pick 11B
@@ -12852,7 +12855,7 @@ csr_compute_mode_and_band(tpAniSirGlobal mac_ctx,
 				*dot11_mode = eCSR_CFG_DOT11_MODE_11B;
 			} else {
 				/* prefer 5GHz */
-				*band = eCSR_BAND_5G;
+				*band = BAND_5G;
 				*dot11_mode = eCSR_CFG_DOT11_MODE_11A;
 			}
 		} else if (WLAN_REG_IS_24GHZ_CH(opr_ch)) {
@@ -12874,11 +12877,11 @@ csr_compute_mode_and_band(tpAniSirGlobal mac_ctx,
 			 * to force it.
 			 */
 			*dot11_mode = eCSR_CFG_DOT11_MODE_11B;
-			*band = eCSR_BAND_24;
+			*band = BAND_2G;
 		} else {
 			/* else, it's a 5.0GHz channel.  Set mode to 11a. */
 			*dot11_mode = eCSR_CFG_DOT11_MODE_11A;
-			*band = eCSR_BAND_5G;
+			*band = BAND_5G;
 		}
 		break;
 	} /* switch */
@@ -12903,9 +12906,9 @@ static enum csr_cfgdot11mode
 csr_roam_get_phy_mode_band_for_bss(tpAniSirGlobal mac_ctx,
 				   tCsrRoamProfile *profile,
 				   uint8_t opr_chn,
-				   eCsrBand *p_band)
+				   enum band_info *p_band)
 {
-	eCsrBand band;
+	enum band_info band;
 enum csr_cfgdot11mode curr_mode = mac_ctx->roam.configParam.uCfgDot11Mode;
 	enum csr_cfgdot11mode cfg_dot11_mode =
 		csr_get_cfg_dot11_mode_from_csr_phy_mode(profile,
@@ -12929,9 +12932,9 @@ enum csr_cfgdot11mode curr_mode = mac_ctx->roam.configParam.uCfgDot11Mode;
 		if (eCSR_OPERATING_CHANNEL_AUTO == opr_chn) {
 			/* channel is Auto also. */
 			band = mac_ctx->roam.configParam.eBand;
-			if (eCSR_BAND_ALL == band) {
+			if (BAND_ALL == band) {
 				/* prefer 5GHz */
-				band = eCSR_BAND_5G;
+				band = BAND_5G;
 			}
 		} else{
 			band = CSR_GET_BAND(opr_chn);
@@ -13485,7 +13488,8 @@ csr_populate_basic_rates(tSirMacRateSet *rate_set, bool is_ofdm_rates,
  * Return: tSirNwType
  */
 static tSirNwType
-csr_convert_mode_to_nw_type(enum csr_cfgdot11mode dot11_mode, eCsrBand band)
+csr_convert_mode_to_nw_type(enum csr_cfgdot11mode dot11_mode,
+			    enum band_info band)
 {
 	switch (dot11_mode) {
 	case eCSR_CFG_DOT11_MODE_11G:
@@ -13500,7 +13504,7 @@ csr_convert_mode_to_nw_type(enum csr_cfgdot11mode dot11_mode, eCsrBand band)
 		 * Because LIM only verifies it against 11a, 11b or 11g, set
 		 * only 11g or 11a here
 		 */
-		if (eCSR_BAND_24 == band)
+		if (BAND_2G == band)
 			return eSIR_11G_NW_TYPE;
 		else
 			return eSIR_11A_NW_TYPE;
@@ -13573,7 +13577,7 @@ csr_roam_get_bss_start_parms(tpAniSirGlobal pMac,
 			     struct csr_roamstart_bssparams *pParam,
 			     bool skip_hostapd_rate)
 {
-	eCsrBand band;
+	enum band_info band;
 	uint8_t opr_ch = 0;
 	tSirNwType nw_type;
 	uint8_t tmp_opr_ch = 0;
@@ -13768,7 +13772,7 @@ QDF_STATUS csr_roam_issue_start_bss(tpAniSirGlobal pMac, uint32_t sessionId,
 					uint32_t roamId)
 {
 	QDF_STATUS status = QDF_STATUS_SUCCESS;
-	eCsrBand eBand;
+	enum band_info eBand;
 	/* Set the roaming substate to 'Start BSS attempt'... */
 	csr_roam_substate_change(pMac, eCSR_ROAM_SUBSTATE_START_BSS_REQ,
 				 sessionId);
@@ -17409,15 +17413,15 @@ csr_update_roam_scan_offload_request(tpAniSirGlobal mac_ctx,
  * Return: bool if match else false
  */
 static bool
-csr_check_band_channel_match(eCsrBand band, uint8_t channel)
+csr_check_band_channel_match(enum band_info band, uint8_t channel)
 {
-	if (eCSR_BAND_ALL == band)
+	if (BAND_ALL == band)
 		return true;
 
-	if (eCSR_BAND_24 == band && WLAN_REG_IS_24GHZ_CH(channel))
+	if (BAND_2G == band && WLAN_REG_IS_24GHZ_CH(channel))
 		return true;
 
-	if (eCSR_BAND_5G == band && WLAN_REG_IS_5GHZ_CH(channel))
+	if (BAND_5G == band && WLAN_REG_IS_5GHZ_CH(channel))
 		return true;
 
 	return false;
@@ -17437,7 +17441,7 @@ csr_fetch_ch_lst_from_ini(tpAniSirGlobal mac_ctx,
 			  tpCsrNeighborRoamControlInfo roam_info,
 			  tSirRoamOffloadScanReq *req_buf)
 {
-	eCsrBand band;
+	enum band_info band;
 	uint8_t i = 0;
 	uint8_t num_channels = 0;
 	uint8_t *ch_lst = roam_info->cfgParams.channelInfo.ChannelList;
@@ -17461,8 +17465,8 @@ csr_fetch_ch_lst_from_ini(tpAniSirGlobal mac_ctx,
 	 * that is supported.
 	 */
 	band = mac_ctx->roam.configParam.bandCapability;
-	if ((eCSR_BAND_24 != band) && (eCSR_BAND_5G != band)
-	    && (eCSR_BAND_ALL != band)) {
+	if ((BAND_2G != band) && (BAND_5G != band)
+	    && (BAND_ALL != band)) {
 		QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR,
 			 "Invalid band(%d), roam scan offload req aborted",
 			  band);
@@ -17636,7 +17640,7 @@ csr_fetch_valid_ch_lst(tpAniSirGlobal mac_ctx,
 	uint16_t  cnt = 0;
 	bool      is_unsafe_chan;
 	qdf_device_t qdf_ctx = cds_get_context(QDF_MODULE_ID_QDF_DEVICE);
-	eCsrBand band = eCSR_BAND_ALL;
+	enum band_info band = BAND_ALL;
 
 	if (!qdf_ctx) {
 		cds_err("qdf_ctx is NULL");

core/sme/src/csr/csr_api_scan.c

@@ -3523,13 +3523,13 @@ static void csr_scan_copy_request_valid_channels_only(tpAniSirGlobal mac_ctx,
 						ChannelList[index]) &&
 					mac_ctx->roam.configParam.
 					sta_roam_policy.sap_operating_band ==
-						eCSR_BAND_24) ||
+						BAND_2G) ||
 						(WLAN_REG_IS_5GHZ_CH(
 							src_req->ChannelInfo.
 							ChannelList[index]) &&
 					mac_ctx->roam.configParam.
 					sta_roam_policy.sap_operating_band ==
-						eCSR_BAND_5G))) {
+						BAND_5G))) {
 					QDF_TRACE(QDF_MODULE_ID_SME,
 						QDF_TRACE_LEVEL_DEBUG,
 					      FL("ignoring unsafe channel %d"),

core/sme/src/csr/csr_inside_api.h

@@ -1150,9 +1150,9 @@ static inline bool csr_is_mfpc_capable(struct sDot11fIERSN *rsn)
  *
  * This function is used to translate channel number to band
  *
- * Return: SIR_BAND_2_4_GHZ -  if 2.4GHZ channel
- *         SIR_BAND_5_GHZ   -  if 5GHZ channel
+ * Return: BAND_2G -  if 2.4GHZ channel
+ *         BAND_5G -  if 5GHZ channel
  */
-tSirRFBand csr_get_rf_band(uint8_t channel);
+enum band_info csr_get_rf_band(uint8_t channel);
 
 #endif /* CSR_INSIDE_API_H__ */

core/sme/src/csr/csr_neighbor_roam.c

@@ -490,17 +490,17 @@ csr_neighbor_roam_prepare_scan_profile_filter(tpAniSirGlobal pMac,
 	return QDF_STATUS_SUCCESS;
 }
 
-tSirRFBand csr_get_rf_band(uint8_t channel)
+enum band_info csr_get_rf_band(uint8_t channel)
 {
 	if ((channel >= SIR_11A_CHANNEL_BEGIN) &&
 	    (channel <= SIR_11A_CHANNEL_END))
-		return SIR_BAND_5_GHZ;
+		return BAND_5G;
 
 	if ((channel >= SIR_11B_CHANNEL_BEGIN) &&
 	    (channel <= SIR_11B_CHANNEL_END))
-		return SIR_BAND_2_4_GHZ;
+		return BAND_2G;
 
-	return SIR_BAND_UNKNOWN;
+	return BAND_UNKNOWN;
 }
 
 /**

core/sme/src/csr/csr_util.c

@@ -1938,7 +1938,7 @@ uint32_t csr_translate_to_wni_cfg_dot11_mode(tpAniSirGlobal pMac,
 		break;
 	default:
 		sme_warn("doesn't expect %d as csrDo11Mode", csrDot11Mode);
-		if (eCSR_BAND_24 == pMac->roam.configParam.eBand)
+		if (BAND_2G == pMac->roam.configParam.eBand)
 			ret = WNI_CFG_DOT11_MODE_11G;
 		else
 			ret = WNI_CFG_DOT11_MODE_11A;
@@ -2307,7 +2307,7 @@ enum csr_cfgdot11mode csr_find_best_phy_mode(tpAniSirGlobal pMac,
 			uint32_t phyMode)
 {
 	enum csr_cfgdot11mode cfgDot11ModeToUse;
-	eCsrBand eBand = pMac->roam.configParam.eBand;
+	enum band_info eBand = pMac->roam.configParam.eBand;
 
 	if ((0 == phyMode) ||
 	    (eCSR_DOT11_MODE_AUTO & phyMode) ||
@@ -2334,7 +2334,7 @@ enum csr_cfgdot11mode csr_find_best_phy_mode(tpAniSirGlobal pMac,
 		if ((eCSR_DOT11_MODE_11n | eCSR_DOT11_MODE_11n_ONLY) & phyMode)
 			cfgDot11ModeToUse = eCSR_CFG_DOT11_MODE_11N;
 		else if (eCSR_DOT11_MODE_abg & phyMode) {
-			if (eCSR_BAND_24 != eBand)
+			if (BAND_2G != eBand)
 				cfgDot11ModeToUse = eCSR_CFG_DOT11_MODE_11A;
 			else
 				cfgDot11ModeToUse = eCSR_CFG_DOT11_MODE_11G;

core/sme/src/p2p/p2p_api.c

@@ -226,7 +226,7 @@ QDF_STATUS p2p_remain_on_channel(tHalHandle hHal, uint8_t sessionId,
 	if (pRemainChlCmd == NULL)
 		return QDF_STATUS_E_FAILURE;
 
-	if (SIR_BAND_5_GHZ == csr_get_rf_band(channel))
+	if (BAND_5G == csr_get_rf_band(channel))
 		phyMode = WNI_CFG_PHY_MODE_11A;
 	else
 		phyMode = WNI_CFG_PHY_MODE_11G;

core/wma/inc/wma_if.h

@@ -1158,7 +1158,7 @@ typedef struct sMaxTxPowerParams {
  * @power: power in dbm
  */
 typedef struct sMaxTxPowerPerBandParams {
-	eCsrBand bandInfo;
+	enum band_info bandInfo;
 	int8_t power;
 } tMaxTxPowerPerBandParams, *tpMaxTxPowerPerBandParams;
 

core/wma/src/wma_main.c

@@ -1644,9 +1644,9 @@ static void wma_process_cli_set_cmd(tp_wma_handle wma,
 		case WMI_PDEV_PARAM_TXPOWER_LIMIT2G:
 			wma->pdevconfig.txpow2g = privcmd->param_value;
 			if ((pMac->roam.configParam.bandCapability ==
-			     eCSR_BAND_ALL) ||
+			     BAND_ALL) ||
 			    (pMac->roam.configParam.bandCapability ==
-			     eCSR_BAND_24)) {
+			     BAND_2G)) {
 				if (cfg_set_int(pMac,
 						WNI_CFG_CURRENT_TX_POWER_LEVEL,
 						privcmd->param_value) !=
@@ -1660,9 +1660,9 @@ static void wma_process_cli_set_cmd(tp_wma_handle wma,
 		case WMI_PDEV_PARAM_TXPOWER_LIMIT5G:
 			wma->pdevconfig.txpow5g = privcmd->param_value;
 			if ((pMac->roam.configParam.bandCapability ==
-			     eCSR_BAND_ALL) ||
+			     BAND_ALL) ||
 			    (pMac->roam.configParam.bandCapability ==
-			     eCSR_BAND_5G)) {
+			     BAND_5G)) {
 				if (cfg_set_int(pMac,
 						WNI_CFG_CURRENT_TX_POWER_LEVEL,
 						privcmd->param_value) !=
@@ -4840,17 +4840,17 @@ static void wma_update_hdd_band_cap(WMI_PHY_CAPABILITY supported_band,
 	switch (supported_band) {
 	case WMI_11G_CAPABILITY:
 	case WMI_11NG_CAPABILITY:
-		tgt_cfg->band_cap = eCSR_BAND_24;
+		tgt_cfg->band_cap = BAND_2G;
 		break;
 	case WMI_11A_CAPABILITY:
 	case WMI_11NA_CAPABILITY:
 	case WMI_11AC_CAPABILITY:
-		tgt_cfg->band_cap = eCSR_BAND_5G;
+		tgt_cfg->band_cap = BAND_5G;
 		break;
 	case WMI_11AG_CAPABILITY:
 	case WMI_11NAG_CAPABILITY:
 	default:
-		tgt_cfg->band_cap = eCSR_BAND_ALL;
+		tgt_cfg->band_cap = BAND_ALL;
 	}
 }
 
@@ -8140,7 +8140,7 @@ QDF_STATUS wma_send_pdev_set_pcl_cmd(tp_wma_handle wma_handle,
 		msg->weighed_valid_list[i] =
 			wma_map_pcl_weights(msg->weighed_valid_list[i]);
 		/* Dont allow roaming on 2G when 5G_ONLY configured */
-		if ((wma_handle->bandcapability == eCSR_BAND_5G) &&
+		if ((wma_handle->bandcapability == BAND_5G) &&
 			(msg->saved_chan_list[i] <= MAX_24GHZ_CHANNEL)) {
 			msg->weighed_valid_list[i] =
 				WEIGHT_OF_DISALLOWED_CHANNELS;