qcacld-3.0: Remove currentOperChannel from pe_session

Remove currentOperChannel from pe_session. Use curr_op_freq
instead of currentOperChannel.

Change-Id: Ibfa2abd22d3c70ff86c34dd0f5bc538c5c62a5b2
CRs-Fixed: 2490651

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

@@ -218,7 +218,6 @@ struct pe_session {
 	tSirMacRateSet extRateSet;
 	tSirMacHTOperatingMode htOperMode;
 	uint32_t curr_op_freq;
-	uint8_t currentOperChannel;
 	uint32_t curr_req_chan_freq;
 	uint8_t LimRxedBeaconCntDuringHB;
 

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

@@ -598,9 +598,6 @@ void lim_fill_ft_session(struct mac_context *mac,
 	/* Copy The channel Id to the session Table */
 	ft_session->limReassocChannelId = pbssDescription->channelId;
 	ft_session->curr_op_freq = pbssDescription->chan_freq;
-	ft_session->currentOperChannel =
-		wlan_reg_freq_to_chan(mac->pdev, ft_session->curr_op_freq);
-
 	ft_session->limRFBand = lim_get_rf_band(wlan_reg_freq_to_chan(
 					mac->pdev, ft_session->curr_op_freq));
 

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

@@ -623,8 +623,6 @@ __lim_handle_sme_start_bss_request(struct mac_context *mac_ctx, uint32_t *msg_bu
 		/* Store the oper freq in session Table */
 		session->curr_op_freq = wlan_reg_chan_to_freq(
 				mac_ctx->pdev, sme_start_bss_req->channelId);
-		session->currentOperChannel = wlan_reg_freq_to_chan(
-				mac_ctx->pdev, session->curr_op_freq);
 
 		/* Store Persona */
 		session->opmode = sme_start_bss_req->bssPersona;
@@ -1429,8 +1427,6 @@ __lim_process_sme_join_req(struct mac_context *mac_ctx, void *msg_buf)
 
 		/* Copy oper freq to the session Table */
 		session->curr_op_freq = bss_desc->chan_freq;
-		session->currentOperChannel = wlan_reg_freq_to_chan(
-					mac_ctx->pdev, session->curr_op_freq);
 		session->vhtCapability =
 			IS_DOT11_MODE_VHT(session->dot11mode);
 		if (session->vhtCapability) {
@@ -5084,8 +5080,6 @@ static void lim_process_sme_channel_change_request(struct mac_context *mac_ctx,
 	session_entry->htRecommendedTxWidthSet =
 		session_entry->htSupportedChannelWidthSet;
 	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(
 		wlan_reg_freq_to_chan(
 		mac_ctx->pdev, session_entry->curr_op_freq));

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

@@ -66,8 +66,6 @@ void lim_update_re_assoc_globals(struct mac_context *mac, tpSirAssocRsp pAssocRs
 		     pe_session->limReAssocbssId, sizeof(tSirMacAddr));
 	pe_session->curr_op_freq = wlan_reg_chan_to_freq(
 				mac->pdev, pe_session->limReassocChannelId);
-	pe_session->currentOperChannel = wlan_reg_freq_to_chan(
-				mac->pdev, pe_session->curr_op_freq);
 	pe_session->htSecondaryChannelOffset =
 		pe_session->reAssocHtSupportedChannelWidthSet;
 	pe_session->htRecommendedTxWidthSet =

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

@@ -2188,9 +2188,6 @@ void lim_switch_channel_cback(struct mac_context *mac, QDF_STATUS status,
 	struct switch_channel_ind *pSirSmeSwitchChInd;
 
 	pe_session->curr_op_freq = pe_session->curr_req_chan_freq;
-	pe_session->currentOperChannel = wlan_reg_freq_to_chan(
-				mac->pdev, pe_session->curr_op_freq);
-
 	/* We need to restore pre-channelSwitch state on the STA */
 	if (lim_restore_pre_channel_switch_state(mac, pe_session) !=
 	    QDF_STATUS_SUCCESS) {
@@ -2327,8 +2324,6 @@ void lim_switch_primary_secondary_channel(struct mac_context *mac,
 			mac->pdev, new_channel));
 		pe_session->curr_op_freq = wlan_reg_chan_to_freq(
 					mac->pdev, new_channel);
-		pe_session->currentOperChannel = wlan_reg_freq_to_chan(
-					mac->pdev, pe_session->curr_op_freq);
 	}
 	if (pe_session->htSecondaryChannelOffset !=
 			pe_session->gLimChannelSwitch.sec_ch_offset) {