qcacld-3.0: Convert legacy channel usage

Modify the following API's code and parameters to make
sure it is using frequency instead of channel:

	csr_roam_select_bss

Change-Id: I9c68e173af01d7cb29672179a7bbffb354134f87
CRs-Fixed: 2564011

core/sme/inc/csr_internal.h

@@ -974,16 +974,16 @@ uint32_t csr_get_infra_operation_chan_freq(
 bool csr_is_session_client_and_connected(struct mac_context *mac,
 		uint8_t sessionId);
 /**
- * csr_get_concurrent_operation_channel() - To get concurrent operating channel
+ * csr_get_concurrent_operation_freq() - To get concurrent operating freq
  * @mac_ctx: Pointer to mac context
  *
- * This routine will return operating channel on FIRST BSS that is
+ * This routine will return operating freq on FIRST BSS that is
  * active/operating to be used for concurrency mode.
  * If other BSS is not up or not connected it will return 0
  *
- * Return: uint8_t
+ * Return: uint32_t
  */
-uint8_t csr_get_concurrent_operation_channel(struct mac_context *mac_ctx);
+uint32_t csr_get_concurrent_operation_freq(struct mac_context *mac_ctx);
 
 /**
  * csr_get_beaconing_concurrent_channel() - To get concurrent operating channel

core/sme/src/csr/csr_api_roam.c

@@ -5492,7 +5492,7 @@ static bool csr_roam_select_bss(struct mac_context *mac_ctx,
 		enum csr_join_state *roam_state,
 		struct scan_result_list *bss_list)
 {
-	uint8_t conc_channel = 0, chan_id;
+	uint32_t conc_freq = 0, chan_freq;
 	bool status = false;
 	struct tag_csrscan_result *scan_result = NULL;
 	tCsrScanResultInfo *result = NULL;
@@ -5522,17 +5522,15 @@ static bool csr_roam_select_bss(struct mac_context *mac_ctx,
 		 */
 		result = &scan_result->Result;
 
-		chan_id = wlan_reg_freq_to_chan(
-				mac_ctx->pdev,
-				result->BssDescriptor.chan_freq);
+		chan_freq = result->BssDescriptor.chan_freq;
 		mode = policy_mgr_convert_device_mode_to_qdf_type(op_mode);
 		/* If concurrency is not allowed select next bss */
 		if (!policy_mgr_is_concurrency_allowed(mac_ctx->psoc,
 						       mode,
-						       chan_id,
+						       chan_freq,
 						       HW_MODE_20_MHZ)) {
-			sme_err("Concurrency not allowed for this channel %d bssid %pM, selecting next",
-				chan_id, result->BssDescriptor.bssId);
+			sme_err("Concurrency not allowed for this channel freq %d bssid %pM, selecting next",
+				chan_freq, result->BssDescriptor.bssId);
 			*roam_state = eCsrStopRoamingDueToConcurrency;
 			status = true;
 			*roam_bss_entry = csr_ll_next(&bss_list->List,
@@ -5560,31 +5558,32 @@ static bool csr_roam_select_bss(struct mac_context *mac_ctx,
 		if (policy_mgr_concurrent_open_sessions_running(mac_ctx->psoc)
 			&& !csr_is_valid_mc_concurrent_session(mac_ctx,
 					session_id, &result->BssDescriptor)) {
-			conc_channel = csr_get_concurrent_operation_channel(
+			conc_freq = csr_get_concurrent_operation_freq(
 					mac_ctx);
-			sme_debug("csr Conc Channel: %d", conc_channel);
+			sme_debug("csr Conc Channel freq: %d", conc_freq);
 
-			if (conc_channel) {
-				if ((conc_channel == chan_id) ||
+			if (conc_freq) {
+				if ((conc_freq == chan_freq) ||
 				    (policy_mgr_is_hw_dbs_capable(mac_ctx->psoc)
-				    && !WLAN_REG_IS_SAME_BAND_CHANNELS(
-				    conc_channel, chan_id))) {
+				    && !WLAN_REG_IS_SAME_BAND_FREQS(
+				    conc_freq, chan_freq))) {
 				/*
 				 * make this 0 because we do not want the below
 				 * check to pass as we don't want to connect on
 				 * other channel
 				 */
-					sme_debug("Conc chnl match: %d",
-								conc_channel);
-					conc_channel = 0;
+					sme_debug("Conc chnl freq match: %d",
+						  conc_freq);
+					conc_freq = 0;
 				}
 			}
 		}
 
 		/* Ok to roam this */
-		if (!conc_channel &&
-			QDF_IS_STATUS_SUCCESS(csr_roam_should_roam(mac_ctx,
-				session_id, &result->BssDescriptor, roam_id))) {
+		if (!conc_freq &&
+		    QDF_IS_STATUS_SUCCESS(csr_roam_should_roam(mac_ctx,
+					  session_id, &result->BssDescriptor,
+					  roam_id))) {
 			status = false;
 			break;
 		}

core/sme/src/csr/csr_host_scan_roam.c

@@ -133,7 +133,7 @@ void csr_neighbor_roam_process_scan_results(struct mac_context *mac_ctx,
 		&mac_ctx->roam.neighborRoamInfo[sessionid];
 	tpCsrNeighborRoamBSSInfo bss_info;
 	uint64_t age = 0;
-	uint8_t bss_chan_id;
+	uint32_t bss_chan_freq;
 	uint8_t num_candidates = 0;
 	uint8_t num_dropped = 0;
 	/*
@@ -167,8 +167,7 @@ void csr_neighbor_roam_process_scan_results(struct mac_context *mac_ctx,
 			if (!scan_result)
 				break;
 			descr = &scan_result->BssDescriptor;
-			bss_chan_id = wlan_reg_freq_to_chan(mac_ctx->pdev,
-							    descr->chan_freq);
+			bss_chan_freq = descr->chan_freq;
 			QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_DEBUG,
 				  FL("Scan result: BSSID " QDF_MAC_ADDR_STR
 				     " (Rssi %d, Ch:%d)"),
@@ -195,12 +194,12 @@ void csr_neighbor_roam_process_scan_results(struct mac_context *mac_ctx,
 			if (policy_mgr_concurrent_open_sessions_running(
 				mac_ctx->psoc) &&
 				!mac_ctx->roam.configParam.fenableMCCMode) {
-				uint8_t conc_channel;
+				uint32_t conc_freq;
 
-				conc_channel =
-				  csr_get_concurrent_operation_channel(mac_ctx);
-				if (conc_channel &&
-				   (conc_channel != bss_chan_id)) {
+				conc_freq =
+				  csr_get_concurrent_operation_freq(mac_ctx);
+				if (conc_freq &&
+				    (conc_freq != bss_chan_freq)) {
 					sme_debug("MCC not supported so Ignore AP on channel %d",
 						  descr->chan_freq);
 					continue;

core/sme/src/csr/csr_util.c

@@ -741,7 +741,7 @@ bool csr_is_session_client_and_connected(struct mac_context *mac, uint8_t sessio
 	return false;
 }
 
-uint8_t csr_get_concurrent_operation_channel(struct mac_context *mac_ctx)
+uint32_t csr_get_concurrent_operation_freq(struct mac_context *mac_ctx)
 {
 	struct csr_roam_session *session = NULL;
 	uint8_t i = 0;
@@ -762,10 +762,7 @@ uint8_t csr_get_concurrent_operation_channel(struct mac_context *mac_ctx)
 				(persona == QDF_SAP_MODE))
 				 && (session->connectState !=
 					 eCSR_ASSOC_STATE_TYPE_NOT_CONNECTED)))
-			return wlan_reg_freq_to_chan(
-					mac_ctx->pdev,
-					session->connectedProfile.op_freq);
-
+			return session->connectedProfile.op_freq;
 	}
 	return 0;
 }