qcacld-3.0: Populate frequency list

Do more frequency list population in a number of functions
to make sure the resulting tCsrChannelInfo structures
have the right channel frequency info.

Meanwhile, enlarge the buffer allocated for freq_list in
csr_roam_copy_profile to make sure all channel frequencies
can be replicated.

Change-Id: Ia8b90581211d657851e1d8fc2556dcb633c8001a
CRs-Fixed: 2500236

core/sap/src/sap_module.c

@@ -1903,6 +1903,8 @@ QDF_STATUS wlansap_channel_change_request(struct sap_context *sap_ctx,
 		return QDF_STATUS_E_FAULT;
 	}
 	sap_ctx->csr_roamProfile.ChannelInfo.ChannelList[0] = target_channel;
+	sap_ctx->csr_roamProfile.ChannelInfo.freq_list[0] =
+		wlan_reg_chan_to_freq(mac_ctx->pdev, target_channel);
 	/*
 	 * We are getting channel bonding mode from sapDfsInfor structure
 	 * because we've implemented channel width fallback mechanism for DFS

core/sme/src/csr/csr_api_roam.c

@@ -7631,7 +7631,8 @@ QDF_STATUS csr_roam_copy_profile(struct mac_context *mac,
 	}
 	if (pSrcProfile->ChannelInfo.freq_list) {
 		pDstProfile->ChannelInfo.freq_list =
-			qdf_mem_malloc(pSrcProfile->ChannelInfo.numOfChannels);
+			qdf_mem_malloc(sizeof(uint32_t) *
+				       pSrcProfile->ChannelInfo.numOfChannels);
 		if (!pDstProfile->ChannelInfo.freq_list) {
 			qdf_mem_free(pDstProfile->ChannelInfo.ChannelList);
 			pDstProfile->ChannelInfo.ChannelList = NULL;
@@ -7643,6 +7644,7 @@ QDF_STATUS csr_roam_copy_profile(struct mac_context *mac,
 			pSrcProfile->ChannelInfo.numOfChannels;
 		qdf_mem_copy(pDstProfile->ChannelInfo.freq_list,
 			     pSrcProfile->ChannelInfo.freq_list,
+			     sizeof(uint32_t) *
 			     pSrcProfile->ChannelInfo.numOfChannels);
 	}
 	pDstProfile->AuthType = pSrcProfile->AuthType;
@@ -10751,6 +10753,9 @@ csr_roam_prepare_filter_from_profile(struct mac_context *mac_ctx,
 	tCsrChannelInfo *profile_ch_info = &profile->ChannelInfo;
 	struct roam_ext_params *roam_params;
 	uint8_t i;
+	uint8_t *flt_ch_lst, *prof_ch_lst;
+	uint32_t *flt_freq_lst, *prof_freq_lst;
+	uint32_t num_ch;
 
 	roam_params = &mac_ctx->roam.configParam.roam_params;
 
@@ -10835,19 +10840,26 @@ csr_roam_prepare_filter_from_profile(struct mac_context *mac_ctx,
 			goto free_filter;
 		}
 
+		flt_ch_lst = fltr_ch_info->ChannelList;
+		flt_freq_lst = fltr_ch_info->freq_list;
+		prof_ch_lst = profile_ch_info->ChannelList;
+		prof_freq_lst = profile_ch_info->freq_list;
+		num_ch = 0;
+
 		for (idx = 0; idx < profile_ch_info->numOfChannels; idx++) {
 			if (csr_roam_is_channel_valid(mac_ctx,
-				profile_ch_info->ChannelList[idx])) {
-				fltr_ch_info->
-				ChannelList[fltr_ch_info->numOfChannels]
-					= profile_ch_info->ChannelList[idx];
-				fltr_ch_info->numOfChannels++;
+						      prof_ch_lst[idx])) {
+				flt_ch_lst[num_ch] = prof_ch_lst[idx];
+				flt_freq_lst[num_ch] = prof_freq_lst[idx];
+				num_ch++;
 			} else {
 				sme_debug(
 					"Channel (%d) is invalid",
 					profile_ch_info->ChannelList[idx]);
 			}
 		}
+
+		fltr_ch_info->numOfChannels = num_ch;
 	} else {
 		sme_err("Channel list empty");
 		status = QDF_STATUS_E_FAILURE;

core/sme/src/csr/csr_host_scan_roam.c

@@ -569,6 +569,8 @@ void csr_neighbor_roam_request_handoff(struct mac_context *mac_ctx,
 	neighbor_roam_info->csrNeighborRoamProfile.ChannelInfo.ChannelList[0] =
 		wlan_reg_freq_to_chan(mac_ctx->pdev,
 				      handoff_node.pBssDescription->chan_freq);
+	neighbor_roam_info->csrNeighborRoamProfile.ChannelInfo.freq_list[0] =
+		handoff_node.pBssDescription->chan_freq;
 
 	sme_debug("csr_roamHandoffRequested: disassociating with current AP");
 

core/sme/src/csr/csr_neighbor_roam.c

@@ -1549,8 +1549,6 @@ static QDF_STATUS csr_neighbor_roam_process_handoff_req(
 			goto end;
 		}
 	}
-	profile->ChannelInfo.ChannelList[0] =
-		roam_ctrl_info->handoffReqInfo.channel;
 
 	if (!profile->ChannelInfo.freq_list) {
 		profile->ChannelInfo.freq_list =
@@ -1564,6 +1562,9 @@ static QDF_STATUS csr_neighbor_roam_process_handoff_req(
 			goto end;
 		}
 	}
+
+	profile->ChannelInfo.ChannelList[0] =
+		roam_ctrl_info->handoffReqInfo.channel;
 	profile->ChannelInfo.freq_list[0] =
 		wlan_reg_chan_to_freq(mac_ctx->pdev,
 				      roam_ctrl_info->handoffReqInfo.channel);

core/sme/src/rrm/sme_rrm.c

@@ -970,18 +970,24 @@ static QDF_STATUS sme_rrm_fill_scan_channels(uint8_t *country,
 {
 	uint32_t num_chan = 0;
 	uint32_t i;
+	uint8_t *chan_list;
+	uint32_t *freq_list;
+	uint16_t op_class;
 
 	/* List all the channels in the requested RC */
 	wlan_reg_dmn_print_channels_in_opclass(country, reg_class);
 
+	chan_list = sme_rrm_context->channelList.ChannelList;
+	freq_list = sme_rrm_context->channelList.freq_list;
+
 	for (i = 0; i < num_channels; i++) {
-		if (wlan_reg_dmn_get_opclass_from_channel(country,
-			sme_rrm_context->channelList.ChannelList[i],
-			BWALL) ==
-			reg_class) {
-			sme_rrm_context->channelList.
-			ChannelList[num_chan] =
-			sme_rrm_context->channelList.ChannelList[i];
+		op_class = wlan_reg_dmn_get_opclass_from_channel(country,
+								 chan_list[i],
+								 BWALL);
+
+		if (op_class == reg_class) {
+			chan_list[num_chan] = chan_list[i];
+			freq_list[num_chan] = freq_list[i];
 			num_chan++;
 		}
 	}
@@ -1011,7 +1017,7 @@ static QDF_STATUS sme_rrm_fill_scan_channels(uint8_t *country,
  * Return : QDF_STATUS_SUCCESS - Validation is successful.
  */
 QDF_STATUS sme_rrm_process_beacon_report_req_ind(struct mac_context *mac,
-						void *msg_buf)
+						 void *msg_buf)
 {
 	tpSirBeaconReportReqInd pBeaconReq = (tpSirBeaconReportReqInd)msg_buf;
 	tpRrmSMEContext pSmeRrmContext = &mac->rrm.rrmSmeContext;
@@ -1020,6 +1026,11 @@ QDF_STATUS sme_rrm_process_beacon_report_req_ind(struct mac_context *mac,
 	uint32_t session_id;
 	struct csr_roam_session *session;
 	QDF_STATUS status;
+	uint32_t num_chan;
+	bool chan_valid;
+	uint8_t *rrm_chan_list;
+	uint32_t *rrm_freq_list;
+	uint8_t bcn_chan;
 
 	status = csr_roam_get_session_id_from_bssid(mac, (struct qdf_mac_addr *)
 						    pBeaconReq->bssId,
@@ -1089,6 +1100,10 @@ QDF_STATUS sme_rrm_process_beacon_report_req_ind(struct mac_context *mac,
 
 		csr_get_cfg_valid_channels(mac, pSmeRrmContext->channelList.
 					ChannelList, &len);
+		sme_chan_to_freq_list(mac->pdev,
+				      pSmeRrmContext->channelList.freq_list,
+				      pSmeRrmContext->channelList.ChannelList,
+				      len);
 
 		if (pBeaconReq->channelInfo.regulatoryClass) {
 			if (sme_rrm_fill_scan_channels(country, pSmeRrmContext,
@@ -1102,6 +1117,7 @@ QDF_STATUS sme_rrm_process_beacon_report_req_ind(struct mac_context *mac,
 	} else {
 		len = 0;
 		pSmeRrmContext->channelList.numOfChannels = 0;
+		num_chan = 0;
 
 		/* If valid channel is present. We first Measure on the given
 		 * channel and if there are additional channels present in
@@ -1135,28 +1151,39 @@ QDF_STATUS sme_rrm_process_beacon_report_req_ind(struct mac_context *mac,
 			goto cleanup;
 		}
 
-		if (pBeaconReq->channelInfo.channelNum != 255) {
-			if (csr_roam_is_channel_valid
-				    (mac, pBeaconReq->channelInfo.channelNum))
-				pSmeRrmContext->channelList.
-				ChannelList[pSmeRrmContext->channelList.
-					    numOfChannels++] =
-					pBeaconReq->channelInfo.channelNum;
-			else
+		rrm_chan_list = pSmeRrmContext->channelList.ChannelList;
+		rrm_freq_list = pSmeRrmContext->channelList.freq_list;
+		bcn_chan = pBeaconReq->channelInfo.channelNum;
+
+		if (bcn_chan != 255) {
+			chan_valid = csr_roam_is_channel_valid(mac, bcn_chan);
+
+			if (chan_valid) {
+				rrm_chan_list[num_chan] = bcn_chan;
+				rrm_freq_list[num_chan] =
+					wlan_reg_chan_to_freq(mac->pdev,
+							      bcn_chan);
+				num_chan++;
+			} else {
 				sme_err("Invalid channel: %d",
 					pBeaconReq->channelInfo.channelNum);
+			}
 		}
 
 		for (i = 0; i < pBeaconReq->channelList.numChannels; i++) {
-			if (csr_roam_is_channel_valid(mac, pBeaconReq->
-					channelList.channelNumber[i])) {
-				pSmeRrmContext->channelList.
-					ChannelList[pSmeRrmContext->channelList.
-				numOfChannels] = pBeaconReq->channelList.
-					channelNumber[i];
-				pSmeRrmContext->channelList.numOfChannels++;
+			bcn_chan = pBeaconReq->channelList.channelNumber[i];
+			chan_valid = csr_roam_is_channel_valid(mac, bcn_chan);
+
+			if (chan_valid) {
+				rrm_chan_list[num_chan] = bcn_chan;
+				rrm_freq_list[num_chan] =
+					wlan_reg_chan_to_freq(mac->pdev,
+							      bcn_chan);
+				num_chan++;
 			}
 		}
+
+		pSmeRrmContext->channelList.numOfChannels = num_chan;
 	}
 
 	/* Copy session bssid */