From 1d78ede2cdf57bd0ac6ff91257e241c3bd4cdc66 Mon Sep 17 00:00:00 2001 From: bings Date: Tue, 10 Jul 2018 17:41:42 +0800 Subject: [PATCH] qcacmn: Skip DFS channels for SAP/GO when station exists Currently DFS channels are skipped for SAP/GO in cds_get_channel_list when ini g_sta_sap_scc_on_dfs_chan is configured as 0. Refine the logic of DFS channels skipping when station exists. Do not select DFS channels for SAP/GO when below cases are both satisfied. 1. Station exists. 2. Ini g_sta_sap_scc_on_dfs_chan is set as 0. Change-Id: I2f082388a662d54968b3c2e95e5713eeffa1b131 CRs-Fixed: 2275724 --- src/wlan_policy_mgr_core.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/wlan_policy_mgr_core.c b/src/wlan_policy_mgr_core.c index 930cfe033d08..a2b754ee4efb 100644 --- a/src/wlan_policy_mgr_core.c +++ b/src/wlan_policy_mgr_core.c @@ -1848,8 +1848,8 @@ QDF_STATUS policy_mgr_get_channel_list(struct wlan_objmgr_psoc *psoc, if ((mode == PM_SAP_MODE) || (mode == PM_P2P_GO_MODE)) { if ((policy_mgr_mode_specific_connection_count(psoc, PM_STA_MODE, - NULL) > 0) || - !sta_sap_scc_on_dfs_chan) { + NULL) > 0) && + (!sta_sap_scc_on_dfs_chan)) { policy_mgr_debug("skip DFS ch from pcl for SAP/Go"); skip_dfs_channel = true; }