qcacld-3.0: Obtain channel params from CDS

All the regulatory and channel management functionality
moved to CDS.

Cleanup the SME redundant functionality related to channel
parameters generation and update all the code references
to CDF API's

Change-Id: Iaf4e15b4ebb7107d8bbf7a54e42f9ea9358dcdaf
CRs-Fixed: 994562

core/cds/inc/cds_regdomain.h

@@ -583,9 +583,6 @@ int32_t cds_fill_some_regulatory_info(struct regulatory *reg);
 int32_t cds_get_country_from_alpha2(uint8_t *alpha2);
 void cds_fill_and_send_ctl_to_fw(struct regulatory *reg);
 void cds_set_wma_dfs_region(uint8_t dfs_region);
-
-void cds_set_ch_params(uint8_t ch, uint32_t phy_mode,
-		       struct ch_params_s *ch_params);
 uint16_t cds_reg_dmn_get_opclass_from_channel(uint8_t *country,
 					      uint8_t channel,
 					      uint8_t offset);

core/cds/src/cds_concurrency.c

@@ -6378,11 +6378,10 @@ QDF_STATUS cds_check_and_restart_sap(eCsrRoamResult roam_result,
 	}
 	hdd_ap_ctx->sapConfig.ch_params.ch_width =
 		hdd_ap_ctx->sapConfig.ch_width_orig;
-	sme_set_ch_params(WLAN_HDD_GET_HAL_CTX(sap_adapter),
-			hdd_ap_ctx->sapConfig.SapHw_mode,
-			hdd_ap_ctx->operatingChannel,
-			hdd_ap_ctx->sapConfig.sec_ch,
-			&hdd_ap_ctx->sapConfig.ch_params);
+
+	cds_set_channel_params(hdd_ap_ctx->operatingChannel,
+		hdd_ap_ctx->sapConfig.sec_ch,
+		&hdd_ap_ctx->sapConfig.ch_params);
 	/*
 	 * Create a workqueue and let the workqueue handle the restart
 	 * of sap task. if we directly call sap restart function without
@@ -6947,9 +6946,7 @@ static void cds_check_sta_ap_concurrent_ch_intf(void *data)
 	hdd_ap_ctx->sapConfig.channel = intf_ch;
 	hdd_ap_ctx->sapConfig.ch_params.ch_width =
 		hdd_ap_ctx->sapConfig.ch_width_orig;
-	sme_set_ch_params(hal_handle,
-			hdd_ap_ctx->sapConfig.SapHw_mode,
-			hdd_ap_ctx->sapConfig.channel,
+	cds_set_channel_params(hdd_ap_ctx->sapConfig.channel,
 			hdd_ap_ctx->sapConfig.sec_ch,
 			&hdd_ap_ctx->sapConfig.ch_params);
 

core/cds/src/cds_reg_service.c

@@ -713,26 +713,3 @@ uint16_t cds_bw_value(enum phy_ch_width bw)
 	}
 }
 
-/**
- * cds_set_ch_params() - set channel parameters
- * @ch: channel
- * @phy_mode: physical mode
- * @ch_param: channel parameters will be returned
- *
- * Return: None
- */
-void cds_set_ch_params(uint8_t ch, uint32_t phy_mode,
-		       struct ch_params_s *ch_params)
-{
-	tHalHandle *hal_ctx = cds_get_context(QDF_MODULE_ID_PE);
-	if (!hal_ctx) {
-		QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR,
-			("Invalid hal_ctx pointer"));
-		return;
-	}
-	/*
-	 * TODO: remove SME call and move the SME set channel
-	 * param functionality to CDS.
-	 */
-	sme_set_ch_params(hal_ctx, phy_mode, ch, 0, ch_params);
-}

core/hdd/src/wlan_hdd_cfg80211.c

@@ -5438,9 +5438,7 @@ __wlan_hdd_cfg80211_sap_configuration_set(struct wiphy *wiphy,
 		ap_ctx->sapConfig.ch_params.ch_width =
 					ap_ctx->sapConfig.ch_width_orig;
 
-		sme_set_ch_params(hdd_ctx->hHal,
-				ap_ctx->sapConfig.SapHw_mode,
-				ap_ctx->sapConfig.channel,
+		cds_set_channel_params(ap_ctx->sapConfig.channel,
 				ap_ctx->sapConfig.sec_ch,
 				&ap_ctx->sapConfig.ch_params);
 
@@ -8533,8 +8531,8 @@ void hdd_select_cbmode(hdd_adapter_t *pAdapter, uint8_t operationChannel)
 	eHddDot11Mode hddDot11Mode = iniDot11Mode;
 	struct ch_params_s ch_params;
 	hdd_station_ctx_t *station_ctx = WLAN_HDD_GET_STATION_CTX_PTR(pAdapter);
-	uint32_t cb_mode;
 	struct hdd_mon_set_ch_info *ch_info = &station_ctx->ch_info;
+	uint8_t sec_ch = 0;
 
 	ch_params.ch_width =
 			(WLAN_HDD_GET_CTX(pAdapter))->config->vhtChannelWidth;
@@ -8557,17 +8555,26 @@ void hdd_select_cbmode(hdd_adapter_t *pAdapter, uint8_t operationChannel)
 		hddDot11Mode = iniDot11Mode;
 		break;
 	}
+	/*
+	 * CDS api expects secondary channel for calculating
+	 * the channel params
+	 */
+	if ((ch_params.ch_width == CH_WIDTH_40MHZ) &&
+	    (CDS_IS_CHANNEL_24GHZ(operationChannel))) {
+		if (operationChannel >= 1 && operationChannel <= 5)
+			sec_ch = operationChannel + 4;
+		else if (operationChannel >= 6 && operationChannel <= 13)
+			sec_ch = operationChannel - 4;
+	}
+
 	/* This call decides required channel bonding mode */
-	cb_mode = sme_set_ch_params((WLAN_HDD_GET_CTX(pAdapter)->hHal),
-				hdd_cfg_xlate_to_csr_phy_mode(hddDot11Mode),
-				operationChannel, 0,
-				&ch_params);
+	cds_set_channel_params(operationChannel, sec_ch, &ch_params);
 
 	if (QDF_GLOBAL_MONITOR_MODE == cds_get_conparam()) {
 		ch_info->channel_width = ch_params.ch_width;
 		ch_info->phy_mode = hdd_cfg_xlate_to_csr_phy_mode(hddDot11Mode);
 		ch_info->channel = operationChannel;
-		ch_info->cb_mode = cb_mode;
+		ch_info->cb_mode = ch_params.ch_width;
 		hdd_info("ch_info width %d, phymode %d channel %d",
 			 ch_info->channel_width, ch_info->phy_mode,
 			 ch_info->channel);
@@ -12161,6 +12168,7 @@ static int __wlan_hdd_cfg80211_set_mon_ch(struct wiphy *wiphy,
 	struct qdf_mac_addr bssid;
 	tCsrRoamProfile roam_profile;
 	struct ch_params_s ch_params;
+	uint8_t sec_ch = 0;
 	int ret;
 	uint16_t chan_num = cds_freq_to_chan(chandef->chan->center_freq);
 
@@ -12191,8 +12199,18 @@ static int __wlan_hdd_cfg80211_set_mon_ch(struct wiphy *wiphy,
 		     QDF_MAC_ADDR_SIZE);
 
 	ch_params.ch_width = chandef->width;
-	sme_set_ch_params(hal_hdl, ch_info->phy_mode, chan_num, 0,
-			  &ch_params);
+	/*
+	 * CDS api expects secondary channel for calculating
+	 * the channel params
+	 */
+	if ((ch_params.ch_width == CH_WIDTH_40MHZ) &&
+	    (CDS_IS_CHANNEL_24GHZ(chan_num))) {
+		if (chan_num >= 1 && chan_num <= 5)
+			sec_ch = chan_num + 4;
+		else if (chan_num >= 6 && chan_num <= 13)
+			sec_ch = chan_num - 4;
+	}
+	cds_set_channel_params(chan_num, sec_ch, &ch_params);
 	status = sme_roam_channel_change_req(hal_hdl, bssid, &ch_params,
 						 &roam_profile);
 	if (status) {

core/hdd/src/wlan_hdd_hostapd.c

@@ -7309,7 +7309,6 @@ int wlan_hdd_setup_driver_overrides(hdd_adapter_t *ap_adapter)
 {
 	tsap_Config_t *sap_cfg = &ap_adapter->sessionCtx.ap.sapConfig;
 	hdd_context_t *hdd_ctx = WLAN_HDD_GET_CTX(ap_adapter);
-	tHalHandle h_hal = WLAN_HDD_GET_HAL_CTX(ap_adapter);
 
 	if (ap_adapter->device_mode == QDF_SAP_MODE &&
 				hdd_ctx->config->force_sap_acs)
@@ -7343,7 +7342,7 @@ int wlan_hdd_setup_driver_overrides(hdd_adapter_t *ap_adapter)
 				eHT_CHANNEL_WIDTH_20MHZ;
 	}
 	sap_cfg->ch_params.ch_width = sap_cfg->ch_width_orig;
-	sme_set_ch_params(h_hal, sap_cfg->SapHw_mode, sap_cfg->channel,
+	cds_set_channel_params(sap_cfg->channel,
 				sap_cfg->sec_ch, &sap_cfg->ch_params);
 
 	return 0;

core/hdd/src/wlan_hdd_main.c

@@ -5181,9 +5181,7 @@ void hdd_restart_sap(hdd_adapter_t *adapter, uint8_t channel)
 	hdd_info("chan:%d width:%d",
 		channel, hdd_ap_ctx->sapConfig.ch_width_orig);
 
-	sme_set_ch_params(hal_handle,
-			hdd_ap_ctx->sapConfig.SapHw_mode,
-			hdd_ap_ctx->sapConfig.channel,
+	cds_set_channel_params(hdd_ap_ctx->sapConfig.channel,
 			hdd_ap_ctx->sapConfig.sec_ch,
 			&hdd_ap_ctx->sapConfig.ch_params);
 

core/hdd/src/wlan_hdd_wext.c

@@ -9758,7 +9758,7 @@ static int wlan_hdd_set_mon_chan(hdd_adapter_t *adapter, uint32_t chan,
 		     QDF_MAC_ADDR_SIZE);
 
 	ch_params.ch_width = bandwidth;
-	sme_set_ch_params(hal_hdl, ch_info->phy_mode, chan, 0, &ch_params);
+	cds_set_channel_params(chan, 0, &ch_params);
 	status = sme_roam_channel_change_req(hal_hdl, bssid, &ch_params,
 					     &roam_profile);
 	if (status) {

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

@@ -2114,9 +2114,8 @@ void lim_handle_csa_offload_msg(tpAniSirGlobal mac_ctx, tpSirMsgQ msg)
 
 				ch_params.ch_width =
 					chnl_switch_info->newChanWidth;
-				cds_set_ch_params(csa_params->channel,
-						eCSR_DOT11_MODE_11ac,
-						&ch_params);
+				cds_set_channel_params(csa_params->channel,
+						0, &ch_params);
 				chnl_switch_info->newCenterChanFreq0 =
 					ch_params.center_freq_seg0;
 				/*
@@ -2156,9 +2155,9 @@ void lim_handle_csa_offload_msg(tpAniSirGlobal mac_ctx, tpSirMsgQ msg)
 								CH_WIDTH_40MHZ;
 					ch_params.ch_width =
 						chnl_switch_info->newChanWidth;
-					cds_set_ch_params(csa_params->channel,
-							eCSR_DOT11_MODE_11n,
-							&ch_params);
+					cds_set_channel_params(
+							csa_params->channel,
+							0, &ch_params);
 					lim_ch_switch->ch_center_freq_seg0 =
 						ch_params.center_freq_seg0;
 					lim_ch_switch->sec_ch_offset =
@@ -2179,9 +2178,8 @@ void lim_handle_csa_offload_msg(tpAniSirGlobal mac_ctx, tpSirMsgQ msg)
 				lim_ch_switch->state =
 				     eLIM_CHANNEL_SWITCH_PRIMARY_AND_SECONDARY;
 				ch_params.ch_width = CH_WIDTH_40MHZ;
-				cds_set_ch_params(csa_params->channel,
-						eCSR_DOT11_MODE_11n,
-						&ch_params);
+				cds_set_channel_params(csa_params->channel,
+						0, &ch_params);
 				lim_ch_switch->ch_center_freq_seg0 =
 					ch_params.center_freq_seg0;
 				lim_ch_switch->sec_ch_offset =

core/sap/src/sap_api_link_cntl.c

@@ -189,11 +189,9 @@ QDF_STATUS wlansap_scan_callback(tHalHandle hal_handle,
 	}
 
 	sap_ctx->ch_params.ch_width = sap_ctx->acs_cfg->ch_width;
-	sme_set_ch_params(hal_handle,
-			sap_ctx->csr_roamProfile.phyMode,
-			sap_ctx->channel,
-			sap_ctx->secondary_ch,
-			&sap_ctx->ch_params);
+	cds_set_channel_params(sap_ctx->channel,
+		sap_ctx->secondary_ch,
+		&sap_ctx->ch_params);
 #ifdef SOFTAP_CHANNEL_RANGE
 	if (sap_ctx->channelList != NULL) {
 		/* Always free up the memory for channel selection whatever
@@ -241,9 +239,7 @@ void sap_config_acs_result(tHalHandle hal, ptSapContext sap_ctx,
 	struct ch_params_s ch_params = {0};
 
 	ch_params.ch_width = sap_ctx->acs_cfg->ch_width;
-	sme_set_ch_params(hal, sap_ctx->csr_roamProfile.phyMode, channel,
-				sec_ch, &ch_params);
-
+	cds_set_channel_params(channel, sec_ch, &ch_params);
 	sap_ctx->acs_cfg->ch_width = ch_params.ch_width;
 	if (sap_ctx->acs_cfg->ch_width > CH_WIDTH_40MHZ)
 		sap_ctx->acs_cfg->vht_seg0_center_ch =
@@ -525,7 +521,6 @@ wlansap_roam_process_dfs_chansw_update(tHalHandle hHal,
 	uint8_t intf;
 	QDF_STATUS qdf_status;
 	tpAniSirGlobal mac_ctx = PMAC_STRUCT(hHal);
-	eCsrPhyMode phy_mode = sap_ctx->csr_roamProfile.phyMode;
 	uint8_t dfs_beacon_start_req = 0;
 
 	if (sap_ctx->csr_roamProfile.disableDFSChSwitch) {
@@ -572,9 +567,9 @@ wlansap_roam_process_dfs_chansw_update(tHalHandle hHal,
 	 * currently. For e.g. 20/40/80 MHz operation
 	 */
 	if (mac_ctx->sap.SapDfsInfo.target_channel)
-		sme_set_ch_params(hHal, phy_mode,
-				  mac_ctx->sap.SapDfsInfo.target_channel, 0,
-				  &sap_ctx->ch_params);
+		cds_set_channel_params(mac_ctx->sap.SapDfsInfo.target_channel,
+			0, &sap_ctx->ch_params);
+
 	/*
 	 * Fetch the number of SAP interfaces. If the number of sap Interface
 	 * more than one then we will make is_sap_ready_for_chnl_chng to true

core/sap/src/sap_fsm.c

@@ -3392,9 +3392,8 @@ static QDF_STATUS sap_fsm_state_ch_select(ptSapContext sap_ctx,
 				  sap_ctx->channel, ch);
 
 			sap_ctx->channel = ch;
-			sme_set_ch_params(hal, sap_ctx->csr_roamProfile.phyMode,
-				sap_ctx->channel, sap_ctx->secondary_ch,
-				&sap_ctx->ch_params);
+			cds_set_channel_params(sap_ctx->channel,
+				sap_ctx->secondary_ch, &sap_ctx->ch_params);
 		}
 		if (sap_ctx->channel > 14 &&
 		    (sap_ctx->csr_roamProfile.phyMode == eCSR_DOT11_MODE_11g ||
@@ -3499,13 +3498,12 @@ static QDF_STATUS sap_fsm_state_dfs_cac_wait(ptSapContext sap_ctx,
 		 * Radar found while performing channel availability
 		 * check, need to switch the channel again
 		 */
-		eCsrPhyMode phymode = sap_ctx->csr_roamProfile.phyMode;
 		QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO,
 			  "ENTERTRED CAC WAIT STATE-->eSAP_DISCONNECTING\n");
 		if (mac_ctx->sap.SapDfsInfo.target_channel) {
-			sme_set_ch_params(hal, phymode,
-				   mac_ctx->sap.SapDfsInfo.target_channel, 0,
-				   &sap_ctx->ch_params);
+			cds_set_channel_params(
+				mac_ctx->sap.SapDfsInfo.target_channel, 0,
+				&sap_ctx->ch_params);
 		}
 
 		for (intf = 0; intf < SAP_MAX_NUM_SESSION; intf++) {

core/sap/src/sap_module.c

@@ -1565,13 +1565,8 @@ wlansap_set_channel_change_with_csa(void *p_cds_gctx, uint32_t targetChannel,
 							new_ch_params.ch_width,
 							target_bw);
 			}
-
-			sme_set_ch_params(hHal,
-					sapContext->csr_roamProfile.phyMode,
-					targetChannel,
-					0,
-					&pMac->sap.SapDfsInfo.new_ch_params);
-
+			cds_set_channel_params(targetChannel,
+				0, &pMac->sap.SapDfsInfo.new_ch_params);
 			/*
 			 * Set the CSA IE required flag.
 			 */
@@ -2303,7 +2298,7 @@ wlansap_channel_change_request(void *pSapCtx, uint8_t target_channel)
 	 * which will result in channel width changing dynamically.
 	 */
 	ch_params = &mac_ctx->sap.SapDfsInfo.new_ch_params;
-	sme_set_ch_params(hHal, phy_mode, target_channel, 0, ch_params);
+	cds_set_channel_params(target_channel, 0, ch_params);
 	sapContext->ch_params.ch_width = ch_params->ch_width;
 	/* Update the channel as this will be used to
 	 * send event to supplicant
@@ -2445,10 +2440,8 @@ QDF_STATUS wlansap_dfs_send_csa_ie_request(void *pSapCtx)
 
 	pMac->sap.SapDfsInfo.new_ch_params.ch_width =
 				pMac->sap.SapDfsInfo.new_chanWidth;
-
-	sme_set_ch_params(hHal, sapContext->csr_roamProfile.phyMode,
-				pMac->sap.SapDfsInfo.target_channel, 0,
-				&pMac->sap.SapDfsInfo.new_ch_params);
+	cds_set_channel_params(pMac->sap.SapDfsInfo.target_channel,
+				0, &pMac->sap.SapDfsInfo.new_ch_params);
 
 	QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO,
 			"%s: chan:%d req:%d width:%d off:%d",

core/sme/inc/sme_api.h

@@ -690,13 +690,6 @@ QDF_STATUS sme_send_tdls_chan_switch_req(
 void sme_update_enable_ssr(tHalHandle hHal, bool enableSSR);
 QDF_STATUS sme_set_phy_mode(tHalHandle hHal, eCsrPhyMode phyMode);
 eCsrPhyMode sme_get_phy_mode(tHalHandle hHal);
-/*
- * SME API to determine the channel bonding mode
- */
-QDF_STATUS sme_set_ch_params(tHalHandle hHal, eCsrPhyMode eCsrPhyMode,
-			     uint8_t channel, uint8_t ht_sec_ch,
-			     struct ch_params_s *ch_params);
-
 QDF_STATUS sme_handoff_request(tHalHandle hHal, uint8_t sessionId,
 			       tCsrHandoffRequest *pHandoffInfo);
 QDF_STATUS sme_is_sta_p2p_client_connected(tHalHandle hHal);

core/sme/src/common/sme_api.c

@@ -10323,214 +10323,6 @@ QDF_STATUS sme_check_ch_in_band(tpAniSirGlobal mac_ctx, uint8_t start_ch,
 	return QDF_STATUS_SUCCESS;
 }
 
-void sme_set_160bw_params(tpAniSirGlobal mac_ctx, uint8_t channel,
-		struct ch_params_s *ch_params)
-{
-	uint8_t start_ch = 0;
-	QDF_STATUS status = QDF_STATUS_SUCCESS;
-
-	if (channel >= 36 && channel <= 64) {
-		ch_params->center_freq_seg0 = 50;
-		start_ch = 36;
-	} else if (channel >= 100 && channel <= 128) {
-		ch_params->center_freq_seg0 = 114;
-		start_ch = 100;
-	} else {
-		ch_params->ch_width = CH_WIDTH_80MHZ;
-	}
-
-	if (ch_params->ch_width == CH_WIDTH_160MHZ)
-		status = sme_check_ch_in_band(mac_ctx, start_ch, 8);
-
-	if (QDF_STATUS_SUCCESS != status)
-		ch_params->ch_width = CH_WIDTH_80MHZ;
-}
-
-void sme_set_80bw_params(tpAniSirGlobal mac_ctx, uint8_t channel,
-		struct ch_params_s *ch_params)
-{
-	uint8_t start_ch = 0;
-	QDF_STATUS status = QDF_STATUS_SUCCESS;
-
-	if (channel >= 36 && channel <= 48) {
-		ch_params->center_freq_seg0 = 42;
-		start_ch = 36;
-	} else if (channel >= 52 && channel <= 64) {
-		ch_params->center_freq_seg0 = 58;
-		start_ch = 52;
-	} else if (channel >= 100 && channel <= 112) {
-		ch_params->center_freq_seg0 = 106;
-		start_ch = 100;
-	} else if (channel >= 116 && channel <= 128) {
-		ch_params->center_freq_seg0 = 122;
-		start_ch = 116;
-	} else if (channel >= 132 && channel <= 144) {
-		ch_params->center_freq_seg0 = 138;
-		start_ch = 132;
-	} else if (channel >= 149 && channel <= 161) {
-		ch_params->center_freq_seg0 = 155;
-		start_ch = 149;
-	} else {
-		ch_params->ch_width = CH_WIDTH_40MHZ;
-	}
-
-	if (ch_params->ch_width == CH_WIDTH_80MHZ)
-		status = sme_check_ch_in_band(mac_ctx, start_ch, 4);
-
-	if (QDF_STATUS_SUCCESS != status)
-		ch_params->ch_width = CH_WIDTH_40MHZ;
-}
-
-void sme_set_40bw_params(tpAniSirGlobal mac_ctx, uint8_t channel,
-			 struct ch_params_s *ch_params, uint8_t is_11ac_mode)
-{
-	uint8_t tmp;
-	uint8_t center_freq = 0;
-	uint8_t start_ch = 0;
-	QDF_STATUS status = QDF_STATUS_SUCCESS;
-
-	if (channel == 165) {
-		ch_params->ch_width = CH_WIDTH_20MHZ;
-		ch_params->center_freq_seg0 = 0;
-		ch_params->sec_ch_offset = PHY_SINGLE_CHANNEL_CENTERED;
-		return;
-	}
-	tmp = channel % 2;
-	if ((channel - tmp) % 8) {
-		ch_params->sec_ch_offset = PHY_DOUBLE_CHANNEL_LOW_PRIMARY;
-		center_freq = channel + 2;
-	} else {
-		ch_params->sec_ch_offset = PHY_DOUBLE_CHANNEL_HIGH_PRIMARY;
-		center_freq = channel - 2;
-	}
-	if ((!is_11ac_mode) || (is_11ac_mode &&
-				(ch_params->ch_width == CH_WIDTH_40MHZ))) {
-		ch_params->ch_width = CH_WIDTH_40MHZ;
-		ch_params->center_freq_seg0 = center_freq;
-
-		if (channel <= 40)
-			start_ch = 36;
-		else if (channel <= 48)
-			start_ch = 44;
-		else if (channel <= 56)
-			start_ch = 52;
-		else if (channel <= 64)
-			start_ch = 60;
-		else if (channel <= 104)
-			start_ch = 100;
-		else if (channel <= 112)
-			start_ch = 108;
-		else if (channel <= 120)
-			start_ch = 116;
-		else if (channel <= 128)
-			start_ch = 124;
-		else if (channel <= 136)
-			start_ch = 132;
-		else if (channel <= 144)
-			start_ch = 140;
-		else if (channel <= 153)
-			start_ch = 149;
-		else if (channel <= 161)
-			start_ch = 157;
-
-		status = sme_check_ch_in_band(mac_ctx, start_ch, 2);
-
-		if (QDF_STATUS_SUCCESS != status) {
-			ch_params->ch_width = CH_WIDTH_20MHZ;
-			ch_params->center_freq_seg0 = 0;
-			ch_params->sec_ch_offset = PHY_SINGLE_CHANNEL_CENTERED;
-		}
-	}
-}
-
-/*
- * SME API to determine the channel bonding mode
- */
-QDF_STATUS sme_set_ch_params(tHalHandle hHal, eCsrPhyMode eCsrPhyMode,
-			     uint8_t channel, uint8_t ht_sec_ch,
-			     struct ch_params_s *ch_params)
-{
-	tpAniSirGlobal mac_ctx = PMAC_STRUCT(hHal);
-	int is_11ac_mode = CSR_IS_PHY_MODE_11ac(eCsrPhyMode);
-
-	if (!CSR_IS_PHY_MODE_11n(eCsrPhyMode) ||
-		ch_params->ch_width == CH_WIDTH_20MHZ ||
-		QDF_STATUS_SUCCESS != csr_is_valid_channel(mac_ctx, channel)) {
-		QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR,
-			"%s: Invalid Channel/phymode config: CB Mode disabled",
-								__func__);
-		ch_params->ch_width = CH_WIDTH_20MHZ;
-		ch_params->sec_ch_offset = PHY_SINGLE_CHANNEL_CENTERED;
-		if (channel <= 14)
-			mac_ctx->roam.configParam.channelBondingMode24GHz =
-					PHY_SINGLE_CHANNEL_CENTERED;
-		else
-			mac_ctx->roam.configParam.channelBondingMode5GHz =
-					PHY_SINGLE_CHANNEL_CENTERED;
-		return QDF_STATUS_SUCCESS;
-	}
-
-	sms_log(mac_ctx, LOGW, "%s: channel - %d, vht channel width - %d",
-				__func__, channel, ch_params->ch_width);
-
-	if (CDS_IS_CHANNEL_5GHZ(channel)) {
-		if (ch_params->ch_width == CH_WIDTH_160MHZ)
-			sme_set_160bw_params(mac_ctx, channel, ch_params);
-		if ((ch_params->ch_width == CH_WIDTH_80MHZ) ||
-		   (ch_params->ch_width == CH_WIDTH_80P80MHZ))
-			sme_set_80bw_params(mac_ctx, channel, ch_params);
-
-		sme_set_40bw_params(mac_ctx, channel,
-					ch_params, is_11ac_mode);
-
-		mac_ctx->roam.configParam.channelBondingMode5GHz =
-			ch_params->sec_ch_offset;
-	} else if (CDS_IS_CHANNEL_24GHZ(channel)) {
-		if (channel >= 1 && channel < 5) {
-			ch_params->ch_width = CH_WIDTH_40MHZ;
-			ch_params->sec_ch_offset =
-				PHY_DOUBLE_CHANNEL_LOW_PRIMARY;
-			ch_params->center_freq_seg0 = channel + 2;
-		} else if (channel >= 5 && channel <= 9) {
-			ch_params->ch_width = CH_WIDTH_40MHZ;
-			if (0 != ht_sec_ch) {
-				if (ht_sec_ch > channel) {
-					ch_params->sec_ch_offset =
-						PHY_DOUBLE_CHANNEL_LOW_PRIMARY;
-					ch_params->center_freq_seg0 =
-						channel + 2;
-				} else {
-					ch_params->sec_ch_offset =
-						PHY_DOUBLE_CHANNEL_HIGH_PRIMARY;
-					ch_params->center_freq_seg0 =
-						channel - 2;
-				}
-			} else {
-				/* in case ht_sec_ch is not set by ACS or
-				 * calling function, set the secondary channel
-				 * offset value to lower channel
-				 */
-				ch_params->sec_ch_offset =
-					PHY_DOUBLE_CHANNEL_HIGH_PRIMARY;
-				ch_params->center_freq_seg0 = channel - 2;
-			}
-		} else if (channel > 9 && channel <= 13) {
-			ch_params->ch_width = CH_WIDTH_40MHZ;
-			ch_params->sec_ch_offset =
-				PHY_DOUBLE_CHANNEL_HIGH_PRIMARY;
-			ch_params->center_freq_seg0 = channel - 2;
-		} else if (channel == 14) {
-			ch_params->ch_width = CH_WIDTH_20MHZ;
-			ch_params->sec_ch_offset =
-				PHY_SINGLE_CHANNEL_CENTERED;
-			ch_params->center_freq_seg0 = 0;
-		}
-		mac_ctx->roam.configParam.channelBondingMode24GHz =
-			ch_params->sec_ch_offset;
-	}
-	return QDF_STATUS_SUCCESS;
-}
-
 /*convert the ini value to the ENUM used in csr and MAC for CB state*/
 ePhyChanBondState sme_get_cb_phy_state_from_cb_ini_value(uint32_t cb_ini_value)
 {