mako: disable DFS scan, enable country code from SIM

Bug: 8725427
Change-Id: Idad2bb1b5a5870386645346f6aa8e1b2d866c1a4
Signed-off-by: Iliyan Malchev <malchev@google.com>
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