summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGanesh Kondabattini <ganeshk@codeaurora.org>2017-09-13 15:16:44 +0530
committersnandini <snandini@codeaurora.org>2017-09-14 05:31:49 -0700
commitc10a2af89aaff4f2284393f5770ac35cb7d206ee (patch)
treef48f67d68c727d92d851312a361a844d0b939eb5
parent15523ef12b7f9f368cdf6b61da150f6efa5bef5b (diff)
qcacld-3.0: Force SCC changes in non DBS mode - 1
In non DBS mode, force SCC if STA and SAP channels are not same. CRs-Fixed: 2109798 Change-Id: I421cd3b82c96aa62482c6caee15e6bb077adba1d
-rw-r--r--core/sme/src/csr/csr_util.c10
1 files changed, 6 insertions, 4 deletions
diff --git a/core/sme/src/csr/csr_util.c b/core/sme/src/csr/csr_util.c
index 36786bed9335..f023ff01be02 100644
--- a/core/sme/src/csr/csr_util.c
+++ b/core/sme/src/csr/csr_util.c
@@ -844,8 +844,8 @@ uint16_t csr_check_concurrent_channel_overlap(tpAniSirGlobal mac_ctx,
}
}
- sme_debug("intf_ch:%d sap_ch:%d cc_switch_mode:%d",
- intf_ch, sap_ch, cc_switch_mode);
+ sme_debug("intf_ch:%d sap_ch:%d cc_switch_mode:%d, dbs:%d",
+ intf_ch, sap_ch, cc_switch_mode, wma_is_dbs_enable());
if (intf_ch && sap_ch != intf_ch &&
cc_switch_mode != QDF_MCC_TO_SCC_SWITCH_FORCE &&
@@ -877,8 +877,10 @@ uint16_t csr_check_concurrent_channel_overlap(tpAniSirGlobal mac_ctx,
(cc_switch_mode ==
QDF_MCC_TO_SCC_SWITCH_WITH_FAVORITE_CHANNEL))) {
if (!((intf_ch <= 14 && sap_ch <= 14) ||
- (intf_ch > 14 && sap_ch > 14)))
- intf_ch = 0;
+ (intf_ch > 14 && sap_ch > 14))) {
+ if (wma_is_hw_dbs_capable())
+ intf_ch = 0;
+ }
else if (cc_switch_mode ==
QDF_MCC_TO_SCC_SWITCH_WITH_FAVORITE_CHANNEL) {
status =