From 7f212f7e9268ee0e332967929a4c3e8bdff19e3e Mon Sep 17 00:00:00 2001 From: Jianmin Zhu Date: Tue, 18 Jun 2019 15:41:10 +0800 Subject: [PATCH] qcacld-3.0: Don't override 2nd 2G AP to DFS channel of 1st AP If platform support dbs, 1st AP start on 5G DFS channel, 2nd AP should be able to start on 2G on another MAC, no MCC will happen. If override 2nd AP from 2g channel to 5g, 2nd AP can't start. Change-Id: Icee7a5c432e0b96d71b51685955d820b0f619c8d CRs-Fixed: 2470807 --- core/hdd/src/wlan_hdd_cfg80211.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/core/hdd/src/wlan_hdd_cfg80211.c b/core/hdd/src/wlan_hdd_cfg80211.c index 095683b2f581..c8c9b2e6e23c 100644 --- a/core/hdd/src/wlan_hdd_cfg80211.c +++ b/core/hdd/src/wlan_hdd_cfg80211.c @@ -1835,7 +1835,9 @@ int wlan_hdd_cfg80211_start_acs(struct hdd_adapter *adapter) * calling DFS override */ if (QDF_MCC_TO_SCC_SWITCH_FORCE_PREFERRED_WITHOUT_DISCONNECTION != - mcc_to_scc_switch) { + mcc_to_scc_switch && + !(policy_mgr_is_hw_dbs_capable(hdd_ctx->psoc) && + IS_24G_CH(sap_config->acs_cfg.end_ch))) { status = wlan_hdd_sap_cfg_dfs_override(adapter); if (status < 0) return status;