From c91b3875a71ffd91dd80dc062c12a843cb07d9c9 Mon Sep 17 00:00:00 2001 From: Vignesh U Date: Sat, 21 Mar 2020 13:56:30 +0530 Subject: [PATCH] qcacmn: Assign bin5 radars to MKKN DFS domain MKKN domain should detect the bin5 radars of MKK4 DFS domain. Add the bin5 radars to the MKKN domain's bin5 radar table. Change-Id: I0d0fbe91e56f4a290a675832fe4b9974f9afbf0d CRs-Fixed: 2645168 --- .../src/filtering/dfs_partial_offload_radar.c | 48 ++++++++++++------- 1 file changed, 30 insertions(+), 18 deletions(-) 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 24f7dbc3fcf2..9c75eb20980b 100644 --- a/umac/dfs/core/src/filtering/dfs_partial_offload_radar.c +++ b/umac/dfs/core/src/filtering/dfs_partial_offload_radar.c @@ -376,6 +376,34 @@ void dfs_update_radar_info(struct wlan_dfs_radar_tab_info *rinfo, rinfo->numradars += num_ext_radars; } +/** + * dfs_assign_mkk_bin5_radars() - Assign the MKK bin5 radar table + * @rinfo: Pointer to wlan_dfs_radar_tab_info structure. + * @target_type: Target type. + * @tx_ops: target tx ops. + */ +static void +dfs_assign_mkk_bin5_radars(struct wlan_dfs_radar_tab_info *rinfo, + uint32_t target_type, + struct wlan_lmac_if_target_tx_ops *tx_ops) +{ + if (tx_ops->tgt_is_tgt_type_ar900b(target_type) || + tx_ops->tgt_is_tgt_type_ipq4019(target_type)) { + rinfo->b5pulses = dfs_jpn_bin5pulses_ar900b; + rinfo->numb5radars = QDF_ARRAY_SIZE( + dfs_jpn_bin5pulses_ar900b); + } else if (tx_ops->tgt_is_tgt_type_qca9984(target_type) || + tx_ops->tgt_is_tgt_type_qca9888(target_type)) { + rinfo->b5pulses = dfs_jpn_bin5pulses_qca9984; + rinfo->numb5radars = QDF_ARRAY_SIZE + (dfs_jpn_bin5pulses_qca9984); + } else { + rinfo->b5pulses = dfs_jpn_bin5pulses; + rinfo->numb5radars = QDF_ARRAY_SIZE( + dfs_jpn_bin5pulses); + } +} + void dfs_get_po_radars(struct wlan_dfs *dfs) { struct wlan_dfs_radar_tab_info rinfo; @@ -465,30 +493,14 @@ void dfs_get_po_radars(struct wlan_dfs *dfs) rinfo.dfsdomain = DFS_MKKN_DOMAIN; rinfo.dfs_radars = dfs_mkk4_radars; rinfo.numradars = QDF_ARRAY_SIZE(dfs_mkk4_radars); - rinfo.b5pulses = NULL; - rinfo.numb5radars = 0; + dfs_assign_mkk_bin5_radars(&rinfo, target_type, tx_ops); break; case DFS_MKK4_DOMAIN: dfs_info(dfs, WLAN_DEBUG_DFS_ALWAYS, "MKK4 domain"); rinfo.dfsdomain = DFS_MKK4_DOMAIN; rinfo.dfs_radars = dfs_mkk4_radars; rinfo.numradars = QDF_ARRAY_SIZE(dfs_mkk4_radars); - - if (tx_ops->tgt_is_tgt_type_ar900b(target_type) || - tx_ops->tgt_is_tgt_type_ipq4019(target_type)) { - rinfo.b5pulses = dfs_jpn_bin5pulses_ar900b; - rinfo.numb5radars = QDF_ARRAY_SIZE( - dfs_jpn_bin5pulses_ar900b); - } else if (tx_ops->tgt_is_tgt_type_qca9984(target_type) || - tx_ops->tgt_is_tgt_type_qca9888(target_type)) { - rinfo.b5pulses = dfs_jpn_bin5pulses_qca9984; - rinfo.numb5radars = QDF_ARRAY_SIZE - (dfs_jpn_bin5pulses_qca9984); - } else { - rinfo.b5pulses = dfs_jpn_bin5pulses; - rinfo.numb5radars = QDF_ARRAY_SIZE( - dfs_jpn_bin5pulses); - } + dfs_assign_mkk_bin5_radars(&rinfo, target_type, tx_ops); break; default: dfs_info(dfs, WLAN_DEBUG_DFS_ALWAYS, "UNINIT domain");