qcacld-3.0: Force SCC changes in non DBS mode

In non DBS mode, force SCC if STA and SAP channels are not same.

CRs-Fixed: 2109798
Change-Id: I421cd3b82c96aa62482c6caee15e6bb077adba1d

core/sme/src/csr/csr_util.c

@@ -1241,8 +1241,9 @@ 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,
+			policy_mgr_is_dbs_enable(mac_ctx->psoc));
 
 	if (intf_ch && sap_ch != intf_ch &&
 	    cc_switch_mode != QDF_MCC_TO_SCC_SWITCH_FORCE &&
@@ -1274,8 +1275,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 (policy_mgr_is_dbs_enable(mac_ctx->psoc))
+				intf_ch = 0;
+		}
 		else if (cc_switch_mode ==
 			QDF_MCC_TO_SCC_SWITCH_WITH_FAVORITE_CHANNEL) {
 			status =