From f21b3b64fdc76e3f6a249f0e315ce005ef78914e Mon Sep 17 00:00:00 2001 From: Manishekar Chandrasekaran Date: Mon, 2 May 2016 16:33:55 +0530 Subject: [PATCH] qcacld-3.0: Fix the missing propagation in MCC to SCC switch scenarios Fix the missing propagation while sending channel switch request instead of doing SAP restart. A couple of lines of the change I79e7317219503de0a9957940f3cf7a4e91c7a521 that are missing have been restored. Change-Id: I7f881d4f6793ec8c85e6f4ab41b90fb77d16f828 CRs-Fixed: 1010524 --- core/sme/src/csr/csr_util.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/core/sme/src/csr/csr_util.c b/core/sme/src/csr/csr_util.c index 1a3a2b67d7fb..7e44a7c12371 100644 --- a/core/sme/src/csr/csr_util.c +++ b/core/sme/src/csr/csr_util.c @@ -788,7 +788,9 @@ uint16_t csr_check_concurrent_channel_overlap(tpAniSirGlobal mac_ctx, (intf_hfreq > sap_lfreq && intf_hfreq < sap_hfreq)))) intf_ch = 0; } else if (intf_ch && sap_ch != intf_ch && - cc_switch_mode == QDF_MCC_TO_SCC_SWITCH_FORCE) { + ((cc_switch_mode == QDF_MCC_TO_SCC_SWITCH_FORCE) || + (cc_switch_mode == + QDF_MCC_TO_SCC_SWITCH_FORCE_WITHOUT_DISCONNECTION))) { if (!((intf_ch < 14 && sap_ch < 14) || (intf_ch > 14 && sap_ch > 14))) intf_ch = 0;