qcacld-3.0: Replace channel ID with frequency (bss_description 4)

Remove channelId from struct bss_description, and remove the
code where value assignment to channelId take place.

Change-Id: If37aca5f3e2211a73d546444aad2e5f9a4bada0a
CRs-Fixed: 2497438

core/mac/inc/sir_api.h

@@ -658,8 +658,7 @@ struct bss_description {
 	int8_t rssi;
 	int8_t rssi_raw;
 	int8_t sinr;
-	/* channelId what peer sent in beacon/probersp. */
-	uint8_t channelId;
+	/* channel frequency what peer sent in beacon/probersp. */
 	uint32_t chan_freq;
 	/* Based on system time, not a relative time. */
 	uint64_t received_time;

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

@@ -2178,12 +2178,10 @@ lim_roam_fill_bss_descr(struct mac_context *mac,
 	/* Copy Timestamp */
 	bss_desc_ptr->scansystimensec = qdf_get_monotonic_boottime_ns();
 	if (parsed_frm_ptr->dsParamsPresent) {
-		bss_desc_ptr->channelId = parsed_frm_ptr->channelNumber;
 		bss_desc_ptr->chan_freq =
 			wlan_reg_chan_to_freq(mac->pdev,
 					      parsed_frm_ptr->channelNumber);
 	} else if (parsed_frm_ptr->HTInfo.present) {
-		bss_desc_ptr->channelId = parsed_frm_ptr->HTInfo.primaryChannel;
 		bss_desc_ptr->chan_freq =
 			wlan_reg_chan_to_freq(mac->pdev,
 					      parsed_frm_ptr->HTInfo.
@@ -2193,8 +2191,6 @@ lim_roam_fill_bss_descr(struct mac_context *mac,
 		 * If DS Params or HTIE is not present in the probe resp or
 		 * beacon, then use the channel frequency provided by firmware
 		 * to fill the channel in the BSS descriptor.*/
-		bss_desc_ptr->channelId =
-			cds_freq_to_chan(roam_synch_ind_ptr->chan_freq);
 		bss_desc_ptr->chan_freq = roam_synch_ind_ptr->chan_freq;
 	}
 

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

@@ -133,7 +133,6 @@ lim_collect_bss_description(struct mac_context *mac,
 	 * So The problem of incorrect channel reporting in 5Ghz will still remain for 11a devices.
 	 */
 	channel_num = lim_get_channel_from_beacon(mac, pBPR);
-	pBssDescr->channelId = channel_num;
 	pBssDescr->chan_freq = wlan_reg_chan_to_freq(mac->pdev, channel_num);
 
 	/* set the network type in bss description */
@@ -192,7 +191,7 @@ lim_collect_bss_description(struct mac_context *mac,
 		     pBody + SIR_MAC_B_PR_SSID_OFFSET, ieLen);
 
 	/*set channel number in beacon in case it is not present */
-	pBPR->channelNumber = pBssDescr->channelId;
+	pBPR->channelNumber = channel_num;
 	mac->lim.beacon_probe_rsp_cnt_per_scan++;
 
 	return;

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

@@ -547,9 +547,6 @@ void lim_send_sme_start_bss_rsp(struct mac_context *mac,
 					 (uint32_t *) &pSirSmeRsp->bssDescription.
 					 nwType, pe_session);
 
-			pSirSmeRsp->bssDescription.channelId =
-				wlan_reg_freq_to_chan(
-				mac->pdev, pe_session->curr_op_freq);
 			pSirSmeRsp->bssDescription.chan_freq =
 				pe_session->curr_op_freq;
 

core/sme/src/csr/csr_api_roam.c

@@ -11675,9 +11675,6 @@ csr_roam_chk_lnk_swt_ch_ind(struct mac_context *mac_ctx, tSirSmeRsp *msg_ptr)
 	}
 	session->connectedProfile.op_freq = pSwitchChnInd->freq;
 	if (session->pConnectBssDesc) {
-		session->pConnectBssDesc->channelId =
-			wlan_reg_freq_to_chan(mac_ctx->pdev,
-					      pSwitchChnInd->freq);
 		session->pConnectBssDesc->chan_freq = pSwitchChnInd->freq;
 
 		ie_len = csr_get_ielen_from_bss_description(

core/sme/src/csr/csr_api_scan.c

@@ -1784,7 +1784,6 @@ QDF_STATUS csr_scan_create_entry_in_scan_cache(struct mac_context *mac,
 	/* change the BSSID & channel as passed */
 	qdf_mem_copy(pNewBssDescriptor->bssId, bssid.bytes,
 			sizeof(tSirMacAddr));
-	pNewBssDescriptor->channelId = channel;
 	pNewBssDescriptor->chan_freq = wlan_reg_chan_to_freq(mac->pdev,
 							     channel);
 	if (!csr_scan_append_bss_description(mac, pNewBssDescriptor)) {
@@ -2628,9 +2627,7 @@ static QDF_STATUS csr_fill_bss_from_scan_entry(struct mac_context *mac_ctx,
 	bss_desc->rssi = scan_entry->rssi_raw;
 	bss_desc->rssi_raw = scan_entry->rssi_raw;
 
-	/* channelId what peer sent in beacon/probersp. */
-	bss_desc->channelId =
-		scan_entry->channel.chan_idx;
+	/* channel frequency what peer sent in beacon/probersp. */
 	bss_desc->chan_freq =
 		wlan_reg_chan_to_freq(mac_ctx->pdev,
 				      scan_entry->channel.chan_idx);