diff options
| author | Ganesh Kondabattini <ganeshk@codeaurora.org> | 2017-12-31 14:00:28 +0530 |
|---|---|---|
| committer | snandini <snandini@codeaurora.org> | 2018-01-02 00:16:22 -0800 |
| commit | ff8a071bc729c628490c8844be4af80f97dce9df (patch) | |
| tree | d287c559a384b4c27e9c07ce4218e0f71f94b7fa | |
| parent | 324ffa6447341dd1d29abd7876e902a4340ecad0 (diff) | |
qcacld-3.0: Don't skip the scan on 5G channel in DFS case
STA+SAP SCC is allowed on DFS channel if g_sta_sap_scc_on_dfs_chan
enabled in ini file. In this case we can allow the scan on 5G
channels eventhough STA+SAP concurrency is on DFS channel.
CRs-Fixed: 2165429
Change-Id: I27bf0758b5eb56dc476b8527956a31f36e6dbbe5
| -rw-r--r-- | core/sme/src/csr/csr_api_scan.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/core/sme/src/csr/csr_api_scan.c b/core/sme/src/csr/csr_api_scan.c index 831ad0b487c7..d5b8a59cdeae 100644 --- a/core/sme/src/csr/csr_api_scan.c +++ b/core/sme/src/csr/csr_api_scan.c @@ -6594,8 +6594,7 @@ QDF_STATUS csr_scan_copy_request(tpAniSirGlobal mac_ctx, */ if (cds_is_ibss_conn_exist(&channel)) { sme_debug("Conc IBSS exist, channel list will be modified"); - } else if (cds_is_any_dfs_beaconing_session_present(&channel) && - !cds_is_sta_sap_scc_allowed_on_dfs_channel()) { + } else if (cds_is_any_dfs_beaconing_session_present(&channel)) { /* * 1) if agile & DFS scans are supported * 2) if hardware is DBS capable @@ -6603,9 +6602,10 @@ QDF_STATUS csr_scan_copy_request(tpAniSirGlobal mac_ctx, * if all above 3 conditions are true then don't skip any * channel from scan list */ - if (true != wma_is_current_hwmode_dbs() && + if ((true != wma_is_current_hwmode_dbs() && wma_get_dbs_plus_agile_scan_config() && - wma_get_single_mac_scan_with_dfs_config()) + wma_get_single_mac_scan_with_dfs_config()) || + cds_is_sta_sap_scc_allowed_on_dfs_channel()) channel = 0; else sme_debug( |