diff --git a/wifi/WCNSS_qcom_cfg.ini b/wifi/WCNSS_qcom_cfg.ini
index fd5d8b7..a1b0c64 100644
--- a/wifi/WCNSS_qcom_cfg.ini
+++ b/wifi/WCNSS_qcom_cfg.ini
@@ -36,6 +36,8 @@ gDot11Mode=0
 
 gRoamingTime=0
 
+#yulong add for userspace set channel
+gSapAllowAllChannel=1
 
 # Assigned MAC Addresses - This will be used until NV items are in place
 
@@ -47,15 +49,16 @@ Intf2MacAddress=000AF58989FD
 
 Intf3MacAddress=000AF58989FC
 
-# Set/Clear UAPSD mask
-
-UapsdMask=0
 
 # UAPSD service interval for VO,VI, BE, BK traffic
 
-InfraUapsdVoSrvIntv=20
+InfraUapsdVoSrvIntv=0
+
+InfraUapsdViSrvIntv=0
+
+InfraUapsdBeSrvIntv=0
 
-InfraUapsdViSrvIntv=40
+InfraUapsdBkSrvIntv=0
 
 # Flag to allow STA send AddTspec even when ACM is Off
 gAddTSWhenACMIsOff=1
@@ -143,7 +146,7 @@ WmmIsEnabled=0
 
 # 802.11d support
 
-g11dSupportEnabled=1
+g11dSupportEnabled=0
 
 # CCX Support and fast transition
 CcxEnabled=0
@@ -274,7 +277,7 @@ gAPChannelSelectEndChannel=11
 
 #SOFTAP Channel Range selection Operating band
 
-# 0:2.4GHZ 1: LOW-5GHZ 2:MID-5GHZ 3:HIGH-5GHZ 4: 4.9HZ BAND 5: 5GHZ BAND
+# 0:2.4GHZ 1: LOW-5GHZ 2:MID-5GHZ 3:HIGH-5GHZ 4: 4.9HZ BAND
 
 gAPChannelSelectOperatingBand=0
 
@@ -330,7 +333,7 @@ gEnableLogp=1
 
 # Enable Automatic Tx Power control
 
-gEnableAutomaticTxPowerControl=0
+gEnableAutomaticTxPowerControl=1
 
 # 0 for OLPC 1 for CLPC and SCPC
 gEnableCloseLoop=1
@@ -366,30 +369,6 @@ gEnableDirectedScanOffload=0
 #Default is set to 0 (disable)
 gFlexConnectPowerFactor=0
 
-gVhtChannelWidth=2
-
-# VHT Tx/Rx MCS values
-# Valid values are 0,1,2. If commented out, the default value is 0.
-# 0=MCS0-7, 1=MCS0-8, 2=MCS0-9
-gVhtRxMCS=2
-gVhtTxMCS=2
-
-# Enable Tx beamforming
-gTxBFEnable=1
-
-#Enable/Disable TDLS Feature
-gEnableTDLSSupport=1
-
-#Enable/Disable TDLS Implicit Trigger
-gEnableTDLSImplicitTrigger=0
-
-#Enable/Disable TDLS WMM Mode
-gEnableTDLSWmmMode=1
-
-#Enable/Disable TDLS Buffer Sta
-gEnableTDLSBufferSta=1
-
-
 END
 
 # Note: Configuration parser would not read anything past the END marker
diff --git a/wifi/WCNSS_qcom_wlan_nv.bin b/wifi/WCNSS_qcom_wlan_nv.bin
index d7a13f5..88f18cb 100644
Binary files a/wifi/WCNSS_qcom_wlan_nv.bin and b/wifi/WCNSS_qcom_wlan_nv.bin differ