qcacld-3.0: Remove operationChannel from tagCsrRoamConnectedProfile

Remove operationChannel from structure tagCsrRoamConnectedProfile,
remove the code where value assigning to operationChannel take place.

Change-Id: If6c034e39c63fd78e6f08ff3daa85e0432438cff
CRs-Fixed: 2499775

core/sme/inc/csr_api.h

@@ -847,7 +847,6 @@ typedef struct tagCsrRoamConnectedProfile {
 	tSirMacSSid SSID;
 	bool handoffPermitted;
 	bool ssidHidden;
-	uint8_t operationChannel;
 	uint32_t op_freq;
 	struct qdf_mac_addr bssid;
 	uint16_t beaconInterval;

core/sme/src/csr/csr_api_roam.c

@@ -1386,7 +1386,6 @@ QDF_STATUS csr_roam_copy_connect_profile(struct mac_context *mac,
 		pProfile->EncryptionType = connected_prof->EncryptionType;
 		pProfile->mcEncryptionType = connected_prof->mcEncryptionType;
 		pProfile->BSSType = connected_prof->BSSType;
-		pProfile->operationChannel = connected_prof->operationChannel;
 		pProfile->op_freq = connected_prof->op_freq;
 		qdf_mem_copy(&pProfile->bssid, &connected_prof->bssid,
 			sizeof(struct qdf_mac_addr));
@@ -3418,7 +3417,6 @@ QDF_STATUS csr_roam_call_callback(struct mac_context *mac, uint32_t sessionId,
 		   && (u2 == eCSR_ROAM_RESULT_CHANNEL_CHANGE_SUCCESS)) {
 		new_chan_num =
 			roam_info->channelChangeRespEvent->newChannelNumber;
-		pSession->connectedProfile.operationChannel = new_chan_num;
 		pSession->connectedProfile.op_freq =
 			wlan_reg_chan_to_freq(mac->pdev, new_chan_num);
 	} else if (u1 == eCSR_ROAM_SESSION_OPENED) {
@@ -8646,8 +8644,6 @@ csr_roam_save_connected_information(struct mac_context *mac,
 	}
 	/* Save bssid */
 	pConnectProfile->op_freq = pSirBssDesc->chan_freq;
-	pConnectProfile->operationChannel =
-		wlan_reg_freq_to_chan(mac->pdev, pSirBssDesc->chan_freq);
 	pConnectProfile->beaconInterval = pSirBssDesc->beaconInterval;
 	if (!pConnectProfile->beaconInterval)
 		sme_err("ERROR: Beacon interval is ZERO");
@@ -11677,8 +11673,6 @@ csr_roam_chk_lnk_swt_ch_ind(struct mac_context *mac_ctx, tSirSmeRsp *msg_ptr)
 					     eCSR_DISCONNECT_REASON_DEAUTH);
 		return;
 	}
-	session->connectedProfile.operationChannel =
-		wlan_reg_freq_to_chan(mac_ctx->pdev, pSwitchChnInd->freq);
 	session->connectedProfile.op_freq = pSwitchChnInd->freq;
 	if (session->pConnectBssDesc) {
 		session->pConnectBssDesc->channelId =
@@ -14389,9 +14383,7 @@ static void csr_roam_update_connected_profile_from_new_bss(struct mac_context *m
 	}
 
 	if (pNewBss) {
-		/* Set the operating channel. */
-		pSession->connectedProfile.operationChannel =
-			wlan_reg_freq_to_chan(mac->pdev, pNewBss->freq);
+		/* Set the operating frequency. */
 		pSession->connectedProfile.op_freq = pNewBss->freq;
 		/* move the BSSId from the BSS description into the connected
 		 * state information.

core/sme/src/csr/csr_util.c

@@ -962,8 +962,7 @@ static void csr_handle_conc_chnl_overlap_for_sap_go(struct mac_context *mac_ctx,
 			csr_get_ch_from_ht_profile(mac_ctx,
 				&session->connectedProfile.ht_profile,
 				*sap_ch, sap_cfreq, sap_hbw);
-		} else if (*sap_ch !=
-				session->connectedProfile.operationChannel) {
+		} else if (*sap_ch != op_chan) {
 			*intf_ch = op_chan;
 			csr_get_ch_from_ht_profile(mac_ctx,
 					&session->connectedProfile.ht_profile,

core/sme/src/nan/nan_datapath_api.c

@@ -104,9 +104,6 @@ void csr_roam_save_ndi_connected_info(struct mac_context *mac_ctx,
 	connect_profile->modifyProfileFields.uapsd_mask =
 		roam_profile->uapsd_mask;
 	connect_profile->op_freq = bssdesc->chan_freq;
-	connect_profile->operationChannel =
-		wlan_reg_freq_to_chan(mac_ctx->pdev,
-				      bssdesc->chan_freq);
 	connect_profile->beaconInterval = 0;
 	qdf_mem_copy(&connect_profile->Keys, &roam_profile->Keys,
 		     sizeof(roam_profile->Keys));