qcacld-3.0: Replace currentOperChannel with curr_op_freq

Replace currentOperChannel with curr_op_freq in files:
lim_ft_preauth.c
lim_ibss_peer_mgmt.c
lim_link_monitoring_algo.c
lim_process_action_frame.c
lim_process_assoc_req_frame.c
lim_process_message_queue.c
lim_process_mlm_host_roam.c
lim_process_mlm_req_messages.c
lim_process_mlm_rsp_messages.c
lim_process_sme_req_messages.c

Change-Id: Icf4654ee2454200833aa34ff0a8f27d0918172eb
CRs-Fixed: 2489683

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

@@ -190,7 +190,7 @@ int lim_process_ft_pre_auth_req(struct mac_context *mac_ctx,
 	 * Dont need to suspend if APs are in same channel and DUT
 	 * is not in MCC state
 	 */
-	if ((session->currentOperChannel !=
+	if ((wlan_reg_freq_to_chan(mac_ctx->pdev, session->curr_op_freq) !=
 	    session->ftPEContext.pFTPreAuthReq->preAuthchannelNum)
 	    || lim_is_in_mcc(mac_ctx)) {
 		/* Need to suspend link only if the channels are different */
@@ -484,7 +484,7 @@ void lim_handle_ft_pre_auth_rsp(struct mac_context *mac, QDF_STATUS status,
 		lim_print_mac_addr(mac, pe_session->limReAssocbssId, LOGD);
 	}
 send_rsp:
-	if ((pe_session->currentOperChannel !=
+	if ((wlan_reg_freq_to_chan(mac->pdev, pe_session->curr_op_freq) !=
 	     pe_session->ftPEContext.pFTPreAuthReq->preAuthchannelNum) ||
 	    lim_is_in_mcc(mac)) {
 		/* Need to move to the original AP channel */

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

@@ -568,7 +568,8 @@ void ibss_bss_add(struct mac_context *mac, struct pe_session *pe_session)
 	mlmStartReq.txChannelWidthSet = pe_session->htRecommendedTxWidthSet;
 
 	/* reading the channel num from session Table */
-	mlmStartReq.channelNumber = pe_session->currentOperChannel;
+	mlmStartReq.channelNumber = wlan_reg_freq_to_chan(
+					mac->pdev, pe_session->curr_op_freq);
 
 	mlmStartReq.cbMode = pe_session->pLimStartBssReq->cbMode;
 

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

@@ -503,7 +503,8 @@ void lim_handle_heart_beat_failure(struct mac_context *mac_ctx,
 		 * DFS channel then only send the probe request otherwise tear
 		 * down the link
 		 */
-		curr_chan = session->currentOperChannel;
+		curr_chan = wlan_reg_freq_to_chan(
+					mac_ctx->pdev, session->curr_op_freq);
 		if (!lim_isconnected_on_dfs_channel(mac_ctx, curr_chan)) {
 			/* Detected continuous Beacon Misses */
 			session->LimHBFailureStatus = true;

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

@@ -333,6 +333,7 @@ lim_process_ext_channel_switch_action_frame(struct mac_context *mac_ctx,
 	uint32_t                frame_len;
 	uint32_t                status;
 	uint8_t                 target_channel;
+	uint32_t                target_freq;
 
 	hdr = WMA_GET_RX_MAC_HEADER(rx_packet_info);
 	body = WMA_GET_RX_MPDU_DATA(rx_packet_info);
@@ -361,7 +362,7 @@ lim_process_ext_channel_switch_action_frame(struct mac_context *mac_ctx,
 
 	target_channel =
 	 ext_channel_switch_frame->ext_chan_switch_ann_action.new_channel;
-
+	target_freq = wlan_reg_chan_to_freq(mac_ctx->pdev, target_channel);
 	/* Free ext_channel_switch_frame here as its no longer needed */
 	qdf_mem_free(ext_channel_switch_frame);
 	/*
@@ -369,13 +370,13 @@ lim_process_ext_channel_switch_action_frame(struct mac_context *mac_ctx,
 	 * channel and if is valid in the current regulatory domain,
 	 * and no concurrent session is running.
 	 */
-	if (!((session_entry->currentOperChannel != target_channel) &&
-		((wlan_reg_get_channel_state(mac_ctx->pdev, target_channel) ==
+	if (!(session_entry->curr_op_freq != target_freq &&
+	      ((wlan_reg_get_channel_state(mac_ctx->pdev, target_channel) ==
 		  CHANNEL_STATE_ENABLE) ||
-		 (wlan_reg_get_channel_state(mac_ctx->pdev, target_channel) ==
+	       (wlan_reg_get_channel_state(mac_ctx->pdev, target_channel) ==
 		  CHANNEL_STATE_DFS &&
-		  !policy_mgr_concurrent_open_sessions_running(
-			  mac_ctx->psoc))))) {
+		!policy_mgr_concurrent_open_sessions_running(
+			mac_ctx->psoc))))) {
 		pe_err("Channel: %d is not valid", target_channel);
 		return;
 	}
@@ -469,7 +470,7 @@ static void __lim_process_operating_mode_action_frame(struct mac_context *mac_ct
 		goto end;
 	}
 
-	if (CHAN_ENUM_14 >= session->currentOperChannel)
+	if (wlan_reg_is_24ghz_ch_freq(session->curr_op_freq))
 		cb_mode = mac_ctx->roam.configParam.channelBondingMode24GHz;
 	else
 		cb_mode = mac_ctx->roam.configParam.channelBondingMode5GHz;

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

@@ -2730,12 +2730,11 @@ void lim_send_mlm_assoc_ind(struct mac_context *mac_ctx,
 		assoc_ind->beaconPtr = session_entry->beacon;
 		assoc_ind->beaconLength = session_entry->bcnLen;
 
-		assoc_ind->chan_info.chan_id =
-			session_entry->currentOperChannel;
-		assoc_ind->chan_info.mhz =
-			cds_chan_to_freq(session_entry->currentOperChannel);
+		assoc_ind->chan_info.chan_id = wlan_reg_freq_to_chan(
+			mac_ctx->pdev, session_entry->curr_op_freq);
+		assoc_ind->chan_info.mhz = session_entry->curr_op_freq;
 		assoc_ind->chan_info.band_center_freq1 =
-			cds_chan_to_freq(session_entry->currentOperChannel);
+			session_entry->curr_op_freq;
 		assoc_ind->chan_info.band_center_freq2 = 0;
 		assoc_ind->chan_info.reg_info_1 =
 			(session_entry->maxTxPower << 16);

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

@@ -1967,8 +1967,10 @@ static void lim_process_messages(struct mac_context *mac_ctx,
 			 *    restart, in such a case, beacon params will be
 			 *    reset and thus will not contain Q2Q IE, by default
 			 */
-			if (wlan_reg_get_channel_state(mac_ctx->pdev,
-					session_entry->currentOperChannel)
+			if (wlan_reg_get_channel_state(
+				mac_ctx->pdev,
+				wlan_reg_freq_to_chan(
+				mac_ctx->pdev, session_entry->curr_op_freq))
 					!= CHANNEL_STATE_DFS) {
 				beacon_params.bss_idx = session_entry->bss_idx;
 				beacon_params.beaconInterval =

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

@@ -595,7 +595,6 @@ end:
 void lim_process_mlm_ft_reassoc_req(struct mac_context *mac,
 				    tLimMlmReassocReq *reassoc_req)
 {
-	uint8_t chanNum = 0;
 	struct pe_session *session;
 	uint16_t caps;
 	uint32_t val;
@@ -615,8 +614,6 @@ void lim_process_mlm_ft_reassoc_req(struct mac_context *mac,
 		return;
 	}
 
-	chanNum = session->currentOperChannel;
-
 #ifdef FEATURE_WLAN_DIAG_SUPPORT_LIM    /* FEATURE_WLAN_DIAG_SUPPORT */
 	lim_diag_event_report(mac, WLAN_PE_DIAG_REASSOCIATING,
 			session, 0, 0);

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

@@ -547,7 +547,6 @@ end:
 static void lim_post_join_set_link_state_callback(struct mac_context *mac,
 		void *callback_arg, bool status)
 {
-	uint8_t chan_num, sec_chan_offset;
 	struct session_params *session_cb_param =
 					(struct session_params *)callback_arg;
 	tLimMlmJoinCnf mlm_join_cnf;
@@ -572,8 +571,6 @@ static void lim_post_join_set_link_state_callback(struct mac_context *mac,
 		goto failure;
 	}
 
-	chan_num = session_entry->currentOperChannel;
-	sec_chan_offset = session_entry->htSecondaryChannelOffset;
 	/*
 	 * store the channel switch session_entry in the lim
 	 * global variable
@@ -582,12 +579,14 @@ static void lim_post_join_set_link_state_callback(struct mac_context *mac,
 			 LIM_SWITCH_CHANNEL_JOIN;
 	session_entry->pLimMlmReassocRetryReq = NULL;
 	pe_debug("[lim_process_mlm_join_req]: suspend link success(%d) "
-		"on sessionid: %d setting channel to: %d with ch_width :%d "
-		"and maxtxPower: %d", status, session_entry->peSessionId,
-		session_entry->currentOperChannel,
-		session_entry->ch_width,
-		session_entry->maxTxPower);
-	lim_set_channel(mac, session_entry->currentOperChannel,
+		 "on sessionid: %d setting channel to: freq %d with ch_width :%d "
+		 "and maxtxPower: %d", status, session_entry->peSessionId,
+		 session_entry->curr_op_freq,
+		 session_entry->ch_width,
+		 session_entry->maxTxPower);
+	lim_set_channel(
+		mac,
+		wlan_reg_freq_to_chan(mac->pdev, session_entry->curr_op_freq),
 		session_entry->ch_center_freq_seg0,
 		session_entry->ch_center_freq_seg1,
 		session_entry->ch_width,
@@ -2125,7 +2124,8 @@ static void lim_process_periodic_join_probe_req_timer(struct mac_context *mac_ct
 		ssid.length = session->ssId.length;
 		lim_send_probe_req_mgmt_frame(mac_ctx, &ssid,
 			session->pLimMlmJoinReq->bssDescription.bssId,
-			session->currentOperChannel /*chanNum */,
+			wlan_reg_freq_to_chan(mac_ctx->pdev,
+					      session->curr_op_freq),
 			session->self_mac_addr, session->dot11mode,
 			&session->lim_join_req->addIEScan.length,
 			session->lim_join_req->addIEScan.addIEdata);
@@ -2369,9 +2369,9 @@ void lim_process_assoc_failure_timeout(struct mac_context *mac_ctx,
 	 * when device has missed the assoc resp sent by peer.
 	 * By sending deauth try to clear the session created on peer device.
 	 */
-	pe_debug("Sessionid: %d try sending deauth on channel %d to BSSID: "
+	pe_debug("Sessionid: %d try sending deauth on channel freq %d to BSSID: "
 		QDF_MAC_ADDR_STR, session->peSessionId,
-		session->currentOperChannel,
+		session->curr_op_freq,
 		QDF_MAC_ADDR_ARRAY(session->bssId));
 	lim_send_deauth_mgmt_frame(mac_ctx, eSIR_MAC_UNSPEC_FAILURE_REASON,
 		session->bssId, session, false);

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

@@ -235,9 +235,9 @@ void lim_process_mlm_start_cnf(struct mac_context *mac, uint32_t *msg_buf)
 		if (send_bcon_ind) {
 			/* Configure beacon and send beacons to HAL */
 			QDF_TRACE(QDF_MODULE_ID_PE, QDF_TRACE_LEVEL_DEBUG,
-					FL("Start Beacon with ssid %s Ch %d"),
+					"Start Beacon with ssid %s Ch freq %d",
 					pe_session->ssId.ssId,
-					pe_session->currentOperChannel);
+					pe_session->curr_op_freq);
 			lim_send_beacon(mac, pe_session);
 			lim_enable_obss_detection_config(mac, pe_session);
 			lim_send_obss_color_collision_cfg(mac, pe_session,
@@ -3018,10 +3018,12 @@ static void lim_process_switch_channel_join_req(
 				mac_ctx->lim.gLimHeartBeatApMac[apCount], sizeof(tSirMacAddr))) {
 
 				pe_err("Index %d Sessionid: %d Send deauth on "
-				"channel %d to BSSID: "QDF_MAC_ADDR_STR, apCount,
-				session_entry->peSessionId, session_entry->currentOperChannel,
-				QDF_MAC_ADDR_ARRAY(session_entry->pLimMlmJoinReq->bssDescription.
-											bssId));
+				"channel freq %d to BSSID: " QDF_MAC_ADDR_STR,
+				apCount,
+				session_entry->peSessionId,
+				session_entry->curr_op_freq,
+				QDF_MAC_ADDR_ARRAY(
+				session_entry->pLimMlmJoinReq->bssDescription.bssId));
 
 				lim_send_deauth_mgmt_frame(mac_ctx, eSIR_MAC_UNSPEC_FAILURE_REASON,
 					session_entry->pLimMlmJoinReq->bssDescription.bssId,
@@ -3060,9 +3062,9 @@ static void lim_process_switch_channel_join_req(
 	/* assign appropriate sessionId to the timer object */
 	mac_ctx->lim.limTimers.gLimPeriodicJoinProbeReqTimer.sessionId =
 		session_entry->peSessionId;
-	pe_debug("Sessionid: %d Send Probe req on channel %d ssid:%.*s "
+	pe_debug("Sessionid: %d Send Probe req on channel freq %d ssid:%.*s "
 		"BSSID: " QDF_MAC_ADDR_STR, session_entry->peSessionId,
-		session_entry->currentOperChannel, ssId.length, ssId.ssId,
+		session_entry->curr_op_freq, ssId.length, ssId.ssId,
 		QDF_MAC_ADDR_ARRAY(
 		session_entry->pLimMlmJoinReq->bssDescription.bssId));
 
@@ -3086,7 +3088,9 @@ static void lim_process_switch_channel_join_req(
 	/* include additional IE if there is */
 	lim_send_probe_req_mgmt_frame(mac_ctx, &ssId,
 		session_entry->pLimMlmJoinReq->bssDescription.bssId,
-		session_entry->currentOperChannel, session_entry->self_mac_addr,
+		wlan_reg_freq_to_chan(mac_ctx->pdev,
+				      session_entry->curr_op_freq),
+		session_entry->self_mac_addr,
 		session_entry->dot11mode,
 		&session_entry->lim_join_req->addIEScan.length,
 		session_entry->lim_join_req->addIEScan.addIEdata);

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

@@ -636,7 +636,8 @@ __lim_handle_sme_start_bss_request(struct mac_context *mac_ctx, uint32_t *msg_bu
 
 		session->maxTxPower =
 			lim_get_regulatory_max_transmit_power(mac_ctx,
-				session->currentOperChannel);
+				wlan_reg_freq_to_chan(
+				mac_ctx->pdev, session->curr_op_freq));
 		/* Store the dot 11 mode in to the session Table */
 		session->dot11mode = sme_start_bss_req->dot11mode;
 #ifdef FEATURE_WLAN_MCC_TO_SCC_SWITCH
@@ -671,7 +672,7 @@ __lim_handle_sme_start_bss_request(struct mac_context *mac_ctx, uint32_t *msg_bu
 			     (void *)&sme_start_bss_req->extendedRateSet,
 			     sizeof(tSirMacRateSet));
 
-		if (IS_5G_CH(session->currentOperChannel))
+		if (wlan_reg_is_5ghz_ch_freq(session->curr_op_freq))
 			vdev_type_nss = &mac_ctx->vdev_type_nss_5g;
 		else
 			vdev_type_nss = &mac_ctx->vdev_type_nss_2g;
@@ -874,7 +875,8 @@ __lim_handle_sme_start_bss_request(struct mac_context *mac_ctx, uint32_t *msg_bu
 			}
 		}
 		/* store the channel num in mlmstart req structure */
-		mlm_start_req->channelNumber = session->currentOperChannel;
+		mlm_start_req->channelNumber = wlan_reg_freq_to_chan(
+				mac_ctx->pdev, session->curr_op_freq);
 		mlm_start_req->cbMode = sme_start_bss_req->cbMode;
 		mlm_start_req->beaconPeriod =
 			session->beaconParams.beaconInterval;
@@ -1466,12 +1468,14 @@ __lim_process_sme_join_req(struct mac_context *mac_ctx, void *msg_buf)
 
 		if (PHY_DOUBLE_CHANNEL_HIGH_PRIMARY == sme_join_req->cbMode) {
 			session->ch_center_freq_seg0 =
-				session->currentOperChannel - 2;
+				wlan_reg_freq_to_chan(
+				mac_ctx->pdev, session->curr_op_freq) - 2;
 			session->ch_width = CH_WIDTH_40MHZ;
 		} else if (PHY_DOUBLE_CHANNEL_LOW_PRIMARY ==
 				sme_join_req->cbMode) {
 			session->ch_center_freq_seg0 =
-				session->currentOperChannel + 2;
+				wlan_reg_freq_to_chan(
+				mac_ctx->pdev, session->curr_op_freq) + 2;
 			session->ch_width = CH_WIDTH_40MHZ;
 		} else {
 			session->ch_center_freq_seg0 = 0;
@@ -1590,8 +1594,9 @@ __lim_process_sme_join_req(struct mac_context *mac_ctx, void *msg_buf)
 		session->limCurrentBssCaps =
 			session->lim_join_req->bssDescription.capabilityInfo;
 
-		reg_max = lim_get_regulatory_max_transmit_power(mac_ctx,
-				session->currentOperChannel);
+		reg_max = lim_get_regulatory_max_transmit_power(
+			mac_ctx, wlan_reg_freq_to_chan(mac_ctx->pdev,
+						       session->curr_op_freq));
 		local_power_constraint = reg_max;
 
 		lim_extract_ap_capability(mac_ctx,
@@ -1607,9 +1612,7 @@ __lim_process_sme_join_req(struct mac_context *mac_ctx, void *msg_buf)
 		tx_pwr_attr.ap_tx_power = local_power_constraint;
 		tx_pwr_attr.ini_tx_power =
 				mac_ctx->mlme_cfg->power.max_tx_power;
-		tx_pwr_attr.frequency =
-			wlan_reg_get_channel_freq(mac_ctx->pdev,
-						  session->currentOperChannel);
+		tx_pwr_attr.frequency = session->curr_op_freq;
 
 		session->maxTxPower = lim_get_max_tx_power(mac_ctx,
 							   &tx_pwr_attr);
@@ -1635,8 +1638,9 @@ __lim_process_sme_join_req(struct mac_context *mac_ctx, void *msg_buf)
 			session->gUapsdPerAcTriggerEnableMask = 0;
 		}
 
-		session->limRFBand =
-			lim_get_rf_band(session->currentOperChannel);
+		session->limRFBand = lim_get_rf_band(
+			wlan_reg_freq_to_chan(mac_ctx->pdev,
+					      session->curr_op_freq));
 
 		/* Initialize 11h Enable Flag */
 		if (session->limRFBand == BAND_5G)
@@ -1664,8 +1668,10 @@ __lim_process_sme_join_req(struct mac_context *mac_ctx, void *msg_buf)
 
 		/* Enable the spectrum management if this is a DFS channel */
 		if (session->country_info_present &&
-			lim_isconnected_on_dfs_channel(mac_ctx,
-					session->currentOperChannel))
+		    lim_isconnected_on_dfs_channel(
+				mac_ctx,
+				wlan_reg_freq_to_chan(
+				mac_ctx->pdev, session->curr_op_freq)))
 			session->spectrumMgtEnabled = true;
 
 		session->isOSENConnection = sme_join_req->isOSENConnection;
@@ -1918,8 +1924,9 @@ static void __lim_process_sme_reassoc_req(struct mac_context *mac_ctx,
 
 	session_entry->limReassocBssCaps =
 		session_entry->pLimReAssocReq->bssDescription.capabilityInfo;
-	reg_max = lim_get_regulatory_max_transmit_power(mac_ctx,
-			session_entry->currentOperChannel);
+	reg_max = lim_get_regulatory_max_transmit_power(
+		mac_ctx, wlan_reg_freq_to_chan(
+		mac_ctx->pdev, session_entry->curr_op_freq));
 	local_pwr_constraint = reg_max;
 
 	lim_extract_ap_capability(mac_ctx,
@@ -1985,8 +1992,9 @@ static void __lim_process_sme_reassoc_req(struct mac_context *mac_ctx,
 
 	/* Enable the spectrum management if this is a DFS channel */
 	if (session_entry->country_info_present &&
-			lim_isconnected_on_dfs_channel(mac_ctx,
-				session_entry->currentOperChannel))
+	    lim_isconnected_on_dfs_channel(
+		mac_ctx, wlan_reg_freq_to_chan(
+		mac_ctx->pdev, session_entry->curr_op_freq)))
 		session_entry->spectrumMgtEnabled = true;
 
 	session_entry->limPrevSmeState = session_entry->limSmeState;
@@ -4942,9 +4950,9 @@ static void lim_process_sme_start_beacon_req(struct mac_context *mac, uint32_t *
 		 */
 		lim_apply_configuration(mac, pe_session);
 		QDF_TRACE(QDF_MODULE_ID_PE, QDF_TRACE_LEVEL_DEBUG,
-			  FL("Start Beacon with ssid %s Ch %d"),
+			  FL("Start Beacon with ssid %s Ch freq %d"),
 			  pe_session->ssId.ssId,
-			  pe_session->currentOperChannel);
+			  pe_session->curr_op_freq);
 		lim_send_beacon(mac, pe_session);
 		lim_enable_obss_detection_config(mac, pe_session);
 		lim_send_obss_color_collision_cfg(mac, pe_session,
@@ -5015,6 +5023,7 @@ static void lim_process_sme_channel_change_request(struct mac_context *mac_ctx,
 	struct pe_session *session_entry;
 	uint8_t session_id;      /* PE session_id */
 	int8_t max_tx_pwr;
+	uint32_t target_freq;
 
 	if (!msg_buf) {
 		pe_err("msg_buf is NULL");
@@ -5022,6 +5031,9 @@ static void lim_process_sme_channel_change_request(struct mac_context *mac_ctx,
 	}
 	ch_change_req = (tpSirChanChangeRequest)msg_buf;
 
+	target_freq = wlan_reg_chan_to_freq(
+		mac_ctx->pdev, ch_change_req->targetChannel);
+
 	max_tx_pwr = lim_get_regulatory_max_transmit_power(
 				mac_ctx, ch_change_req->targetChannel);
 
@@ -5039,11 +5051,10 @@ static void lim_process_sme_channel_change_request(struct mac_context *mac_ctx,
 		return;
 	}
 
-	if ((session_entry->currentOperChannel ==
-			ch_change_req->targetChannel) &&
-	     (session_entry->ch_width == ch_change_req->ch_width)) {
-		pe_err("Target channel and mode is same as current channel and mode channel %d and mode %d",
-		       session_entry->currentOperChannel, session_entry->ch_width);
+	if (session_entry->curr_op_freq == target_freq &&
+	    session_entry->ch_width == ch_change_req->ch_width) {
+		pe_err("Target channel and mode is same as current channel and mode channel freq %d and mode %d",
+		       session_entry->curr_op_freq, session_entry->ch_width);
 		return;
 	}
 
@@ -5054,9 +5065,9 @@ static void lim_process_sme_channel_change_request(struct mac_context *mac_ctx,
 		session_entry->channelChangeReasonCode =
 			LIM_SWITCH_CHANNEL_MONITOR;
 
-	pe_debug("switch old chnl %d to new chnl %d, ch_bw %d, nw_type %d, dot11mode %d",
-		 session_entry->currentOperChannel,
-		 ch_change_req->targetChannel,
+	pe_debug("switch old chnl (freq) %d to new chnl %d, ch_bw %d, nw_type %d, dot11mode %d",
+		 session_entry->curr_op_freq,
+		 target_freq,
 		 ch_change_req->ch_width,
 		 ch_change_req->nw_type,
 		 ch_change_req->dot11mode);
@@ -5072,12 +5083,12 @@ static void lim_process_sme_channel_change_request(struct mac_context *mac_ctx,
 		(ch_change_req->ch_width ? 1 : 0);
 	session_entry->htRecommendedTxWidthSet =
 		session_entry->htSupportedChannelWidthSet;
-	session_entry->curr_op_freq = wlan_reg_chan_to_freq(
-				mac_ctx->pdev, ch_change_req->targetChannel);
+	session_entry->curr_op_freq = target_freq;
 	session_entry->currentOperChannel = wlan_reg_freq_to_chan(
 				mac_ctx->pdev, session_entry->curr_op_freq);
-	session_entry->limRFBand =
-		lim_get_rf_band(session_entry->currentOperChannel);
+	session_entry->limRFBand = lim_get_rf_band(
+		wlan_reg_freq_to_chan(
+		mac_ctx->pdev, session_entry->curr_op_freq));
 	session_entry->cac_duration_ms = ch_change_req->cac_duration_ms;
 	session_entry->dfs_regdomain = ch_change_req->dfs_regdomain;
 	session_entry->maxTxPower = max_tx_pwr;