Revert "Revert WCNSS config and NV items back to MR1.1"

This reverts commit f7d23e005199234d828458cc4e360b563196b943.

Change-Id: If44f9e2c37d5b492697588bc0cfbdcf0a42f47aa
diff --git a/WCNSS_cfg.dat b/WCNSS_cfg.dat
index bf6478c..297b3cd 100755
--- a/WCNSS_cfg.dat
+++ b/WCNSS_cfg.dat
Binary files differ
diff --git a/WCNSS_qcom_cfg.ini b/WCNSS_qcom_cfg.ini
index 81f1536..25dd902 100644
--- a/WCNSS_qcom_cfg.ini
+++ b/WCNSS_qcom_cfg.ini
@@ -61,8 +61,11 @@
 # 2: Filter all Broadcast. 3: Filter all Mcast and Bcast
 McastBcastFilter=3
 
-#Flag to enable HostARPOffload feature or not
-hostArpOffload=0
+# Flag to enable Active mode offload
+gEnableActiveModeOffload=1
+
+# Flag to enable HostARPOffload feature or not
+hostArpOffload=1
 
 #SoftAP Related Parameters
 # AP MAc addr (obsolete)
@@ -200,7 +203,7 @@
 gEnableBypass11d=1
 
 #If set to 0, will not scan DFS channels
-gEnableDFSChnlScan=0
+gEnableDFSChnlScan=1
 
 # Enable logp/SSR
 gEnableLogp=1
@@ -217,5 +220,12 @@
 # Disable channel 165 for Indonesia
 gIgnore_Chan165=1
 
+btcStaticLenLeBt=120000
+btcStaticLenLeWlan=30000
+
+gCountryCodePriority=1
+
+gNumChanCombinedConc=255
+
 END
 # Note: Configuration parser would not read anything past the END marker
diff --git a/WCNSS_qcom_wlan_nv.bin b/WCNSS_qcom_wlan_nv.bin
old mode 100644
new mode 100755
index 34d358f..696bfd9
--- a/WCNSS_qcom_wlan_nv.bin
+++ b/WCNSS_qcom_wlan_nv.bin
Binary files differ