From bd8b24bbcd148638ddc4be31b0f27ca362ebfdcf Mon Sep 17 00:00:00 2001 From: Liangwei Dong Date: Wed, 5 Sep 2018 23:13:52 -0400 Subject: [PATCH] qcacmn: allow STA SAP SCC on DFS If sta_sap_scc_on_dfs_chan = 1, we allow the SAP on STA's DFS chan. Allow this for DBS chip as well. Change-Id: I115984c0e659ca00f244d7b477daf4ccb3f2ccd2 CRs-Fixed: 2306801 --- src/wlan_policy_mgr_action.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/src/wlan_policy_mgr_action.c b/src/wlan_policy_mgr_action.c index d9be9c19b876..e2295cf93156 100644 --- a/src/wlan_policy_mgr_action.c +++ b/src/wlan_policy_mgr_action.c @@ -1447,6 +1447,12 @@ QDF_STATUS policy_mgr_valid_sap_conc_channel_check( pm_ctx->pdev, channel) || !(policy_mgr_sta_sap_scc_on_lte_coex_chan(psoc) || policy_mgr_is_safe_channel(psoc, channel))) { + if (wlan_reg_is_dfs_ch(pm_ctx->pdev, channel) && + sta_sap_scc_on_dfs_chan) { + policy_mgr_debug("STA SAP SCC is allowed on DFS channel"); + goto update_chan; + } + if (policy_mgr_is_hw_dbs_capable(psoc)) { temp_channel = policy_mgr_get_alternate_channel_for_sap(psoc); @@ -1468,11 +1474,6 @@ QDF_STATUS policy_mgr_valid_sap_conc_channel_check( return QDF_STATUS_E_FAILURE; } } else { - if (wlan_reg_is_dfs_ch(pm_ctx->pdev, channel) && - sta_sap_scc_on_dfs_chan) { - policy_mgr_debug("STA SAP SCC is allowed on DFS channel"); - goto update_chan; - } policy_mgr_warn("Can't have concurrency on %d", channel); return QDF_STATUS_E_FAILURE;