From 3bea4bb66445d64db50100dc154cfa85cecf2a52 Mon Sep 17 00:00:00 2001 From: bings Date: Wed, 3 Jul 2019 15:32:57 +0800 Subject: qcacld-3.0: Ignore radar detection when g_sta_sap_scc_on_dfs_chan=1 When g_sta_sap_scc_on_dfs_chan=1, TX is blocked if radar is detected. This is not correct. Nothing needs to do if radar is detected when g_sta_sap_scc_on_dfs_chan is set as 1. Change-Id: Ide26ee06ea6dfa3f1dcf356a394e35c2dfa39a5c CRs-Fixed: 2482683 --- core/wma/src/wma_features.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/core/wma/src/wma_features.c b/core/wma/src/wma_features.c index 5ca0ec66cb2e..a3a042689b6b 100644 --- a/core/wma/src/wma_features.c +++ b/core/wma/src/wma_features.c @@ -9743,8 +9743,9 @@ int wma_dfs_indicate_radar(struct ieee80211com *ic, if (!pmac->sap.SapDfsInfo.disable_dfs_ch_switch) wma->dfs_ic->disable_phy_err_processing = true; - if ((ichan->ic_ieee != (wma->dfs_ic->last_radar_found_chan)) || - (pmac->sap.SapDfsInfo.disable_dfs_ch_switch == true)) { + if (!cds_is_sta_sap_scc_allowed_on_dfs_channel() && + ((ichan->ic_ieee != (wma->dfs_ic->last_radar_found_chan)) || + (pmac->sap.SapDfsInfo.disable_dfs_ch_switch == true))) { radar_event = (struct wma_dfs_radar_indication *) qdf_mem_malloc(sizeof(struct wma_dfs_radar_indication)); if (radar_event == NULL) { -- cgit v1.2.3