Revert "Revert "mako: disable DFS scan, enable country code from SIM""

This reverts commit e9bdff5e16423a3dc9aeb2ee7b8063efd86b8a83

Change-Id: Iab061b3d3d60e339a79bf5eafb86f62a4ab23f88
diff --git a/WCNSS_qcom_cfg.ini b/WCNSS_qcom_cfg.ini
index a8043e6..12e4fa8 100644
--- a/WCNSS_qcom_cfg.ini
+++ b/WCNSS_qcom_cfg.ini
@@ -203,7 +203,7 @@
 gEnableBypass11d=1
 
 #If set to 0, will not scan DFS channels
-gEnableDFSChnlScan=1
+gEnableDFSChnlScan=0
 
 # Enable logp/SSR
 gEnableLogp=1
@@ -223,6 +223,9 @@
 btcStaticLenLeBt=120000
 btcStaticLenLeWlan=30000
 
+gCountryCodePriority=1
+
+gNumChanCombinedConc=255
 
 END
 # Note: Configuration parser would not read anything past the END marker