diff --git a/core/sap/src/sap_fsm.c b/core/sap/src/sap_fsm.c
index f4bad45c4342..9f6faa59f062 100644
--- a/core/sap/src/sap_fsm.c
+++ b/core/sap/src/sap_fsm.c
@@ -1825,9 +1825,9 @@ QDF_STATUS sap_goto_channel_sel(struct sap_context *sap_context,
 		if (num_of_channels != 0) {
 #endif
 
-		req->scan_req.num_chan = num_of_channels;
+		req->scan_req.chan_list.num_chan = num_of_channels;
 		for (i = 0; i < num_of_channels; i++)
-			req->scan_req.chan_list[i] =
+			req->scan_req.chan_list.chan[i].freq =
 				wlan_chan_to_freq(channel_list[i]);
 		sap_context->channelList = channel_list;
 		sap_context->num_of_channel = num_of_channels;
diff --git a/core/sme/src/csr/csr_api_scan.c b/core/sme/src/csr/csr_api_scan.c
index a55a00f1eec9..acb1420186f3 100644
--- a/core/sme/src/csr/csr_api_scan.c
+++ b/core/sme/src/csr/csr_api_scan.c
@@ -4115,12 +4115,12 @@ QDF_STATUS csr_scan_for_ssid(tpAniSirGlobal mac_ctx, uint32_t session_id,
 			if (csr_roam_is_valid_channel(mac_ctx,
 				profile->ChannelInfo.ChannelList[i])) {
 				chan = profile->ChannelInfo.ChannelList[i];
-				req->scan_req.chan_list[num_chan] =
+				req->scan_req.chan_list.chan[num_chan].freq =
 						wlan_chan_to_freq(chan);
 				num_chan++;
 			}
 		}
-		req->scan_req.num_chan = num_chan;
+		req->scan_req.chan_list.num_chan = num_chan;
 	}
 
 	/* Extend it for multiple SSID */
diff --git a/core/sme/src/rrm/sme_rrm.c b/core/sme/src/rrm/sme_rrm.c
index 500a36f3ccdf..2c0cab9fe501 100644
--- a/core/sme/src/rrm/sme_rrm.c
+++ b/core/sme/src/rrm/sme_rrm.c
@@ -792,10 +792,8 @@ static QDF_STATUS sme_rrm_issue_scan_req(tpAniSirGlobal mac_ctx)
 		rrm_scan_timer = (uint64_t)qdf_mc_timer_get_system_time();
 
 		/* set requestType to full scan */
-
-
-		req->scan_req.num_chan = 1;
-		req->scan_req.chan_list[0] =
+		req->scan_req.chan_list.num_chan = 1;
+		req->scan_req.chan_list.chan[0].freq =
 			sme_rrm_ctx->channelList.ChannelList[
 						sme_rrm_ctx->currentIndex];
 		sme_debug("Duration %d On channel %d ",
diff --git a/core/wma/src/wma_scan_roam.c b/core/wma/src/wma_scan_roam.c
index 2e6d3e4996b3..297b30749b53 100644
--- a/core/wma/src/wma_scan_roam.c
+++ b/core/wma/src/wma_scan_roam.c
@@ -456,9 +456,9 @@ QDF_STATUS wma_get_buf_start_scan_cmd(tp_wma_handle wma_handle,
 
 	WMA_LOGD("Num Probes in each ch scan %d", cmd->n_probes);
 	if (scan_req->channelList.numChannels) {
-		cmd->num_chan = scan_req->channelList.numChannels;
+		cmd->chan_list.num_chan = scan_req->channelList.numChannels;
 		for (i = 0; i < scan_req->channelList.numChannels; ++i) {
-			cmd->chan_list[i] =
+			cmd->chan_list.chan[i].freq =
 				cds_chan_to_freq(scan_req->channelList.
 						 channelNumber[i]);
 		}
@@ -563,7 +563,7 @@ QDF_STATUS wma_start_scan(tp_wma_handle wma_handle,
 	scan_id = cmd.scan_id;
 	WMA_LOGD("ActiveDwell %d, PassiveDwell %d, ScanFlags 0x%x NumChan %d",
 		 cmd.dwell_time_active, cmd.dwell_time_passive,
-		 cmd.scan_flags, cmd.num_chan);
+		 cmd.scan_flags, cmd.chan_list.num_chan);
 
 	/* Call the wmi api to request the scan */
 	qdf_status = wmi_unified_scan_start_cmd_send(wma_handle->wmi_handle,
@@ -578,8 +578,6 @@ QDF_STATUS wma_start_scan(tp_wma_handle wma_handle,
 	return QDF_STATUS_SUCCESS;
 
 error1:
-	if (NULL != cmd.chan_list)
-		qdf_mem_free(cmd.chan_list);
 
 	/* Send completion event for only for start scan request */
 	if (msg_type == WMA_START_SCAN_OFFLOAD_REQ) {