summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCNSS_WLAN Service <cnssbldsw@qualcomm.com>2017-09-01 22:47:05 -0700
committerGerrit - the friendly Code Review server <code-review@localhost>2017-09-01 22:47:05 -0700
commit5038ba9ac82dc7546d831c67cfd35c4e72fb62a4 (patch)
treec7371cb445c84ecee2c7b025123041a43e92f86c
parentad31622a6582ea23e18b7466e8f5179de0bba2f4 (diff)
parent3db3e867c00280b10cb6d16f7a6021bd915e6911 (diff)
Merge "qcacld-3.0: Add the DFS MCC check in ACS algorithm" into wlan-cld3.driver.lnx.1.1
-rw-r--r--core/sap/src/sap_ch_select.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/core/sap/src/sap_ch_select.c b/core/sap/src/sap_ch_select.c
index 2b690225a7cd..facb175b371b 100644
--- a/core/sap/src/sap_ch_select.c
+++ b/core/sap/src/sap_ch_select.c
@@ -590,7 +590,8 @@ uint8_t sap_select_preferred_channel_from_channel_list(uint8_t best_chnl,
return SAP_CHANNEL_NOT_SELECTED;
for (i = 0; i < sap_ctx->acs_cfg->ch_list_count; i++) {
- if (sap_ctx->acs_cfg->ch_list[i] == best_chnl) {
+ if ((sap_ctx->acs_cfg->ch_list[i] == best_chnl) &&
+ !(CDS_IS_DFS_CH(best_chnl) && cds_disallow_mcc(best_chnl))) {
QDF_TRACE(QDF_MODULE_ID_SAP,
QDF_TRACE_LEVEL_INFO_HIGH,
"Best channel is: %d",