commit e023cf0e45a595210ba5e7ee2da7acfc3d7ada39
author Vineeta Srivastava <vsrivastava@google.com> Wed May 29 09:43:05 2013 -0700
committer Android Git Automerger <android-git-automerger@android.com> Wed May 29 09:43:05 2013 -0700
tree 1f7b847630723e8066f274fd15a986ec5c838ab4
parent 6201cf14f97c2c756b0b54985f2a1c4cda5e9217
parent 80c023dbe22efc39d5b6edef4b9234bb74b18f9d

am 80c023db: Merge "Revert "Revert "mako: disable DFS scan, enable country code from SIM""" into jb-mr2-dev

* commit '80c023dbe22efc39d5b6edef4b9234bb74b18f9d':
  Revert "Revert "mako: disable DFS scan, enable country code from SIM""

WCNSS_qcom_cfg.ini

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