qcacld-3.0: Remove ChannelList from tCsrChannelInfo

Remove all the code reference of ChannelList.
Use freq_list in new code.

Change-Id: I1972f58f07b451dd52ead5dfcabce258f130f1ca
CRs-Fixed: 2503099

core/hdd/src/wlan_hdd_assoc.c

@@ -5843,7 +5843,6 @@ void hdd_roam_profile_init(struct hdd_adapter *adapter)
 
 	/* Set the numOfChannels to zero to scan all the channels */
 	roam_profile->ChannelInfo.numOfChannels = 0;
-	roam_profile->ChannelInfo.ChannelList = NULL;
 	roam_profile->ChannelInfo.freq_list = NULL;
 
 	roam_profile->BSSType = eCSR_BSS_TYPE_INFRASTRUCTURE;

core/hdd/src/wlan_hdd_cfg80211.c

@@ -16503,12 +16503,9 @@ static int wlan_hdd_cfg80211_connect_start(struct hdd_adapter *adapter,
 		if (operatingChannel) {
 			oper_freq = wlan_reg_chan_to_freq(hdd_ctx->pdev,
 							  operatingChannel);
-			roam_profile->ChannelInfo.ChannelList =
-				&operatingChannel;
 			roam_profile->ChannelInfo.freq_list = &oper_freq;
 			roam_profile->ChannelInfo.numOfChannels = 1;
 		} else {
-			roam_profile->ChannelInfo.ChannelList = NULL;
 			roam_profile->ChannelInfo.freq_list = NULL;
 			roam_profile->ChannelInfo.numOfChannels = 0;
 		}
@@ -16652,7 +16649,6 @@ static int wlan_hdd_cfg80211_connect_start(struct hdd_adapter *adapter,
 		/* Reset connect_in_progress */
 		hdd_set_connection_in_progress(false);
 
-		roam_profile->ChannelInfo.ChannelList = NULL;
 		roam_profile->ChannelInfo.freq_list = NULL;
 		roam_profile->ChannelInfo.numOfChannels = 0;
 
@@ -19111,8 +19107,6 @@ static int __wlan_hdd_cfg80211_join_ibss(struct wiphy *wiphy,
 		sta_ctx->conn_info.freq =
 			wlan_reg_chan_to_freq(hdd_ctx->pdev,
 					      channelNum);
-		roam_profile->ChannelInfo.ChannelList =
-			&sta_ctx->conn_info.channel;
 		roam_profile->ChannelInfo.freq_list =
 			&sta_ctx->conn_info.freq;
 	}
@@ -21242,7 +21236,6 @@ static int __wlan_hdd_cfg80211_set_mon_ch(struct wiphy *wiphy,
 
 	sta_ctx = WLAN_HDD_GET_STATION_CTX_PTR(adapter);
 	ch_info = &sta_ctx->ch_info;
-	roam_profile.ChannelInfo.ChannelList = &ch_info->channel;
 	roam_profile.ChannelInfo.freq_list = &ch_info->freq;
 	roam_profile.ChannelInfo.numOfChannels = 1;
 	roam_profile.phyMode = ch_info->phy_mode;

core/hdd/src/wlan_hdd_hostapd.c

@@ -3683,8 +3683,6 @@ int wlan_hdd_set_channel(struct wiphy *wiphy,
 		sta_ctx->conn_info.freq =
 			wlan_reg_chan_to_freq(hdd_ctx->pdev,
 					      channel);
-		roam_profile->ChannelInfo.ChannelList =
-			&sta_ctx->conn_info.channel;
 		roam_profile->ChannelInfo.freq_list =
 			&sta_ctx->conn_info.freq;
 	} else if ((adapter->device_mode == QDF_SAP_MODE)

core/hdd/src/wlan_hdd_main.c

@@ -6809,7 +6809,6 @@ int wlan_hdd_set_mon_chan(struct hdd_adapter *adapter, uint32_t chan,
 
 	hdd_debug("Set monitor mode Channel %d", chan);
 	qdf_mem_zero(&roam_profile, sizeof(roam_profile));
-	roam_profile.ChannelInfo.ChannelList = &ch_info->channel;
 	roam_profile.ChannelInfo.freq_list = &ch_info->freq;
 	roam_profile.ChannelInfo.numOfChannels = 1;
 	roam_profile.phyMode = ch_info->phy_mode;

core/hdd/src/wlan_hdd_nan_datapath.c

@@ -196,7 +196,6 @@ static int hdd_ndi_start_bss(struct hdd_adapter *adapter,
 	oper_freq = wlan_reg_chan_to_freq(hdd_ctx->pdev, operating_channel);
 
 	roam_profile->ChannelInfo.numOfChannels = 1;
-	roam_profile->ChannelInfo.ChannelList = &operating_channel;
 	roam_profile->ChannelInfo.freq_list = &oper_freq;
 
 	roam_profile->SSIDs.numOfSSIDs = 1;
@@ -227,7 +226,6 @@ static int hdd_ndi_start_bss(struct hdd_adapter *adapter,
 		hdd_info("sme_RoamConnect issued successfully for NDI");
 	}
 
-	roam_profile->ChannelInfo.ChannelList = NULL;
 	roam_profile->ChannelInfo.freq_list = NULL;
 	roam_profile->ChannelInfo.numOfChannels = 0;
 

core/sap/src/sap_fsm.c

@@ -2277,8 +2277,6 @@ static QDF_STATUS sap_goto_starting(struct sap_context *sap_ctx,
 	/* Specify the channel */
 	sap_ctx->csr_roamProfile.ChannelInfo.numOfChannels =
 					1;
-	sap_ctx->csr_roamProfile.ChannelInfo.ChannelList =
-		&sap_ctx->csr_roamProfile.operationChannel;
 	sap_ctx->csr_roamProfile.ChannelInfo.freq_list =
 		&sap_ctx->csr_roamProfile.op_freq;
 	sap_ctx->csr_roamProfile.operationChannel =

core/sap/src/sap_module.c

@@ -1902,7 +1902,6 @@ QDF_STATUS wlansap_channel_change_request(struct sap_context *sap_ctx,
 			FL("Invalid channel list"));
 		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);
 	/*

core/sme/inc/csr_api.h

@@ -196,7 +196,6 @@ typedef enum {
 
 typedef struct tagCsrChannelInfo {
 	uint8_t numOfChannels;
-	uint8_t *ChannelList;   /* it will be an array of channels */
 	uint32_t *freq_list;
 } tCsrChannelInfo, *tpCsrChannelInfo;
 

core/sme/src/csr/csr_api_roam.c

@@ -1600,9 +1600,6 @@ QDF_STATUS csr_flush_cfg_bg_scan_roam_channel_list(struct mac_context *mac,
 
 	/* Free up the memory first (if required) */
 	if (pNeighborRoamInfo->cfgParams.channelInfo.freq_list) {
-		qdf_mem_free(pNeighborRoamInfo->cfgParams.channelInfo.
-			     ChannelList);
-		pNeighborRoamInfo->cfgParams.channelInfo.ChannelList = NULL;
 		qdf_mem_free(pNeighborRoamInfo->cfgParams.channelInfo.
 			     freq_list);
 		pNeighborRoamInfo->cfgParams.channelInfo.freq_list = NULL;
@@ -1625,30 +1622,14 @@ QDF_STATUS csr_create_bg_scan_roam_channel_list(struct mac_context *mac,
 		&mac->roam.neighborRoamInfo[sessionId];
 
 	pNeighborRoamInfo->cfgParams.channelInfo.numOfChannels = num_chan;
-
-	pNeighborRoamInfo->cfgParams.channelInfo.ChannelList =
-		qdf_mem_malloc(pNeighborRoamInfo->cfgParams.channelInfo.
-			       numOfChannels);
-
-	if (!pNeighborRoamInfo->cfgParams.channelInfo.ChannelList) {
-		pNeighborRoamInfo->cfgParams.channelInfo.numOfChannels = 0;
-		return QDF_STATUS_E_NOMEM;
-	}
-
 	pNeighborRoamInfo->cfgParams.channelInfo.freq_list =
 		qdf_mem_malloc(sizeof(uint32_t) * num_chan);
 	if (!pNeighborRoamInfo->cfgParams.channelInfo.freq_list) {
-		qdf_mem_free(pNeighborRoamInfo->cfgParams.channelInfo.
-			     ChannelList);
-		pNeighborRoamInfo->cfgParams.channelInfo.ChannelList = NULL;
 		pNeighborRoamInfo->cfgParams.channelInfo.numOfChannels = 0;
 		return QDF_STATUS_E_NOMEM;
 	}
 
 	/* Update the roam global structure */
-	qdf_mem_copy(pNeighborRoamInfo->cfgParams.channelInfo.ChannelList,
-		     chan_list,
-		     pNeighborRoamInfo->cfgParams.channelInfo.numOfChannels);
 	sme_chan_to_freq_list(mac->pdev,
 			      pNeighborRoamInfo->cfgParams.channelInfo.
 			      freq_list, chan_list, num_chan);
@@ -1760,35 +1741,21 @@ QDF_STATUS csr_create_roam_scan_channel_list(struct mac_context *mac,
 	/* Prepare final roam scan channel list */
 	if (out_num_chan) {
 		/* Clear the channel list first */
-		if (currChannelListInfo->ChannelList) {
-			qdf_mem_free(currChannelListInfo->ChannelList);
-			currChannelListInfo->ChannelList = NULL;
-			currChannelListInfo->numOfChannels = 0;
-		}
 		if (currChannelListInfo->freq_list) {
 			qdf_mem_free(currChannelListInfo->freq_list);
 			currChannelListInfo->freq_list = NULL;
 			currChannelListInfo->numOfChannels = 0;
 		}
-		currChannelListInfo->ChannelList
-			= qdf_mem_malloc(out_num_chan * sizeof(uint8_t));
-		if (!currChannelListInfo->ChannelList) {
-			currChannelListInfo->numOfChannels = 0;
-			return QDF_STATUS_E_NOMEM;
-		}
 		currChannelListInfo->freq_list =
 			qdf_mem_malloc(out_num_chan * sizeof(uint32_t));
 		if (!currChannelListInfo->freq_list) {
-			qdf_mem_free(currChannelListInfo->ChannelList);
-			currChannelListInfo->ChannelList = NULL;
 			currChannelListInfo->numOfChannels = 0;
 			return QDF_STATUS_E_NOMEM;
 		}
-		qdf_mem_copy(currChannelListInfo->ChannelList,
-			     ChannelList, out_num_chan);
 		sme_chan_to_freq_list(mac->pdev,
 				      currChannelListInfo->freq_list,
 				      ChannelList, out_num_chan);
+		currChannelListInfo->numOfChannels = out_num_chan;
 	}
 	return status;
 }
@@ -7624,27 +7591,11 @@ QDF_STATUS csr_roam_copy_profile(struct mac_context *mac,
 		qdf_mem_copy(pDstProfile->pAddIEAssoc, pSrcProfile->pAddIEAssoc,
 			pSrcProfile->nAddIEAssocLength);
 	}
-	if (pSrcProfile->ChannelInfo.ChannelList) {
-		pDstProfile->ChannelInfo.ChannelList =
-			qdf_mem_malloc(pSrcProfile->ChannelInfo.
-					numOfChannels);
-		if (!pDstProfile->ChannelInfo.ChannelList) {
-			status = QDF_STATUS_E_NOMEM;
-			goto end;
-		}
-		pDstProfile->ChannelInfo.numOfChannels =
-			pSrcProfile->ChannelInfo.numOfChannels;
-		qdf_mem_copy(pDstProfile->ChannelInfo.ChannelList,
-			pSrcProfile->ChannelInfo.ChannelList,
-			pSrcProfile->ChannelInfo.numOfChannels);
-	}
 	if (pSrcProfile->ChannelInfo.freq_list) {
 		pDstProfile->ChannelInfo.freq_list =
 			qdf_mem_malloc(sizeof(uint32_t) *
 				       pSrcProfile->ChannelInfo.numOfChannels);
 		if (!pDstProfile->ChannelInfo.freq_list) {
-			qdf_mem_free(pDstProfile->ChannelInfo.ChannelList);
-			pDstProfile->ChannelInfo.ChannelList = NULL;
 			pDstProfile->ChannelInfo.numOfChannels = 0;
 			status = QDF_STATUS_E_NOMEM;
 			goto end;
@@ -7792,21 +7743,13 @@ QDF_STATUS csr_roam_copy_connected_profile(struct mac_context *mac,
 		qdf_mem_copy(pDstProfile->pAddIEAssoc, pSrcProfile->pAddIEAssoc,
 			pSrcProfile->nAddIEAssocLength);
 	}
-	pDstProfile->ChannelInfo.ChannelList = qdf_mem_malloc(1);
-	if (!pDstProfile->ChannelInfo.ChannelList) {
-		status = QDF_STATUS_E_NOMEM;
-		goto end;
-	}
 	pDstProfile->ChannelInfo.freq_list = qdf_mem_malloc(sizeof(uint32_t));
 	if (!pDstProfile->ChannelInfo.freq_list) {
-		qdf_mem_free(pDstProfile->ChannelInfo.ChannelList);
-		pDstProfile->ChannelInfo.ChannelList = NULL;
+		pDstProfile->ChannelInfo.numOfChannels = 0;
 		status = QDF_STATUS_E_NOMEM;
 		goto end;
 	}
 	pDstProfile->ChannelInfo.numOfChannels = 1;
-	pDstProfile->ChannelInfo.ChannelList[0] =
-			wlan_reg_freq_to_chan(mac->pdev, pSrcProfile->op_freq);
 	pDstProfile->ChannelInfo.freq_list[0] = pSrcProfile->op_freq;
 	pDstProfile->AuthType.numEntries = 1;
 	pDstProfile->AuthType.authType[0] = pSrcProfile->AuthType;
@@ -10763,7 +10706,6 @@ 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;
 
@@ -10829,37 +10771,24 @@ csr_roam_prepare_filter_from_profile(struct mac_context *mac_ctx,
 	if (!profile_ch_info->freq_list ||
 	    profile_ch_info->freq_list[0] == 0) {
 		fltr_ch_info->numOfChannels = 0;
-		fltr_ch_info->ChannelList = NULL;
 		fltr_ch_info->freq_list = NULL;
 	} else if (profile_ch_info->numOfChannels) {
 		fltr_ch_info->numOfChannels = 0;
-		fltr_ch_info->ChannelList =
-			qdf_mem_malloc(sizeof(*(fltr_ch_info->ChannelList)) *
-				       profile_ch_info->numOfChannels);
-		if (!fltr_ch_info->ChannelList) {
-			status = QDF_STATUS_E_NOMEM;
-			goto free_filter;
-		}
 		fltr_ch_info->freq_list =
 			qdf_mem_malloc(sizeof(*fltr_ch_info->freq_list) *
 				       profile_ch_info->numOfChannels);
 		if (!fltr_ch_info->freq_list) {
-			qdf_mem_free(fltr_ch_info->ChannelList);
-			fltr_ch_info->ChannelList = NULL;
 			status = QDF_STATUS_E_NOMEM;
 			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_chan_freq_valid(mac_ctx,
 							prof_freq_lst[idx])) {
-				flt_ch_lst[num_ch] = prof_ch_lst[idx];
 				flt_freq_lst[num_ch] = prof_freq_lst[idx];
 				num_ch++;
 			} else {

core/sme/src/csr/csr_host_scan_roam.c

@@ -566,9 +566,6 @@ void csr_neighbor_roam_request_handoff(struct mac_context *mac_ctx,
 	}
 	qdf_mem_copy(neighbor_roam_info->csrNeighborRoamProfile.BSSIDs.bssid,
 		     handoff_node.pBssDescription->bssId, sizeof(tSirMacAddr));
-	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;
 

core/sme/src/csr/csr_neighbor_roam.c

@@ -237,12 +237,6 @@ static void csr_neighbor_roam_reset_channel_info(tpCsrNeighborRoamChannelInfo
 		rChInfo->currentChanIndex =
 			CSR_NEIGHBOR_ROAM_INVALID_CHANNEL_INDEX;
 		rChInfo->currentChannelListInfo.numOfChannels = 0;
-
-		if (rChInfo->currentChannelListInfo.ChannelList)
-			qdf_mem_free(rChInfo->currentChannelListInfo.
-				     ChannelList);
-
-		rChInfo->currentChannelListInfo.ChannelList = NULL;
 		if (rChInfo->currentChannelListInfo.freq_list)
 			qdf_mem_free(rChInfo->currentChannelListInfo.freq_list);
 		rChInfo->currentChannelListInfo.freq_list = NULL;
@@ -448,20 +442,9 @@ csr_neighbor_roam_prepare_scan_profile_filter(struct mac_context *mac,
 		 * scanned
 		 */
 		pScanFilter->ChannelInfo.numOfChannels = num_ch;
-		pScanFilter->ChannelInfo.ChannelList =
-			qdf_mem_malloc(num_ch * sizeof(uint8_t));
-		if (!pScanFilter->ChannelInfo.ChannelList) {
-			qdf_mem_free(pScanFilter->BSSIDs.bssid);
-			pScanFilter->BSSIDs.bssid = NULL;
-			qdf_mem_free(pScanFilter->SSIDs.SSIDList);
-			pScanFilter->SSIDs.SSIDList = NULL;
-			return QDF_STATUS_E_NOMEM;
-		}
 		pScanFilter->ChannelInfo.freq_list =
 			qdf_mem_malloc(num_ch * sizeof(uint32_t));
 		if (!pScanFilter->ChannelInfo.freq_list) {
-			qdf_mem_free(pScanFilter->ChannelInfo.ChannelList);
-			pScanFilter->ChannelInfo.ChannelList = NULL;
 			pScanFilter->ChannelInfo.numOfChannels = 0;
 			qdf_mem_free(pScanFilter->BSSIDs.bssid);
 			pScanFilter->BSSIDs.bssid = NULL;
@@ -470,16 +453,12 @@ csr_neighbor_roam_prepare_scan_profile_filter(struct mac_context *mac,
 			return QDF_STATUS_E_NOMEM;
 		}
 		for (i = 0; i < pScanFilter->ChannelInfo.numOfChannels; i++) {
-			pScanFilter->ChannelInfo.ChannelList[i] =
-			  nbr_roam_info->roamChannelInfo.currentChannelListInfo.
-			  ChannelList[i];
 			pScanFilter->ChannelInfo.freq_list[i] =
 				nbr_roam_info->roamChannelInfo.
 				currentChannelListInfo.freq_list[i];
 		}
 	} else {
 		pScanFilter->ChannelInfo.numOfChannels = 0;
-		pScanFilter->ChannelInfo.ChannelList = NULL;
 		pScanFilter->ChannelInfo.freq_list = NULL;
 	}
 
@@ -1273,35 +1252,21 @@ QDF_STATUS csr_neighbor_roam_init(struct mac_context *mac, uint8_t sessionId)
 			FL("number of channels: %u"),
 			pNeighborRoamInfo->cfgParams.channelInfo.numOfChannels);
 	if (pNeighborRoamInfo->cfgParams.channelInfo.numOfChannels != 0) {
-		pNeighborRoamInfo->cfgParams.channelInfo.ChannelList =
-		qdf_mem_malloc(mac->mlme_cfg->lfr.
-			       neighbor_scan_channel_list_num);
-
-		if (!pNeighborRoamInfo->cfgParams.channelInfo.ChannelList)
-			return QDF_STATUS_E_NOMEM;
 		pNeighborRoamInfo->cfgParams.channelInfo.freq_list =
 			qdf_mem_malloc(sizeof(uint32_t) *
 				       mac->mlme_cfg->lfr.
 				       neighbor_scan_channel_list_num);
 		if (!pNeighborRoamInfo->cfgParams.channelInfo.freq_list) {
-			qdf_mem_free(pNeighborRoamInfo->cfgParams.channelInfo.
-				     ChannelList);
-			pNeighborRoamInfo->cfgParams.channelInfo.ChannelList =
-				NULL;
 			pNeighborRoamInfo->cfgParams.channelInfo.numOfChannels =
 				0;
 			return QDF_STATUS_E_NOMEM;
 		}
 
 	} else {
-		pNeighborRoamInfo->cfgParams.channelInfo.ChannelList = NULL;
 		pNeighborRoamInfo->cfgParams.channelInfo.freq_list = NULL;
 	}
 
 	/* Update the roam global structure from CFG */
-	qdf_mem_copy(pNeighborRoamInfo->cfgParams.channelInfo.ChannelList,
-		     mac->mlme_cfg->lfr.neighbor_scan_channel_list,
-		     mac->mlme_cfg->lfr.neighbor_scan_channel_list_num);
 	sme_chan_to_freq_list(mac->pdev,
 			      pNeighborRoamInfo->cfgParams.channelInfo.
 			      freq_list,
@@ -1337,9 +1302,6 @@ QDF_STATUS csr_neighbor_roam_init(struct mac_context *mac, uint8_t sessionId)
 	status = csr_ll_open(&pNeighborRoamInfo->roamableAPList);
 	if (QDF_STATUS_SUCCESS != status) {
 		sme_err("LL Open of roam able AP List failed");
-		qdf_mem_free(pNeighborRoamInfo->cfgParams.channelInfo.
-			     ChannelList);
-		pNeighborRoamInfo->cfgParams.channelInfo.ChannelList = NULL;
 		qdf_mem_free(pNeighborRoamInfo->cfgParams.channelInfo.
 			     freq_list);
 		pNeighborRoamInfo->cfgParams.channelInfo.freq_list = NULL;
@@ -1351,8 +1313,6 @@ QDF_STATUS csr_neighbor_roam_init(struct mac_context *mac, uint8_t sessionId)
 		CSR_NEIGHBOR_ROAM_INVALID_CHANNEL_INDEX;
 	pNeighborRoamInfo->roamChannelInfo.currentChannelListInfo.
 	numOfChannels = 0;
-	pNeighborRoamInfo->roamChannelInfo.currentChannelListInfo.ChannelList =
-		NULL;
 	pNeighborRoamInfo->roamChannelInfo.currentChannelListInfo.freq_list =
 		NULL;
 	pNeighborRoamInfo->roamChannelInfo.IAPPNeighborListReceived = false;
@@ -1360,10 +1320,8 @@ QDF_STATUS csr_neighbor_roam_init(struct mac_context *mac, uint8_t sessionId)
 	status = csr_neighbor_roam_init11r_assoc_info(mac);
 	if (QDF_STATUS_SUCCESS != status) {
 		sme_err("LL Open of roam able AP List failed");
-		qdf_mem_free(pNeighborRoamInfo->cfgParams.channelInfo.
-			     ChannelList);
-		pNeighborRoamInfo->cfgParams.channelInfo.ChannelList = NULL;
 		pNeighborRoamInfo->cfgParams.channelInfo.freq_list = NULL;
+		pNeighborRoamInfo->cfgParams.channelInfo.numOfChannels = 0;
 		csr_ll_close(&pNeighborRoamInfo->roamableAPList);
 		return QDF_STATUS_E_RESOURCES;
 	}
@@ -1399,14 +1357,10 @@ void csr_neighbor_roam_close(struct mac_context *mac, uint8_t sessionId)
 		return;
 	}
 	cfg_params = &pNeighborRoamInfo->cfgParams;
-
-	if (cfg_params->channelInfo.ChannelList)
-		qdf_mem_free(cfg_params->channelInfo.ChannelList);
 	if (cfg_params->channelInfo.freq_list)
 		qdf_mem_free(cfg_params->channelInfo.freq_list);
-
-	pNeighborRoamInfo->cfgParams.channelInfo.ChannelList = NULL;
 	pNeighborRoamInfo->cfgParams.channelInfo.freq_list = NULL;
+	pNeighborRoamInfo->cfgParams.channelInfo.numOfChannels = 0;
 
 	/* Should free up the nodes in the list before closing the
 	 * double Linked list
@@ -1417,12 +1371,9 @@ void csr_neighbor_roam_close(struct mac_context *mac, uint8_t sessionId)
 
 	current_channel_list_info =
 		&pNeighborRoamInfo->roamChannelInfo.currentChannelListInfo;
-	if (current_channel_list_info->ChannelList)
-		qdf_mem_free(current_channel_list_info->ChannelList);
 	if (current_channel_list_info->freq_list)
 		qdf_mem_free(current_channel_list_info->freq_list);
 
-	current_channel_list_info->ChannelList = NULL;
 	current_channel_list_info->freq_list = NULL;
 	pNeighborRoamInfo->roamChannelInfo.currentChanIndex =
 		CSR_NEIGHBOR_ROAM_INVALID_CHANNEL_INDEX;
@@ -1541,32 +1492,17 @@ static QDF_STATUS csr_neighbor_roam_process_handoff_req(
 	}
 
 	profile->ChannelInfo.numOfChannels = 1;
-	if (!profile->ChannelInfo.ChannelList) {
-		profile->ChannelInfo.ChannelList =
-			qdf_mem_malloc(sizeof(*profile->
-				ChannelInfo.ChannelList) *
-				profile->ChannelInfo.numOfChannels);
-		if (!profile->ChannelInfo.ChannelList) {
-			status = QDF_STATUS_E_NOMEM;
-			goto end;
-		}
-	}
-
 	if (!profile->ChannelInfo.freq_list) {
 		profile->ChannelInfo.freq_list =
 			qdf_mem_malloc(sizeof(*profile->ChannelInfo.freq_list) *
 				       profile->ChannelInfo.numOfChannels);
 		if (!profile->ChannelInfo.freq_list) {
-			qdf_mem_free(profile->ChannelInfo.ChannelList);
-			profile->ChannelInfo.ChannelList = NULL;
 			profile->ChannelInfo.numOfChannels = 0;
 			status = QDF_STATUS_E_NOMEM;
 			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/csr/csr_util.c

@@ -5935,10 +5935,6 @@ void csr_release_profile(struct mac_context *mac, struct csr_roam_profile *pProf
 			qdf_mem_free(pProfile->pAddIEAssoc);
 			pProfile->pAddIEAssoc = NULL;
 		}
-		if (pProfile->ChannelInfo.ChannelList) {
-			qdf_mem_free(pProfile->ChannelInfo.ChannelList);
-			pProfile->ChannelInfo.ChannelList = NULL;
-		}
 		if (pProfile->ChannelInfo.freq_list) {
 			qdf_mem_free(pProfile->ChannelInfo.freq_list);
 			pProfile->ChannelInfo.freq_list = NULL;
@@ -5955,10 +5951,6 @@ void csr_free_scan_filter(struct mac_context *mac, tCsrScanResultFilter
 		qdf_mem_free(pScanFilter->BSSIDs.bssid);
 		pScanFilter->BSSIDs.bssid = NULL;
 	}
-	if (pScanFilter->ChannelInfo.ChannelList) {
-		qdf_mem_free(pScanFilter->ChannelInfo.ChannelList);
-		pScanFilter->ChannelInfo.ChannelList = NULL;
-	}
 	if (pScanFilter->ChannelInfo.freq_list) {
 		qdf_mem_free(pScanFilter->ChannelInfo.freq_list);
 		pScanFilter->ChannelInfo.freq_list = NULL;

core/sme/src/rrm/sme_rrm.c

@@ -420,7 +420,6 @@ void sme_reset_ese_bcn_req_in_progress(tpRrmSMEContext sme_rrm_ctx)
  * sme_rrm_send_scan_result() - to get scan result and send the beacon report
  * @mac_ctx: pointer to mac context
  * @num_chan: number of channels
- * @chan_list: list of channels to fetch the result from
  * @freq_list: list of channel frequencies to fetch the result from
  * @measurementdone: Flag to indicate measurement done or no
  *
@@ -431,7 +430,6 @@ void sme_reset_ese_bcn_req_in_progress(tpRrmSMEContext sme_rrm_ctx)
  */
 static QDF_STATUS sme_rrm_send_scan_result(struct mac_context *mac_ctx,
 					   uint8_t num_chan,
-					   uint8_t *chan_list,
 					   uint32_t *freq_list,
 					   uint8_t measurementdone)
 {
@@ -468,7 +466,6 @@ static QDF_STATUS sme_rrm_send_scan_result(struct mac_context *mac_ctx,
 	}
 
 	filter.ChannelInfo.numOfChannels = num_chan;
-	filter.ChannelInfo.ChannelList = chan_list;
 	filter.ChannelInfo.freq_list = freq_list;
 	filter.fMeasurement = true;
 
@@ -663,7 +660,7 @@ static QDF_STATUS sme_rrm_scan_request_callback(mac_handle_t mac_handle,
 	QDF_STATUS qdf_status;
 	uint32_t session_id;
 	bool valid_result = true;
-	uint8_t *chan_list, ch_idx, num_chan;
+	uint8_t ch_idx, num_chan;
 	uint32_t *freq_list;
 
 	/*
@@ -681,12 +678,11 @@ static QDF_STATUS sme_rrm_scan_request_callback(mac_handle_t mac_handle,
 	/* if any more channels are pending, start a timer of a random value
 	 * within randomization interval.
 	 */
-	chan_list = pSmeRrmContext->channelList.ChannelList;
 	freq_list = pSmeRrmContext->channelList.freq_list;
 	ch_idx = pSmeRrmContext->currentIndex;
 	num_chan = pSmeRrmContext->channelList.numOfChannels;
 	if (((ch_idx + 1) < num_chan) && valid_result) {
-		sme_rrm_send_scan_result(mac, 1, chan_list, freq_list, false);
+		sme_rrm_send_scan_result(mac, 1, freq_list, false);
 		/* Advance the current index. */
 		pSmeRrmContext->currentIndex++;
 		/* start the timer to issue next request. */
@@ -701,8 +697,6 @@ static QDF_STATUS sme_rrm_scan_request_callback(mac_handle_t mac_handle,
 		qdf_status = qdf_mc_timer_start(&pSmeRrmContext->IterMeasTimer,
 						interval);
 		if (QDF_IS_STATUS_ERROR(qdf_status)) {
-			qdf_mem_free(pSmeRrmContext->channelList.ChannelList);
-			pSmeRrmContext->channelList.ChannelList = NULL;
 			qdf_mem_free(pSmeRrmContext->channelList.freq_list);
 			pSmeRrmContext->channelList.freq_list = NULL;
 			sme_reset_ese_bcn_req_in_progress(pSmeRrmContext);
@@ -712,9 +706,7 @@ static QDF_STATUS sme_rrm_scan_request_callback(mac_handle_t mac_handle,
 		/* Done with the measurement. Clean up all context and send a
 		 * message to PE with measurement done flag set.
 		 */
-		sme_rrm_send_scan_result(mac, 1, chan_list, freq_list, true);
-		qdf_mem_free(pSmeRrmContext->channelList.ChannelList);
-		pSmeRrmContext->channelList.ChannelList = NULL;
+		sme_rrm_send_scan_result(mac, 1, freq_list, true);
 		qdf_mem_free(pSmeRrmContext->channelList.freq_list);
 		pSmeRrmContext->channelList.freq_list = NULL;
 		sme_reset_ese_bcn_req_in_progress(pSmeRrmContext);
@@ -769,7 +761,7 @@ static QDF_STATUS sme_rrm_issue_scan_req(struct mac_context *mac_ctx)
 	tpRrmSMEContext sme_rrm_ctx = &mac_ctx->rrm.rrmSmeContext;
 	uint32_t session_id;
 	tSirScanType scan_type;
-	uint8_t *chan_list, ch_idx;
+	uint8_t ch_idx;
 	uint32_t *freq_list;
 
 	status = csr_roam_get_session_id_from_bssid(mac_ctx,
@@ -923,11 +915,10 @@ static QDF_STATUS sme_rrm_issue_scan_req(struct mac_context *mac_ctx)
 		 * pScanResult->timer >= rrm_scan_timer
 		 */
 		rrm_scan_timer = 0;
-		chan_list = sme_rrm_ctx->channelList.ChannelList;
 		freq_list = sme_rrm_ctx->channelList.freq_list;
 		ch_idx = sme_rrm_ctx->currentIndex;
 		if ((ch_idx + 1) < sme_rrm_ctx->channelList.numOfChannels) {
-			sme_rrm_send_scan_result(mac_ctx, 1, chan_list,
+			sme_rrm_send_scan_result(mac_ctx, 1,
 						 freq_list, false);
 			/* Advance the current index. */
 			sme_rrm_ctx->currentIndex++;
@@ -941,7 +932,7 @@ static QDF_STATUS sme_rrm_issue_scan_req(struct mac_context *mac_ctx)
 			 * Done with the measurement. Clean up all context and
 			 * send a message to PE with measurement done flag set.
 			 */
-			sme_rrm_send_scan_result(mac_ctx, 1, chan_list,
+			sme_rrm_send_scan_result(mac_ctx, 1,
 						 freq_list, true);
 			goto free_ch_lst;
 		}
@@ -956,10 +947,9 @@ static QDF_STATUS sme_rrm_issue_scan_req(struct mac_context *mac_ctx)
 send_ind:
 	sme_rrm_send_beacon_report_xmit_ind(mac_ctx, NULL, true, 0);
 free_ch_lst:
-	qdf_mem_free(sme_rrm_ctx->channelList.ChannelList);
-	sme_rrm_ctx->channelList.ChannelList = NULL;
 	qdf_mem_free(sme_rrm_ctx->channelList.freq_list);
 	sme_rrm_ctx->channelList.freq_list = NULL;
+	sme_rrm_ctx->channelList.numOfChannels = 0;
 	return status;
 }
 
@@ -971,14 +961,12 @@ static QDF_STATUS sme_rrm_fill_scan_channels(struct mac_context *mac,
 {
 	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++) {
@@ -989,15 +977,12 @@ static QDF_STATUS sme_rrm_fill_scan_channels(struct mac_context *mac,
 								 BWALL);
 
 		if (op_class == reg_class) {
-			chan_list[num_chan] = chan_list[i];
 			freq_list[num_chan] = freq_list[i];
 			num_chan++;
 		}
 	}
 	sme_rrm_context->channelList.numOfChannels = num_chan;
 	if (sme_rrm_context->channelList.numOfChannels == 0) {
-		qdf_mem_free(sme_rrm_context->channelList.ChannelList);
-		sme_rrm_context->channelList.ChannelList = NULL;
 		qdf_mem_free(sme_rrm_context->channelList.freq_list);
 		sme_rrm_context->channelList.freq_list = NULL;
 		sme_err("No channels populated with requested operation class and current country, Hence abort the rrm operation");
@@ -1031,7 +1016,6 @@ QDF_STATUS sme_rrm_process_beacon_report_req_ind(struct mac_context *mac,
 	QDF_STATUS status;
 	uint32_t num_chan;
 	bool chan_valid;
-	uint8_t *rrm_chan_list;
 	uint32_t *rrm_freq_list;
 	uint8_t bcn_chan;
 
@@ -1078,16 +1062,6 @@ QDF_STATUS sme_rrm_process_beacon_report_req_ind(struct mac_context *mac,
 	     && (pBeaconReq->channelList.numChannels == 0))) {
 		/* Add all the channel in the regulatory domain. */
 		len = mac->mlme_cfg->reg.valid_channel_list_num;
-		if (pSmeRrmContext->channelList.ChannelList) {
-			qdf_mem_free(pSmeRrmContext->channelList.ChannelList);
-			pSmeRrmContext->channelList.ChannelList = NULL;
-		}
-		pSmeRrmContext->channelList.ChannelList = qdf_mem_malloc(len);
-		if (!pSmeRrmContext->channelList.ChannelList) {
-			status = QDF_STATUS_E_NOMEM;
-			goto cleanup;
-		}
-
 		if (pSmeRrmContext->channelList.freq_list) {
 			qdf_mem_free(pSmeRrmContext->channelList.freq_list);
 			pSmeRrmContext->channelList.freq_list = NULL;
@@ -1095,14 +1069,10 @@ QDF_STATUS sme_rrm_process_beacon_report_req_ind(struct mac_context *mac,
 		pSmeRrmContext->channelList.freq_list =
 			qdf_mem_malloc(sizeof(uint32_t) * len);
 		if (!pSmeRrmContext->channelList.freq_list) {
-			qdf_mem_free(pSmeRrmContext->channelList.ChannelList);
-			pSmeRrmContext->channelList.ChannelList = NULL;
 			status = QDF_STATUS_E_NOMEM;
+			pSmeRrmContext->channelList.numOfChannels = 0;
 			goto cleanup;
 		}
-
-		csr_get_cfg_valid_channels(mac, pSmeRrmContext->channelList.
-					ChannelList, &len);
 		csr_get_cfg_valid_freqs(mac,
 					pSmeRrmContext->channelList.freq_list,
 					&len);
@@ -1131,16 +1101,6 @@ QDF_STATUS sme_rrm_process_beacon_report_req_ind(struct mac_context *mac,
 
 		len += pBeaconReq->channelList.numChannels;
 
-		if (pSmeRrmContext->channelList.ChannelList) {
-			qdf_mem_free(pSmeRrmContext->channelList.ChannelList);
-			pSmeRrmContext->channelList.ChannelList = NULL;
-		}
-		pSmeRrmContext->channelList.ChannelList = qdf_mem_malloc(len);
-		if (!pSmeRrmContext->channelList.ChannelList) {
-			status = QDF_STATUS_E_NOMEM;
-			goto cleanup;
-		}
-
 		if (pSmeRrmContext->channelList.freq_list) {
 			qdf_mem_free(pSmeRrmContext->channelList.freq_list);
 			pSmeRrmContext->channelList.freq_list = NULL;
@@ -1148,13 +1108,11 @@ QDF_STATUS sme_rrm_process_beacon_report_req_ind(struct mac_context *mac,
 		pSmeRrmContext->channelList.freq_list =
 			qdf_mem_malloc(sizeof(uint32_t) * len);
 		if (!pSmeRrmContext->channelList.freq_list) {
-			qdf_mem_free(pSmeRrmContext->channelList.ChannelList);
-			pSmeRrmContext->channelList.ChannelList = NULL;
+			pSmeRrmContext->channelList.numOfChannels = 0;
 			status = QDF_STATUS_E_NOMEM;
 			goto cleanup;
 		}
 
-		rrm_chan_list = pSmeRrmContext->channelList.ChannelList;
 		rrm_freq_list = pSmeRrmContext->channelList.freq_list;
 		bcn_chan = pBeaconReq->channelInfo.channelNum;
 
@@ -1162,7 +1120,6 @@ QDF_STATUS sme_rrm_process_beacon_report_req_ind(struct mac_context *mac,
 			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);
@@ -1178,7 +1135,6 @@ QDF_STATUS sme_rrm_process_beacon_report_req_ind(struct mac_context *mac,
 			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);
@@ -1707,13 +1663,10 @@ QDF_STATUS rrm_close(struct mac_context *mac)
 		}
 	}
 
-	if (pSmeRrmContext->channelList.ChannelList) {
-		qdf_mem_free(pSmeRrmContext->channelList.ChannelList);
-		pSmeRrmContext->channelList.ChannelList = NULL;
-	}
 	if (pSmeRrmContext->channelList.freq_list) {
 		qdf_mem_free(pSmeRrmContext->channelList.freq_list);
 		pSmeRrmContext->channelList.freq_list = NULL;
+		pSmeRrmContext->channelList.numOfChannels = 0;
 	}
 
 	qdf_status = qdf_mc_timer_destroy(&pSmeRrmContext->IterMeasTimer);