qcacld-3.0: Skip DFS channels if sta_sap_scc_on_dfs_chan enabled
If sta_sta_sap_scc_on_dfs_chan enabled then SAP is not allowed
on DFS channel in standalone mode. If ACS and sta_sap_scc_on_dfs_chan
are enabled ini then skip the DFS channels from the ACS channel list
CRs-Fixed: 2159816
Change-Id: I396d0c8996f8870de1570ed9932451567f5c77f3
diff --git a/core/sap/src/sap_ch_select.c b/core/sap/src/sap_ch_select.c
index f5cdd0f..5a08ec1 100644
--- a/core/sap/src/sap_ch_select.c
+++ b/core/sap/src/sap_ch_select.c
@@ -595,6 +595,8 @@
uint32_t dfs_master_cap_enabled;
bool include_dfs_ch = true;
uint8_t chan_num;
+ bool sta_sap_scc_on_dfs_chan =
+ policy_mgr_is_sta_sap_scc_allowed_on_dfs_chan(pMac->psoc);
QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_HIGH, "In %s",
__func__);
@@ -654,13 +656,14 @@
continue;
}
- if (include_dfs_ch == false) {
+ if (!include_dfs_ch || sta_sap_scc_on_dfs_chan) {
if (wlan_reg_is_dfs_ch(pMac->pdev, *pChans)) {
chSafe = false;
QDF_TRACE(QDF_MODULE_ID_SAP,
QDF_TRACE_LEVEL_INFO_HIGH,
- "In %s, DFS Ch %d not considered for ACS",
- __func__, *pChans);
+ "In %s, DFS Ch %d not considered for ACS. include_dfs_ch %u, sta_sap_scc_on_dfs_chan %d",
+ __func__, *pChans, include_dfs_ch,
+ sta_sap_scc_on_dfs_chan);
continue;
}
}