qcacmn: Revert "qcacmn: Add filters to the MKKN filter table"

This reverts the change
Icf3fecb5c6027ba827cac05dbd43a1a55463209b.

Change-Id: Icb31d211142b84a4fa5cf4f5af84a6a90585059e
CRs-Fixed: 2611421

umac/dfs/core/src/filtering/dfs_partial_offload_radar.c

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2019 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2016-2020 The Linux Foundation. All rights reserved.
  * Copyright (c) 2011, Atheros Communications Inc.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
@@ -104,19 +104,6 @@ static struct dfs_pulse dfs_mkkn_radars[] = {
 	 * New filters shall be added to this tables after proper testing
 	 * and verification.
 	 */
-	/* constant PRF based */
-	/* Type 1 */
-	/* 0.8-5us, 200  300 PRF, 10 pulses */
-	{10, 5,   200,  400, 0,  4,  5,  0,  8, 15, 0,   0, 2, 5, 0, 91},
-	{10, 5,   400,  600, 0,  4,  5,  0,  8, 15, 0,   0, 2, 5, 0, 92},
-	{10, 5,   600,  800, 0,  4,  5,  0,  8, 15, 0,   0, 2, 5, 0, 93},
-	{10, 5,   800, 1000, 0,  4,  5,  0,  8, 15, 0,   0, 2, 5, 0, 94},
-	/* {10, 5,   200, 1000, 0,  6,  5,  0,  8, 15, 0,   0, 2, 5, 33}, */
-
-	/* Type 2 */
-	/* 0.8-15us, 200-1600 PRF, 15 pulses */
-	{15, 15,  200, 1600, 0,  4, 8,  0, 18, 24, 0,   0, 0, 5, 0, 95},
-
 };
 
 /**

umac/dfs/core/src/filtering/dfs_process_radarevent.c

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2016-2019 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2013, 2016-2020 The Linux Foundation. All rights reserved.
  * Copyright (c) 2002-2010, Atheros Communications Inc.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
@@ -47,8 +47,7 @@
 #define DFS_MAX_FREQ_SPREAD            (1375 * 1)
 #define DFS_LARGE_PRI_MULTIPLIER       4
 #define DFS_W53_DEFAULT_PRI_MULTIPLIER 2
-//#define DFS_INVALID_PRI_LIMIT 100  /* should we use 135? */
-#define DFS_INVALID_PRI_LIMIT 15  /* should we use 135? */
+#define DFS_INVALID_PRI_LIMIT 100  /* should we use 135? */
 #define DFS_BIG_SIDX          10000
 
 #define FRAC_PRI_SCORE_ARRAY_SIZE 40
@@ -200,28 +199,6 @@ static void dfs_print_radar_events(struct wlan_dfs *dfs)
 	dfs->dfs_phyerr_freq_max = 0;
 }
 
-/**
- * dfs_get_durmargin() - Find duration margin
- * @rf: Pointer to dfs_filter structure.
- * @durmargin: Duration margin
- */
-static inline void dfs_get_durmargin(struct dfs_filter *rf,
-				     uint32_t *durmargin)
-{
-#define DUR_THRESH 10
-#define LOW_MARGIN 4
-#define HIGH_MARGIN 6
-
-	if (rf->rf_maxdur < DUR_THRESH)
-		*durmargin = LOW_MARGIN;
-	else
-		*durmargin = HIGH_MARGIN;
-
-#undef DUR_THRESH
-#undef LOW_MARGIN
-#undef HIGH_MARGIN
-}
-
 /**
  * dfs_confirm_radar() - This function checks for fractional PRI and jitter in
  * sidx index to determine if the radar is real or not.
@@ -248,12 +225,6 @@ static int dfs_confirm_radar(struct wlan_dfs *dfs,
 	unsigned char max_score = 0;
 	int max_score_index = 0;
 
-	uint32_t min_searchdur = 0xFFFFFFFF;
-	uint32_t max_searchdur = 0x0;
-	uint32_t durmargin = 0;
-	uint32_t this_dur;
-	uint32_t this_deltadur;
-
 	pl = dfs->pulses;
 
 	OS_MEMZERO(scores, sizeof(scores));
@@ -261,8 +232,6 @@ static int dfs_confirm_radar(struct wlan_dfs *dfs,
 
 	pri_margin = dfs_get_pri_margin(dfs, ext_chan_flag,
 			(rf->rf_patterntype == 1));
-	dfs_get_durmargin(rf, &durmargin);
-
 
 	/*
 	 * Look for the entry that matches dl_seq_num_second.
@@ -274,12 +243,6 @@ static int dfs_confirm_radar(struct wlan_dfs *dfs,
 		de = &dl->dl_elems[index];
 		if (dl->dl_seq_num_second == de->de_seq_num)
 			target_ts = de->de_ts - de->de_time;
-
-		if (de->de_dur < min_searchdur)
-			min_searchdur = de->de_dur;
-
-		if (de->de_dur > max_searchdur)
-			max_searchdur = de->de_dur;
 	}
 
 	if (dfs->dfs_debug_mask & WLAN_DEBUG_DFS2) {
@@ -325,10 +288,6 @@ static int dfs_confirm_radar(struct wlan_dfs *dfs,
 		this_diff_ts = pl->pl_elems[next_index].p_time -
 			pl->pl_elems[current_index].p_time;
 
-		this_dur =  pl->pl_elems[next_index].p_dur;
-		this_deltadur = DFS_MIN(DFS_DIFF(this_dur, min_searchdur),
-					DFS_DIFF(this_dur, max_searchdur));
-
 		/* Now update the score for this diff_ts */
 		for (i = 1; i < FRAC_PRI_SCORE_ARRAY_SIZE; i++) {
 			search_bin = dl->dl_search_pri / (i + 1);
@@ -345,8 +304,8 @@ static int dfs_confirm_radar(struct wlan_dfs *dfs,
 			 * search_bin +/- margin.
 			 */
 			if ((this_diff_ts >= (search_bin - pri_margin)) &&
-				(this_diff_ts <= (search_bin + pri_margin)) &&
-				(this_deltadur < durmargin)) {
+					(this_diff_ts <=
+					 (search_bin + pri_margin))) {
 				/*increment score */
 				scores[i]++;
 			}