From 231d7df5d33baecbdfa088f4fd47da43d9668c7e Mon Sep 17 00:00:00 2001 From: Abhijit Pradhan Date: Mon, 30 Apr 2018 13:30:47 +0530 Subject: [PATCH] qcacmn: Add Radartable related changes for ETSI14_WORLD Adjust radartable start offset for ETSI14_WORLD Change-Id: I8d8f1019248c184b4e2a92a3b544be4358793812 CRs-Fixed: 2233349 --- umac/dfs/core/src/dfs.h | 1 + umac/dfs/core/src/filtering/ar5212_radar.c | 3 ++- umac/dfs/core/src/filtering/ar5416_radar.c | 3 ++- umac/dfs/core/src/filtering/ar9300_radar.c | 3 ++- umac/dfs/core/src/filtering/dfs_partial_offload_radar.c | 3 ++- 5 files changed, 9 insertions(+), 4 deletions(-) diff --git a/umac/dfs/core/src/dfs.h b/umac/dfs/core/src/dfs.h index e697a0aa5bcb..86e4573e56b5 100644 --- a/umac/dfs/core/src/dfs.h +++ b/umac/dfs/core/src/dfs.h @@ -313,6 +313,7 @@ #define ETSI11_WORLD_REGDMN_PAIR_ID 0x26 #define ETSI12_WORLD_REGDMN_PAIR_ID 0x28 #define ETSI13_WORLD_REGDMN_PAIR_ID 0x27 +#define ETSI14_WORLD_REGDMN_PAIR_ID 0x29 /* Array offset to ETSI legacy pulse */ #define ETSI_LEGACY_PULSE_ARR_OFFSET 2 diff --git a/umac/dfs/core/src/filtering/ar5212_radar.c b/umac/dfs/core/src/filtering/ar5212_radar.c index bef06cbf8594..e28e154400d5 100644 --- a/umac/dfs/core/src/filtering/ar5212_radar.c +++ b/umac/dfs/core/src/filtering/ar5212_radar.c @@ -195,7 +195,8 @@ void dfs_get_radars_for_ar5212(struct wlan_dfs *dfs) if (((regdmn == ETSI11_WORLD_REGDMN_PAIR_ID) || (regdmn == ETSI12_WORLD_REGDMN_PAIR_ID) || - (regdmn == ETSI13_WORLD_REGDMN_PAIR_ID)) && + (regdmn == ETSI13_WORLD_REGDMN_PAIR_ID) || + (regdmn == ETSI14_WORLD_REGDMN_PAIR_ID)) && DFS_CURCHAN_IS_58GHz(ch_freq)) { rinfo.dfs_radars = ar5212_etsi_radars; rinfo.numradars = QDF_ARRAY_SIZE(ar5212_etsi_radars); diff --git a/umac/dfs/core/src/filtering/ar5416_radar.c b/umac/dfs/core/src/filtering/ar5416_radar.c index 28049c10484f..d6995a0ef815 100644 --- a/umac/dfs/core/src/filtering/ar5416_radar.c +++ b/umac/dfs/core/src/filtering/ar5416_radar.c @@ -139,7 +139,8 @@ void dfs_get_radars_for_ar5416(struct wlan_dfs *dfs) if (((regdmn == ETSI11_WORLD_REGDMN_PAIR_ID) || (regdmn == ETSI12_WORLD_REGDMN_PAIR_ID) || - (regdmn == ETSI13_WORLD_REGDMN_PAIR_ID)) && + (regdmn == ETSI13_WORLD_REGDMN_PAIR_ID) || + (regdmn == ETSI14_WORLD_REGDMN_PAIR_ID)) && DFS_CURCHAN_IS_58GHz(ch_freq)) { rinfo.dfs_radars = ar5416_etsi_radars; rinfo.numradars = QDF_ARRAY_SIZE(ar5416_etsi_radars); diff --git a/umac/dfs/core/src/filtering/ar9300_radar.c b/umac/dfs/core/src/filtering/ar9300_radar.c index a38f49fe9d63..d33f92346d72 100644 --- a/umac/dfs/core/src/filtering/ar9300_radar.c +++ b/umac/dfs/core/src/filtering/ar9300_radar.c @@ -197,7 +197,8 @@ void dfs_get_radars_for_ar9300(struct wlan_dfs *dfs) if (((regdmn == ETSI11_WORLD_REGDMN_PAIR_ID) || (regdmn == ETSI12_WORLD_REGDMN_PAIR_ID) || - (regdmn == ETSI13_WORLD_REGDMN_PAIR_ID)) && + (regdmn == ETSI13_WORLD_REGDMN_PAIR_ID) || + (regdmn == ETSI14_WORLD_REGDMN_PAIR_ID)) && DFS_CURCHAN_IS_58GHz(ch_freq)) { rinfo.dfs_radars = ar9300_etsi_radars; rinfo.numradars = QDF_ARRAY_SIZE(ar9300_etsi_radars); diff --git a/umac/dfs/core/src/filtering/dfs_partial_offload_radar.c b/umac/dfs/core/src/filtering/dfs_partial_offload_radar.c index 6f904b50b317..ece6f510ceb5 100644 --- a/umac/dfs/core/src/filtering/dfs_partial_offload_radar.c +++ b/umac/dfs/core/src/filtering/dfs_partial_offload_radar.c @@ -338,7 +338,8 @@ void dfs_get_po_radars(struct wlan_dfs *dfs) if (((regdmn == ETSI11_WORLD_REGDMN_PAIR_ID) || (regdmn == ETSI12_WORLD_REGDMN_PAIR_ID) || - (regdmn == ETSI13_WORLD_REGDMN_PAIR_ID)) && + (regdmn == ETSI13_WORLD_REGDMN_PAIR_ID) || + (regdmn == ETSI14_WORLD_REGDMN_PAIR_ID)) && DFS_CURCHAN_IS_58GHz(ch_freq)) { rinfo.dfs_radars = dfs_etsi_radars; rinfo.numradars = QDF_ARRAY_SIZE(dfs_etsi_radars);