From f2a75c0522ea716d5eed2a6a58b1547a39e82491 Mon Sep 17 00:00:00 2001 From: Bala Venkatesh Date: Mon, 11 Jun 2018 15:58:25 +0530 Subject: [PATCH] qcacld-3.0: Allow scanning on DFS channel if sta+sap scc is enabled Allow scanning on DFS channel if sta+sap scc on dfs channel is enabled. CRs-Fixed: 2163490 Change-Id: I7bb94ed211062ff0f0f0ca93c765d51f26e28ce2 --- core/hdd/src/wlan_hdd_scan.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/core/hdd/src/wlan_hdd_scan.c b/core/hdd/src/wlan_hdd_scan.c index 811a394c85fe..94c9c18115de 100644 --- a/core/hdd/src/wlan_hdd_scan.c +++ b/core/hdd/src/wlan_hdd_scan.c @@ -526,7 +526,9 @@ static int __wlan_hdd_cfg80211_scan(struct wiphy *wiphy, con_sap_adapter->session.ap.operating_channel; if (!policy_mgr_is_hw_dbs_capable(hdd_ctx->hdd_psoc) && - wlan_reg_is_dfs_ch(hdd_ctx->hdd_pdev, con_dfs_ch)) { + wlan_reg_is_dfs_ch(hdd_ctx->hdd_pdev, con_dfs_ch) && + !policy_mgr_is_sta_sap_scc_allowed_on_dfs_chan( + hdd_ctx->hdd_psoc)) { /* Provide empty scan result during DFS operation since * scanning not supported during DFS. Reason is * following case: