qcacld-3.0: Replace channel with frequency in unsafe_ch_list

Replace channel ID with frequency in struct unsafe_ch_list.

Change-Id: I4db260127b39d8a30d61d4348f70b1a77ddb9d95
CRs-Fixed: 2540581

components/cmn_services/policy_mgr/src/wlan_policy_mgr_pcl.c

@@ -198,14 +198,13 @@ policy_mgr_reg_chan_change_callback(struct wlan_objmgr_psoc *psoc,
 	 * NUM_CHANNELS and hence the ch_cnt should also not
 	 * exceed NUM_CHANNELS.
 	 */
-	pm_ctx->unsafe_channel_count = avoid_freq_ind->chan_list.ch_cnt >=
+	pm_ctx->unsafe_channel_count = avoid_freq_ind->chan_list.chan_cnt >=
 			NUM_CHANNELS ?
-			NUM_CHANNELS : avoid_freq_ind->chan_list.ch_cnt;
+			NUM_CHANNELS : avoid_freq_ind->chan_list.chan_cnt;
 
 	for (i = 0; i < pm_ctx->unsafe_channel_count; i++)
 		pm_ctx->unsafe_channel_list[i] =
-			wlan_reg_chan_to_freq(
-			pm_ctx->pdev, avoid_freq_ind->chan_list.ch_list[i]);
+			avoid_freq_ind->chan_list.chan_freq_list[i];
 
 	policy_mgr_debug("Channel list update, received %d avoided channels",
 			 pm_ctx->unsafe_channel_count);

core/hdd/src/wlan_hdd_regulatory.c

@@ -1153,6 +1153,7 @@ void hdd_ch_avoid_ind(struct hdd_context *hdd_ctxt,
 {
 	uint16_t *local_unsafe_list;
 	uint16_t local_unsafe_list_count;
+	uint8_t i;
 
 	/* Basic sanity */
 	if (!hdd_ctxt) {
@@ -1177,10 +1178,12 @@ void hdd_ch_avoid_ind(struct hdd_context *hdd_ctxt,
 	qdf_mem_zero(hdd_ctxt->unsafe_channel_list,
 					sizeof(hdd_ctxt->unsafe_channel_list));
 
-	hdd_ctxt->unsafe_channel_count = unsafe_chan_list->ch_cnt;
+	hdd_ctxt->unsafe_channel_count = unsafe_chan_list->chan_cnt;
 
-	qdf_mem_copy(hdd_ctxt->unsafe_channel_list, unsafe_chan_list->ch_list,
-					sizeof(hdd_ctxt->unsafe_channel_list));
+	for (i = 0; i < unsafe_chan_list->chan_cnt; i++) {
+		hdd_ctxt->unsafe_channel_list[i] =
+			wlan_reg_freq_to_chan(hdd_ctxt->pdev, unsafe_chan_list->chan_freq_list[i]);
+	}
 	hdd_debug("number of unsafe channels is %d ",
 	       hdd_ctxt->unsafe_channel_count);