Merge "wifi: Remove obsolete cfg.ini items" into oc-dr1-dev

WCNSS_qcom_cfg.ini

@@ -11,9 +11,6 @@ Intf1MacAddress=000AF58989FE
 Intf2MacAddress=000AF58989FD
 Intf3MacAddress=000AF58989FC
 
-#Disable DBS for connection but keep DBS for scan
-gDualMacFeatureDisable=2
-
 #Channel Bonding
 gChannelBondingMode5GHz=1
 gChannelBondingMode24GHz=0
@@ -257,10 +254,6 @@ gScanResultAgeCount=1
 #Enable thermal mitigation
 gThermalMitigationEnable=0
 
-#List of Country codes for which 11ac needs to be disabled
-#Each country code must be delimited by comma(,)
-gListOfNon11acCountryCode=RU,UA,ZA
-
 #Maximum Channel time in msec
 gMaxMediumTime=6000
 
@@ -348,20 +341,6 @@ gEnableSuspend=3
 #Enable Power Save offload
 gEnablePowerSaveOffload=2
 
-# Enable Runtime PM Feature.
-# Enabling this feature will put target wow and shutdown pcie link
-# when inactivity is detected in WLAN Driver.
-# This feature is inactive when beaconing interfaces are active with
-# clients associated.
-# 0 - disable
-# 1 - enable
-gRuntimePM=1
-
-# When gRuntimePM is disabled gRuntimeAutoTime won't take effect.
-# The Time is in msec.
-# 100 is min, 10000 is max, 500 is default.
-gRuntimePMDelay=500
-
 #Enable Power saving mechanism Based on Android Framework
 #If set to 0 Driver internally control the Power saving mechanism
 #If set to 1 Android Framwrok control the Power saving mechanism
@@ -443,15 +422,9 @@ McastBcastFilter=3
 #Flag to enable HostARPOffload feature or not
 hostArpOffload=1
 
-#Flag to enable TCPChkSumOffld feature or not
-gEnableTCPChkSumOffld=1
-
 #Flag to enable HostNSOffload feature or not
 hostNSOffload=1
 
-#Flag to enable IPChkSumOffld feature or not
-gEnableIPChecksumOffload=1
-
 # controlling the following offload patterns
 # through ini parameter. Default value is 1
 # to disable set it to zero. ssdp = 0
@@ -617,6 +590,18 @@ gSapSccChanAvoidance=0
 #Enable/Disable Tx beamformee in SAP mode
 gEnableTxBFeeSAP=1
 
+
+
+#Enable/Disable dual MAC feature
+# 0 - enable DBS
+# 1 - disable DBS
+# 2 - disable DBS for connection but keep DBS for scan
+# 3 - disable DBS for connection but keep DBS scan with async
+#     scan policy disabled
+# 4 - enable DBS for connection as well as for scan with async
+#     scan policy disabled
+gDualMacFeatureDisable=2
+
 END
 
 # Note: Configuration parser would not read anything past the END marker