qcacmn: Filter the channel list according to acs cfg

Currently the driver checks whether the DFS channel is
in the range of acs channel list given, i.e the start
and end channel, which is not always correct as the channel
range does not imply that all channels in that range are present.

Fix is to explicitly check for the number of channels, and
compare each channel in the acs channel list with the DFS
channel.

Change-Id: Ib17c5e549a2c62652a6333d5d13ca8ff5a7b1674
CRs-Fixed: 2466228

umac/dfs/core/src/misc/dfs_random_chan_sel.c

@@ -1261,6 +1261,7 @@ static void dfs_apply_rules(struct wlan_dfs *dfs,
 	bool flag_no_5g_chan  = 0;
 	bool flag_no_japan_w53 = 0;
 	int i;
+	bool found = false;
 
 	dfs_debug(dfs, WLAN_DEBUG_DFS_RANDOM_CHAN, "flags %d", flags);
 	flag_no_weather = (dfs_region == DFS_ETSI_REGION_VAL) ?
@@ -1297,15 +1298,22 @@ static void dfs_apply_rules(struct wlan_dfs *dfs,
 			}
 		}
 
-		if (acs_info && (acs_info->acs_mode == 1) &&
-		    ((chan->dfs_ch_ieee < acs_info->start_ch) ||
-		    (chan->dfs_ch_ieee > acs_info->end_ch))) {
-			dfs_debug(dfs, WLAN_DEBUG_DFS_RANDOM_CHAN,
-				  "skip ch %d not in acs range (%d-%d)",
-				  chan->dfs_ch_ieee, acs_info->start_ch,
-				  acs_info->end_ch);
-			continue;
+		if (acs_info && acs_info->acs_mode) {
+			for (i = 0; i < acs_info->num_of_channel; i++) {
+				if (acs_info->channel_list[i] ==
+				    chan->dfs_ch_ieee) {
+					found = true;
+					break;
+				}
+			}
 
+			if (!found) {
+				dfs_debug(dfs, WLAN_DEBUG_DFS_RANDOM_CHAN,
+					  "skip ch %d not in acs range",
+					  chan->dfs_ch_ieee);
+				continue;
+			}
+			found = false;
 		}
 
 		if (flag_no_2g_chan &&

umac/dfs/dispatcher/inc/wlan_dfs_public_struct.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017-2018 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2017-2019 The Linux Foundation. All rights reserved.
  *
  * Permission to use, copy, modify, and/or distribute this software for
  * any purpose with or without fee is hereby granted, provided that the
@@ -56,13 +56,13 @@ struct radar_found_info {
 /**
  * struct dfs_acs_info - acs info, ch range
  * @acs_mode: to enable/disable acs 1/0.
- * @start_ch: start channel number, ignore all channels before.
- * @end_ch: end channel number, ignore all channels after.
+ * @channel_list: channel list in acs config
+ * @num_of_channel: number of channel in ACS channel list
  */
 struct dfs_acs_info {
 	uint8_t acs_mode;
-	uint8_t start_ch;
-	uint8_t end_ch;
+	uint8_t *channel_list;
+	uint8_t num_of_channel;
 };
 
 /**