qcacmn: Assign radar table for ETSI12 and ETSI13

Assign appropriate ETSI 302-502 Radar Pattern for ETSI12 and ETSI13.

Change-Id: I87e04f1bda919698c3dcca990a07252a0b881190
CRs-Fixed: 2223516

umac/dfs/core/src/dfs.h

@@ -311,6 +311,8 @@
 
 /* ETSI11_WORLD regdmn pair id */
 #define ETSI11_WORLD_REGDMN_PAIR_ID 0x26
+#define ETSI12_WORLD_REGDMN_PAIR_ID 0x28
+#define ETSI13_WORLD_REGDMN_PAIR_ID 0x27
 
 /* Array offset to ETSI legacy pulse */
 #define ETSI_LEGACY_PULSE_ARR_OFFSET 2

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2016-2017 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2011, 2016-2018 The Linux Foundation. All rights reserved.
  * Copyright (c) 2002-2005 Atheros Communications, Inc.
  * Copyright (c) 2008-2010, Atheros Communications Inc.
  * All Rights Reserved.
@@ -193,8 +193,10 @@ void dfs_get_radars_for_ar5212(struct wlan_dfs *dfs)
 		ch_freq = dfs->dfs_curchan->dfs_ch_freq;
 		regdmn = utils_dfs_get_cur_rd(dfs->dfs_pdev_obj);
 
-		if ((regdmn == ETSI11_WORLD_REGDMN_PAIR_ID) &&
-				DFS_CURCHAN_IS_58GHz(ch_freq)) {
+		if (((regdmn == ETSI11_WORLD_REGDMN_PAIR_ID) ||
+		    (regdmn == ETSI12_WORLD_REGDMN_PAIR_ID) ||
+		    (regdmn == ETSI13_WORLD_REGDMN_PAIR_ID)) &&
+		    DFS_CURCHAN_IS_58GHz(ch_freq)) {
 			rinfo.dfs_radars = ar5212_etsi_radars;
 			rinfo.numradars = QDF_ARRAY_SIZE(ar5212_etsi_radars);
 		} else {

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2016-2017 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2011, 2016-2018 The Linux Foundation. All rights reserved.
  * Copyright (c) 2002-2005 Atheros Communications, Inc.
  * Copyright (c) 2008-2010, Atheros Communications Inc.
  * All Rights Reserved.
@@ -137,8 +137,10 @@ void dfs_get_radars_for_ar5416(struct wlan_dfs *dfs)
 		ch_freq = dfs->dfs_curchan->dfs_ch_freq;
 		regdmn = utils_dfs_get_cur_rd(dfs->dfs_pdev_obj);
 
-		if ((regdmn == ETSI11_WORLD_REGDMN_PAIR_ID) &&
-				DFS_CURCHAN_IS_58GHz(ch_freq)) {
+		if (((regdmn == ETSI11_WORLD_REGDMN_PAIR_ID) ||
+		    (regdmn == ETSI12_WORLD_REGDMN_PAIR_ID) ||
+		    (regdmn == ETSI13_WORLD_REGDMN_PAIR_ID)) &&
+		    DFS_CURCHAN_IS_58GHz(ch_freq)) {
 			rinfo.dfs_radars = ar5416_etsi_radars;
 			rinfo.numradars = QDF_ARRAY_SIZE(ar5416_etsi_radars);
 		} else {

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2016-2017 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2011, 2016-2018 The Linux Foundation. All rights reserved.
  * Copyright (c) 2008-2010, Atheros Communications Inc.
  * All Rights Reserved.
  *
@@ -195,8 +195,10 @@ void dfs_get_radars_for_ar9300(struct wlan_dfs *dfs)
 		ch_freq = dfs->dfs_curchan->dfs_ch_freq;
 		regdmn = utils_dfs_get_cur_rd(dfs->dfs_pdev_obj);
 
-		if ((regdmn == ETSI11_WORLD_REGDMN_PAIR_ID) &&
-				DFS_CURCHAN_IS_58GHz(ch_freq)) {
+		if (((regdmn == ETSI11_WORLD_REGDMN_PAIR_ID) ||
+		    (regdmn == ETSI12_WORLD_REGDMN_PAIR_ID) ||
+		    (regdmn == ETSI13_WORLD_REGDMN_PAIR_ID)) &&
+		    DFS_CURCHAN_IS_58GHz(ch_freq)) {
 			rinfo.dfs_radars = ar9300_etsi_radars;
 			rinfo.numradars = QDF_ARRAY_SIZE(ar9300_etsi_radars);
 		} else {

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

@@ -336,8 +336,10 @@ void dfs_get_po_radars(struct wlan_dfs *dfs)
 		ch_freq = dfs->dfs_curchan->dfs_ch_freq;
 		regdmn = utils_dfs_get_cur_rd(dfs->dfs_pdev_obj);
 
-		if ((regdmn == ETSI11_WORLD_REGDMN_PAIR_ID) &&
-				DFS_CURCHAN_IS_58GHz(ch_freq)) {
+		if (((regdmn == ETSI11_WORLD_REGDMN_PAIR_ID) ||
+		    (regdmn == ETSI12_WORLD_REGDMN_PAIR_ID) ||
+		    (regdmn == ETSI13_WORLD_REGDMN_PAIR_ID)) &&
+		    DFS_CURCHAN_IS_58GHz(ch_freq)) {
 			rinfo.dfs_radars = dfs_etsi_radars;
 			rinfo.numradars = QDF_ARRAY_SIZE(dfs_etsi_radars);
 		} else {