diff --git a/msmnile_au/WCNSS_qcom_cfg_qca6174.ini b/msmnile_au/WCNSS_qcom_cfg_qca6174.ini
index a3f0b05d2ec8e43bf7b698e766820494d4177353..121f30a996b8ded69eab26d8d616441bf7fedc3d 100644
--- a/msmnile_au/WCNSS_qcom_cfg_qca6174.ini
+++ b/msmnile_au/WCNSS_qcom_cfg_qca6174.ini
@@ -11,18 +11,11 @@ gEnableImps=1
 gEnableBmps=1
 
 # Phy Mode (auto, b, g, n, etc)
-# Valid values are 0-9, with 0 = Auto, 4 = 11n, 9 = 11ac
-# 1 = 11abg, 2 = 11b, 3 = 11g, 5 = 11g only, 6 = 11n only
-# 7 = 11b only 8 = 11ac only.
+#  Valid values are 0-9, with 0 = Auto, 4 = 11n, 9 = 11ac
+#  1 = 11abg, 2 = 11b, 3 = 11g, 5 = 11g only, 6 = 11n only
+#  7 = 11b only 8 = 11ac only.
 gDot11Mode=0
 
-# Assigned MAC Addresses - This will be used until NV items are in place
-# Each byte of MAC address is represented in Hex format as XX
-Intf0MacAddress=000AF58989FF
-Intf1MacAddress=000AF58989FE
-Intf2MacAddress=000AF58989FD
-Intf3MacAddress=000AF58989FC
-
 # UAPSD service interval for VO,VI, BE, BK traffic
 InfraUapsdVoSrvIntv=0
 InfraUapsdViSrvIntv=0
@@ -32,24 +25,27 @@ InfraUapsdBkSrvIntv=0
 # Flag to allow STA send AddTspec even when ACM is Off
 gAddTSWhenACMIsOff=1
 
-# Flags to filter Mcast and Bcast RX packets.
-# Value 0: No filtering, 1: Filter all Multicast.
-# 2: Filter all Broadcast. 3: Filter all Mcast abd Bcast
+# Flags to filter Mcast abd Bcast RX packets.
+#  Value 0: No filtering, 1: Filter all Multicast.
+#  2: Filter all Broadcast. 3: Filter all Mcast abd Bcast
 McastBcastFilter=3
 
-#Flag to enable HostARPOffload feature or not
+# Flag to enable HostARPOffload feature or not
 hostArpOffload=1
 
-#Flag to enable HostNSOffload feature or not
+# Flag to enable HostNSOffload feature or not
 hostNSOffload=1
 
+# This flag enables IP, TCP and UDP checksum offload
+gEnableIpTcpUdpChecksumOffload=1
+
 # 802.11n Protection flag
 gEnableApProt=1
 
-#Enable OBSS protection
+# Enable OBSS protection
 gEnableApOBSSProt=1
 
-#Enable/Disable UAPSD for SoftAP
+# Enable/Disable UAPSD for SoftAP
 gEnableApUapsd=1
 
 # Fixed Rate
@@ -71,7 +67,7 @@ gDisableIntraBssFwd=0
 WmmIsEnabled=0
 
 # 802.11d support
-g11dSupportEnabled=0
+g11dSupportEnabled=1
 
 # 802.11h support
 g11hSupportEnabled=1
@@ -80,98 +76,133 @@ g11hSupportEnabled=1
 gEnableDFSMasterCap=1
 
 # ESE Support and fast transition
-EseEnabled=0
+EseEnabled=1
 
+# Enable/disable implicit QOS
 ImplicitQosIsEnabled=0
 
+# Set neighbor scan timer period
 gNeighborScanTimerPeriod=200
+
+# Set neighbor lookup threshold
 gNeighborLookupThreshold=76
+
+# Set neighbor reassoc threshold
+gNeighborReassocThreshold=81
+
+# Set neighbor scan channel MIN/MAX time
 gNeighborScanChannelMinTime=20
 gNeighborScanChannelMaxTime=30
+
+# Set max neighbor req tries
 gMaxNeighborReqTries=3
 
 # Legacy (non-ESE, non-802.11r) Fast Roaming Support
-# To enable, set FastRoamEnabled=1
-# To disable, set FastRoamEnabled=0
+#  To enable, set FastRoamEnabled=1
+#  To disable, set FastRoamEnabled=0
 FastRoamEnabled=1
 
-# Check if the AP to which we are roaming is better than current AP in
-# terms of RSSI.  Checking is disabled if set to Zero.Otherwise it will
-# use this value as to how better the RSSI of the new/roamable AP should
-# be for roaming
-RoamRssiDiff=5
+# Check if the AP to which we are roaming is better than current AP in terms of RSSI.
+# Checking is disabled if set to Zero.Otherwise it will use this value as to how better
+# the RSSI of the new/roamable AP should be for roaming
+RoamRssiDiff=3
 
 # To enable, set gRoamIntraBand=1 (Roaming within band)
 # To disable, set gRoamIntraBand=0 (Roaming across band)
 gRoamIntraBand=0
 
-#Short Guard Interval Enable/disable
+# Short Guard Interval Enable/disable
 gShortGI20Mhz=1
 gShortGI40Mhz=1
 
-#Auto Shutdown  Value in seconds. A value of 0 means Auto shutoff is disabled
+# Auto Shutdown  Value in seconds. A value of 0 means Auto shutoff is disabled
 gAPAutoShutOff=0
 
-#Auto Shutdown wlan : Value in Seconds. 0 means disabled. Max 1 day = 86400 sec
-gWlanAutoShutdown = 0
+# Auto Shutdown wlan : Value in Seconds. 0 means disabled. Max 1 day = 86400 sec
+gWlanAutoShutdown=0
 
 # Not used.
 gApAutoChannelSelection=0
 
-#Preferred band (both or 2.4 only or 5 only)
+# Preferred band (both or 2.4 only or 5 only)
 BandCapability=0
 
-#Channel Bonding
+# Channel Bonding
 gChannelBondingMode5GHz=1
 
-#Say gGoKeepAlivePeriod(5 seconds) and gGoLinkMonitorPeriod(10 seconds).
-#For every 10 seconds DUT send Qos Null frame(i.e., Keep Alive frame if link
-#is idle for last 10 seconds.) For both active and power save clients.
-
-#Power save clients: DUT set TIM bit from 10th second onwards and till client
-#honors TIM bit. If doesn't honor for 5 seconds then DUT remove client.
-
-#Active clients: DUT send Qos Null frame for 10th seconds onwards if it is not
-#success still we try on 11th second if not tries on 12th and so on till 15th
-#second. Hence before disconnection DUT will send 5 NULL frames. Hence in any
-#case DUT will detect client got removed in (10+5) seconds.
-#i.e., (gGoKeepAlivePeriod + gGoLinkMonitorPeriod)..
-
-#gGoLinkMonitorPeriod/ gApLinkMonitorPeriod is period where link is idle and
-#it is period where we send NULL frame.
-#gApLinkMonitorPeriod = 10
-#gGoLinkMonitorPeriod = 10
-
-#gGoKeepAlivePeriod/gApKeepAlivePeriod is time to spend to check whether frame
-#are succeed to send or not. Hence total effective detection time is
-# (gGoLinkMonitorPeriod + gGoKeepAlivePeriod) /
-# (gApLinkMonitorPeriod + gApKeepAlivePeriod)
+# Enable Keep alive with non-zero period value
+gStaKeepAlivePeriod = 30
+
+# Say gGoKeepAlivePeriod(5 seconds) and gGoLinkMonitorPeriod(10 seconds).
+# For every 10 seconds DUT send Qos Null frame(i.e., Keep Alive frame if link is idle for last 10 seconds.)
+# For both active and power save clients.
+# Power save clients: DUT set TIM bit from 10th second onwards and till client honors TIM bit.
+# If doesn't honor for 5 seconds then DUT remove client.
+# Active clients: DUT send Qos Null frame for 10th seconds onwards if it is not success still we try on
+# 11th second if not tries on 12th and so on till 15th second. Hence before disconnection DUT will send 5 NULL frames.
+# Hence in any case DUT will detect client got removed in (10+5) seconds. i.e., (gGoKeepAlivePeriod + gGoLinkMonitorPeriod)..
+# gGoLinkMonitorPeriod/ gApLinkMonitorPeriod is period where link is idle and it is period
+# where we send NULL frame.
+# gApLinkMonitorPeriod = 10
+# gGoLinkMonitorPeriod = 10
+
+# gGoKeepAlivePeriod/gApKeepAlivePeriod is time to spend to check whether frame are succeed to send or not.
+# Hence total effective detection time is gGoLinkMonitorPeriod+ gGoKeepAlivePeriod/gApLinkMonitorPeriod+ gApKeepAlivePeriod.
 gGoKeepAlivePeriod = 20
 gApKeepAlivePeriod = 20
 
-#If set will start with active scan after driver load, otherwise will start with
-#passive scan to find out the domain
+# If set will start with active scan after driver load, otherwise will start with
+# passive scan to find out the domain
 gEnableBypass11d=1
 
-#If set to 0, will not scan DFS channels
+# If set to 0, will not scan DFS channels
 gEnableDFSChnlScan=1
 
 # Enable DFS channel roam
-# 0: DISABLE, 1: ENABLED_NORMAL, 2: ENABLED_ACTIVE
+#  0: DISABLE, 1: ENABLED_NORMAL, 2: ENABLED_ACTIVE
 gAllowDFSChannelRoam=1
 
+# Channel width capability for 11ac
 gVhtChannelWidth=2
 
 #Data Inactivity Timeout when in powersave (in ms)
 gDataInactivityTimeout=200
 
+# 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
+
+# VHT Tx/Rx MCS values for 2x2
+# Valid values are 0,1,2. If commented out, the default value is 0.
+#  0=MCS0-7, 1=MCS0-8, 2=MCS0-9
+gEnable2x2=1
+gVhtRxMCS2x2=2
+gVhtTxMCS2x2=2
+
 # Set txchainmask and rxchainmask
 # These parameters are used only if gEnable2x2 is 0
 # Valid values are 1,2
 # Set gSetTxChainmask1x1=1 or gSetRxChainmask1x1=1 to select chain0.
 # Set gSetTxChainmask1x1=2 or gSetRxChainmask1x1=2 to select chain1.
-gSetTxChainmask1x1=1
-gSetRxChainmask1x1=1
+gSetTxChainmask1x1=0
+gSetRxChainmask1x1=0
+
+# Chain mask for 2G and 5G
+rx_chain_mask_5g=3
+tx_chain_mask_5g=3
+rx_chain_mask_2g=2
+tx_chain_mask_2g=2
+
+# This ini disables/enables chainmask setting on 2x2, mainly used for ROME
+# BT/WLAN chainmask assignment.
+# 0, Disable
+# 1, Enable
+enableBTChainSeparation=0
+
+# Dual mac disable
+gDualMacFeatureDisable=1
 
 # Scan Timing Parameters
 # gPassiveMaxChannelTime=110
@@ -183,13 +214,13 @@ gActiveMinChannelTime=20
 gEnableMCCMode=1
 
 # MCC to SCC Switch mode:
-# 0-Disable
-# 1-Enable
-# 2-Force SCC if same band, with SAP restart
-# 3-Force SCC if same band, without SAP restart by sending (E)CSA
-# 4-Force SCC if same band (or) use SAP mandatory channel for DBS,
-#   without SAP restart by sending (E)CSA
-gWlanMccToSccSwitchMode = 0
+#  0-Disable
+#  1-not supported
+#  2-not supported
+#  3-Force SCC if same MAC, without SAP restart by sending (E)CSA
+#  4-Force SCC if same MAC (or) use SAP mandatory channel for DBS,
+#    without SAP restart by sending (E)CSA
+gWlanMccToSccSwitchMode=0
 
 # 1=enable STBC; 0=disable STBC
 gEnableRXSTBC=1
@@ -200,34 +231,38 @@ gEnableTXSTBC=1
 # 1=enable rx LDPC; 0=disable
 gEnableRXLDPC=1
 
-#Enable/Disable Tx beamforming
+# Enable/Disable Tx beamforming
 gTxBFEnable=1
 
-#Enable/Disable Tx beamformee in SAP mode
+# Enable/Disable Tx beamformee in SAP mode
 gEnableTxBFeeSAP=1
 
 # Enable Tx beamforming in VHT20MHz
 # Valid values are 0,1. If commented out, the default value is 0.
-# 0=disable, 1=enable
+#  0=disable, 1=enable
 gEnableTxBFin20MHz=1
 
-#Enable/Disable SU Tx beamformer support.
+# Enable/Disable SU Tx beamformer support.
 gEnableTxSUBeamformer=1
 
+# Enable thermal mitigation
+gThermalMitigationEnable=0
+
+# Enable LFR roaming on STA during concurrency
 gEnableFastRoamInConcurrency=1
 
-#Maxium Channel time in msec
+# Maximum Channel time in msec
 gMaxMediumTime = 6000
 
 # 802.11K support
 gRrmEnable=1
 
-#Enable Power Save offload
-gEnablePowerSaveOffload=2
-
-#Enable firmware uart print
+# Enable firmware uart print
 gEnablefwprint=0
 
+# Enable Power Save offload
+gEnablePowerSaveOffload=1
+
 # Firmware log mode
 # Valid values are 0,1,2
 # 0=Disable, 1=WMI, 2=DIAG
@@ -256,16 +291,16 @@ gVhtMpduLen=2
 # 1=Enable (default), 0=Disable
 gEnableMCCAdaptiveScheduler=1
 
-#Enable or Disable p2p device address administered
+# Enable or Disable p2p device address administered
 isP2pDeviceAddrAdministrated=0
 
 # Remove Overlap channel restriction
 gEnableOverLapCh=0
 
-#Enable VHT on 2.4Ghz
-gEnableVhtFor24GHzBand=1
+# Enable or Disable 5G early beacon termination
+gEnable5gEBT=1
 
-#Maximum number of offload peers supported
+# Maximum number of offload peers supported
 # gMaxOffloadPeers=2
 
 # controlling the following offload patterns
@@ -275,7 +310,7 @@ gEnableVhtFor24GHzBand=1
 # SSDP 239.255.255.250 and LLMNR 224.0.0.252
 ssdp=0
 
-#Enable Memory Deep Sleep
+# Enable Memory Deep Sleep
 gEnableMemDeepSleep=1
 
 # Regulatory Setting; 0=STRICT; 1=CUSTOM
@@ -299,9 +334,12 @@ gDFSradarMappingPriMultiplier=4
 
 gPNOScanSupport=1
 
-#Enable/Disable LPASS support
-# 0 to disable, 1 to enable
-gEnableLpassSupport=1
+# Enable/Disable RX full reorder offload
+gReorderOffloadSupported=1
+
+# Enable/Disable LPASS support
+#  0 to disable, 1 to enable
+gEnableLpassSupport=0
 
 # Whether userspace country code setting shld have priority
 gCountryCodePriority=1
@@ -324,7 +362,7 @@ gIbssTxSpEndInactivityTime=10
 # Enable support for TDLS
 #  0 - disable
 #  1 - enable
-gEnableTDLSSupport=1
+gEnableTDLSSupport=0
 
 # Enable support for Implicit Trigger of TDLS. That is, wlan driver shall
 # initiate TDLS Discovery towards a peer whenever setup criteria (throughput
@@ -354,9 +392,13 @@ gTDLSExternalControl=1
 gEnableTDLSOffChannel=1
 
 # Enable or Disable Random MAC (Spoofing)
-# 1=Enable (default), 0=Disable
+#  1=Enable, 0=Disable (default:1)
 gEnableMacAddrSpoof=1
 
+# Interface change wait time in ms - the timeout to shutdown device
+# if interface is not brought up after loading driver module
+gInterfaceChangeWait=5000
+
 ################ Datapath feature set Begin ################
 # Bus bandwidth threshold values in terms of number of packets
 gBusBandwidthHighThreshold=2000
@@ -366,19 +408,6 @@ gBusBandwidthLowThreshold=150
 # Bus bandwidth compute timeout value in ms
 gBusBandwidthComputeInterval=100
 
-# 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
-
-# VHT Tx/Rx MCS values for 2x2
-# Valid values are 0,1,2. If commented out, the default value is 0.
-# 0=MCS0-7, 1=MCS0-8, 2=MCS0-9
-gEnable2x2=1
-gVhtRxMCS2x2=2
-gVhtTxMCS2x2=2
-
 #IPA config is a bit mask and following are the configurations.
 #bit0 IPA Enable
 #bit1 IPA PRE Filter enable
@@ -388,7 +417,7 @@ gVhtTxMCS2x2=2
 #bit5 IPA uC ENABLE
 #bit6 IPA uC STA ENABLE
 #bit8 IPA Real Time Debugging
-gIPAConfig=0x7d
+gIPAConfig=0
 gIPADescSize=800
 
 # Enable/Disable RX full reorder offload
@@ -398,9 +427,11 @@ gReorderOffloadSupported=1
 # 1 - enable(default)  0 - disable
 gCEClassifyEnable=1
 
-# Enable Rx handling options
-# Rx_thread=1 RPS=2(default for ROME) NAPI=4(default for ihelium)
-rx_mode=5
+# rx mode configuration
+rx_mode=13
+
+# RX queue RPS CPU mask
+rpsRxQueueCpuMapList=e0
 
 # Enable(Tx) fastpath for data traffic.
 # 1 - enable(default)  0 - disable
@@ -414,59 +445,43 @@ gEnableIpTcpUdpChecksumOffload=1
 # 1 - enable  0 - disable
 TSOEnable=1
 
-# Enable Generic Receive Offload
+# Enable Large Receive Offload
 # 1 - enable(default)  0 - disable
-GROEnable=1
-
-# Enable HT MPDU Density
-# 4 for 2 micro sec
-ght_mpdu_density=4
+LROEnable=1
 
-# Enable flow steering to enable multiple CEs for Rx flows.
-# Multiple Rx CEs<==>Multiple Rx IRQs<==>probably different CPUs.
-# Parallel Rx paths.
-# 1 - enable 0 - disable(default)
-gEnableFlowSteering=1
-
-# Time in microseconds after which a NAPI poll must yield
-ce_service_max_yield_time=500
-
-#Maximum number of HTT messages to be processed per NAPI poll
-ce_service_max_rx_ind_flush=1
-
-# Maximum number of MSDUs the firmware will pack in one HTT_T2H_MSG_TYPE_RX_IN_ORD_PADDR_IND
-maxMSDUsPerRxInd=8
-
-# Enable NUD tracking feature
-# 1 - enable 0 - disable(default)
-gEnableNUDTracking=1
 ################ Datapath feature set End ################
 
-################ NAN feature set start ###################
-
 # Enable NAN discovery (NAN 1.0)
-# 1 - enable  0 - disable(default)
+#  1 - enable(default)  0 - disable
 gEnableNanSupport=1
-# Enable NAN Datapath
-genable_nan_datapath=1
 
-################ NAN feature set end #####################
+# Enables/disables tx chain Mask1ss
+gTxChainMask1ss=0
 
-adaptive_dwell_mode_enabled=1
+# Enable cck chain mask
+gCckChainMaskEnable=1
 
-hostscan_adaptive_dwell_mode=1
+# Set the self gen power value
+gSelfGenFrmPwr=3
 
-adapt_dwell_lpf_weight=80
+# Disable reg offload feature
+enable_reg_offload=0
 
-adapt_dwell_wifi_act_threshold=10
+# Enable DFS phyerrors filtering offload
+dfsPhyerrFilterOffload=1
 
-MAWCEnabled=0
+# Enable fw log
+gEnablefwlog=1
+gFwDebugModuleLoglevel=1,0,2,0,4,0,5,0,6,0,7,4,8,0,9,0,11,0,13,0,17,0,18,0,19,0,27,0,29,0,31,0,35,0,36,0,38,0
 
-# Enable/Disable rtt sta mac randomization
-enable_rtt_mac_randomization=1
+# TX flow control for MCC
+TxHbwFlowLowWaterMark=200
+TxHbwFlowHighWaterMarkOffset=94
+TxLbwFlowLowWaterMark=450
+TxLbwFlowHighWaterMarkOffset=50
 
-#Enable/Disable SNR monitoring
-gEnableSNRMonitoring=1
+# Enable orphan for TCP TX
+gEnableTxOrphan=1
 
 gInterfaceChangeWait=20
 
diff --git a/sdmshrike_au/WCNSS_qcom_cfg_qca6174.ini b/sdmshrike_au/WCNSS_qcom_cfg_qca6174.ini
index 04cbf56e83481c4fadad7cab8a0966bf19dd94b2..121f30a996b8ded69eab26d8d616441bf7fedc3d 100644
--- a/sdmshrike_au/WCNSS_qcom_cfg_qca6174.ini
+++ b/sdmshrike_au/WCNSS_qcom_cfg_qca6174.ini
@@ -11,18 +11,11 @@ gEnableImps=1
 gEnableBmps=1
 
 # Phy Mode (auto, b, g, n, etc)
-# Valid values are 0-9, with 0 = Auto, 4 = 11n, 9 = 11ac
-# 1 = 11abg, 2 = 11b, 3 = 11g, 5 = 11g only, 6 = 11n only
-# 7 = 11b only 8 = 11ac only.
+#  Valid values are 0-9, with 0 = Auto, 4 = 11n, 9 = 11ac
+#  1 = 11abg, 2 = 11b, 3 = 11g, 5 = 11g only, 6 = 11n only
+#  7 = 11b only 8 = 11ac only.
 gDot11Mode=0
 
-# Assigned MAC Addresses - This will be used until NV items are in place
-# Each byte of MAC address is represented in Hex format as XX
-Intf0MacAddress=000AF58989FF
-Intf1MacAddress=000AF58989FE
-Intf2MacAddress=000AF58989FD
-Intf3MacAddress=000AF58989FC
-
 # UAPSD service interval for VO,VI, BE, BK traffic
 InfraUapsdVoSrvIntv=0
 InfraUapsdViSrvIntv=0
@@ -32,24 +25,27 @@ InfraUapsdBkSrvIntv=0
 # Flag to allow STA send AddTspec even when ACM is Off
 gAddTSWhenACMIsOff=1
 
-# Flags to filter Mcast and Bcast RX packets.
-# Value 0: No filtering, 1: Filter all Multicast.
-# 2: Filter all Broadcast. 3: Filter all Mcast abd Bcast
+# Flags to filter Mcast abd Bcast RX packets.
+#  Value 0: No filtering, 1: Filter all Multicast.
+#  2: Filter all Broadcast. 3: Filter all Mcast abd Bcast
 McastBcastFilter=3
 
-#Flag to enable HostARPOffload feature or not
+# Flag to enable HostARPOffload feature or not
 hostArpOffload=1
 
-#Flag to enable HostNSOffload feature or not
+# Flag to enable HostNSOffload feature or not
 hostNSOffload=1
 
+# This flag enables IP, TCP and UDP checksum offload
+gEnableIpTcpUdpChecksumOffload=1
+
 # 802.11n Protection flag
 gEnableApProt=1
 
-#Enable OBSS protection
+# Enable OBSS protection
 gEnableApOBSSProt=1
 
-#Enable/Disable UAPSD for SoftAP
+# Enable/Disable UAPSD for SoftAP
 gEnableApUapsd=1
 
 # Fixed Rate
@@ -71,7 +67,7 @@ gDisableIntraBssFwd=0
 WmmIsEnabled=0
 
 # 802.11d support
-g11dSupportEnabled=0
+g11dSupportEnabled=1
 
 # 802.11h support
 g11hSupportEnabled=1
@@ -80,98 +76,133 @@ g11hSupportEnabled=1
 gEnableDFSMasterCap=1
 
 # ESE Support and fast transition
-EseEnabled=0
+EseEnabled=1
 
+# Enable/disable implicit QOS
 ImplicitQosIsEnabled=0
 
+# Set neighbor scan timer period
 gNeighborScanTimerPeriod=200
+
+# Set neighbor lookup threshold
 gNeighborLookupThreshold=76
+
+# Set neighbor reassoc threshold
+gNeighborReassocThreshold=81
+
+# Set neighbor scan channel MIN/MAX time
 gNeighborScanChannelMinTime=20
 gNeighborScanChannelMaxTime=30
+
+# Set max neighbor req tries
 gMaxNeighborReqTries=3
 
 # Legacy (non-ESE, non-802.11r) Fast Roaming Support
-# To enable, set FastRoamEnabled=1
-# To disable, set FastRoamEnabled=0
+#  To enable, set FastRoamEnabled=1
+#  To disable, set FastRoamEnabled=0
 FastRoamEnabled=1
 
-# Check if the AP to which we are roaming is better than current AP in
-# terms of RSSI.  Checking is disabled if set to Zero.Otherwise it will
-# use this value as to how better the RSSI of the new/roamable AP should
-# be for roaming
-RoamRssiDiff=5
+# Check if the AP to which we are roaming is better than current AP in terms of RSSI.
+# Checking is disabled if set to Zero.Otherwise it will use this value as to how better
+# the RSSI of the new/roamable AP should be for roaming
+RoamRssiDiff=3
 
 # To enable, set gRoamIntraBand=1 (Roaming within band)
 # To disable, set gRoamIntraBand=0 (Roaming across band)
 gRoamIntraBand=0
 
-#Short Guard Interval Enable/disable
+# Short Guard Interval Enable/disable
 gShortGI20Mhz=1
 gShortGI40Mhz=1
 
-#Auto Shutdown  Value in seconds. A value of 0 means Auto shutoff is disabled
+# Auto Shutdown  Value in seconds. A value of 0 means Auto shutoff is disabled
 gAPAutoShutOff=0
 
-#Auto Shutdown wlan : Value in Seconds. 0 means disabled. Max 1 day = 86400 sec
-gWlanAutoShutdown = 0
+# Auto Shutdown wlan : Value in Seconds. 0 means disabled. Max 1 day = 86400 sec
+gWlanAutoShutdown=0
 
 # Not used.
 gApAutoChannelSelection=0
 
-#Preferred band (both or 2.4 only or 5 only)
+# Preferred band (both or 2.4 only or 5 only)
 BandCapability=0
 
-#Channel Bonding
+# Channel Bonding
 gChannelBondingMode5GHz=1
 
-#Say gGoKeepAlivePeriod(5 seconds) and gGoLinkMonitorPeriod(10 seconds).
-#For every 10 seconds DUT send Qos Null frame(i.e., Keep Alive frame if link
-#is idle for last 10 seconds.) For both active and power save clients.
-
-#Power save clients: DUT set TIM bit from 10th second onwards and till client
-#honors TIM bit. If doesn't honor for 5 seconds then DUT remove client.
-
-#Active clients: DUT send Qos Null frame for 10th seconds onwards if it is not
-#success still we try on 11th second if not tries on 12th and so on till 15th
-#second. Hence before disconnection DUT will send 5 NULL frames. Hence in any
-#case DUT will detect client got removed in (10+5) seconds.
-#i.e., (gGoKeepAlivePeriod + gGoLinkMonitorPeriod)..
-
-#gGoLinkMonitorPeriod/ gApLinkMonitorPeriod is period where link is idle and
-#it is period where we send NULL frame.
-#gApLinkMonitorPeriod = 10
-#gGoLinkMonitorPeriod = 10
-
-#gGoKeepAlivePeriod/gApKeepAlivePeriod is time to spend to check whether frame
-#are succeed to send or not. Hence total effective detection time is
-# (gGoLinkMonitorPeriod + gGoKeepAlivePeriod) /
-# (gApLinkMonitorPeriod + gApKeepAlivePeriod)
+# Enable Keep alive with non-zero period value
+gStaKeepAlivePeriod = 30
+
+# Say gGoKeepAlivePeriod(5 seconds) and gGoLinkMonitorPeriod(10 seconds).
+# For every 10 seconds DUT send Qos Null frame(i.e., Keep Alive frame if link is idle for last 10 seconds.)
+# For both active and power save clients.
+# Power save clients: DUT set TIM bit from 10th second onwards and till client honors TIM bit.
+# If doesn't honor for 5 seconds then DUT remove client.
+# Active clients: DUT send Qos Null frame for 10th seconds onwards if it is not success still we try on
+# 11th second if not tries on 12th and so on till 15th second. Hence before disconnection DUT will send 5 NULL frames.
+# Hence in any case DUT will detect client got removed in (10+5) seconds. i.e., (gGoKeepAlivePeriod + gGoLinkMonitorPeriod)..
+# gGoLinkMonitorPeriod/ gApLinkMonitorPeriod is period where link is idle and it is period
+# where we send NULL frame.
+# gApLinkMonitorPeriod = 10
+# gGoLinkMonitorPeriod = 10
+
+# gGoKeepAlivePeriod/gApKeepAlivePeriod is time to spend to check whether frame are succeed to send or not.
+# Hence total effective detection time is gGoLinkMonitorPeriod+ gGoKeepAlivePeriod/gApLinkMonitorPeriod+ gApKeepAlivePeriod.
 gGoKeepAlivePeriod = 20
 gApKeepAlivePeriod = 20
 
-#If set will start with active scan after driver load, otherwise will start with
-#passive scan to find out the domain
+# If set will start with active scan after driver load, otherwise will start with
+# passive scan to find out the domain
 gEnableBypass11d=1
 
-#If set to 0, will not scan DFS channels
+# If set to 0, will not scan DFS channels
 gEnableDFSChnlScan=1
 
 # Enable DFS channel roam
-# 0: DISABLE, 1: ENABLED_NORMAL, 2: ENABLED_ACTIVE
+#  0: DISABLE, 1: ENABLED_NORMAL, 2: ENABLED_ACTIVE
 gAllowDFSChannelRoam=1
 
+# Channel width capability for 11ac
 gVhtChannelWidth=2
 
 #Data Inactivity Timeout when in powersave (in ms)
 gDataInactivityTimeout=200
 
+# 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
+
+# VHT Tx/Rx MCS values for 2x2
+# Valid values are 0,1,2. If commented out, the default value is 0.
+#  0=MCS0-7, 1=MCS0-8, 2=MCS0-9
+gEnable2x2=1
+gVhtRxMCS2x2=2
+gVhtTxMCS2x2=2
+
 # Set txchainmask and rxchainmask
 # These parameters are used only if gEnable2x2 is 0
 # Valid values are 1,2
 # Set gSetTxChainmask1x1=1 or gSetRxChainmask1x1=1 to select chain0.
 # Set gSetTxChainmask1x1=2 or gSetRxChainmask1x1=2 to select chain1.
-gSetTxChainmask1x1=1
-gSetRxChainmask1x1=1
+gSetTxChainmask1x1=0
+gSetRxChainmask1x1=0
+
+# Chain mask for 2G and 5G
+rx_chain_mask_5g=3
+tx_chain_mask_5g=3
+rx_chain_mask_2g=2
+tx_chain_mask_2g=2
+
+# This ini disables/enables chainmask setting on 2x2, mainly used for ROME
+# BT/WLAN chainmask assignment.
+# 0, Disable
+# 1, Enable
+enableBTChainSeparation=0
+
+# Dual mac disable
+gDualMacFeatureDisable=1
 
 # Scan Timing Parameters
 # gPassiveMaxChannelTime=110
@@ -183,13 +214,13 @@ gActiveMinChannelTime=20
 gEnableMCCMode=1
 
 # MCC to SCC Switch mode:
-# 0-Disable
-# 1-Enable
-# 2-Force SCC if same band, with SAP restart
-# 3-Force SCC if same band, without SAP restart by sending (E)CSA
-# 4-Force SCC if same band (or) use SAP mandatory channel for DBS,
-#   without SAP restart by sending (E)CSA
-gWlanMccToSccSwitchMode = 3
+#  0-Disable
+#  1-not supported
+#  2-not supported
+#  3-Force SCC if same MAC, without SAP restart by sending (E)CSA
+#  4-Force SCC if same MAC (or) use SAP mandatory channel for DBS,
+#    without SAP restart by sending (E)CSA
+gWlanMccToSccSwitchMode=0
 
 # 1=enable STBC; 0=disable STBC
 gEnableRXSTBC=1
@@ -200,34 +231,38 @@ gEnableTXSTBC=1
 # 1=enable rx LDPC; 0=disable
 gEnableRXLDPC=1
 
-#Enable/Disable Tx beamforming
+# Enable/Disable Tx beamforming
 gTxBFEnable=1
 
-#Enable/Disable Tx beamformee in SAP mode
+# Enable/Disable Tx beamformee in SAP mode
 gEnableTxBFeeSAP=1
 
 # Enable Tx beamforming in VHT20MHz
 # Valid values are 0,1. If commented out, the default value is 0.
-# 0=disable, 1=enable
+#  0=disable, 1=enable
 gEnableTxBFin20MHz=1
 
-#Enable/Disable SU Tx beamformer support.
+# Enable/Disable SU Tx beamformer support.
 gEnableTxSUBeamformer=1
 
+# Enable thermal mitigation
+gThermalMitigationEnable=0
+
+# Enable LFR roaming on STA during concurrency
 gEnableFastRoamInConcurrency=1
 
-#Maxium Channel time in msec
+# Maximum Channel time in msec
 gMaxMediumTime = 6000
 
 # 802.11K support
 gRrmEnable=1
 
-#Enable Power Save offload
-gEnablePowerSaveOffload=2
-
-#Enable firmware uart print
+# Enable firmware uart print
 gEnablefwprint=0
 
+# Enable Power Save offload
+gEnablePowerSaveOffload=1
+
 # Firmware log mode
 # Valid values are 0,1,2
 # 0=Disable, 1=WMI, 2=DIAG
@@ -256,16 +291,16 @@ gVhtMpduLen=2
 # 1=Enable (default), 0=Disable
 gEnableMCCAdaptiveScheduler=1
 
-#Enable or Disable p2p device address administered
+# Enable or Disable p2p device address administered
 isP2pDeviceAddrAdministrated=0
 
 # Remove Overlap channel restriction
 gEnableOverLapCh=0
 
-#Enable VHT on 2.4Ghz
-gEnableVhtFor24GHzBand=1
+# Enable or Disable 5G early beacon termination
+gEnable5gEBT=1
 
-#Maximum number of offload peers supported
+# Maximum number of offload peers supported
 # gMaxOffloadPeers=2
 
 # controlling the following offload patterns
@@ -275,7 +310,7 @@ gEnableVhtFor24GHzBand=1
 # SSDP 239.255.255.250 and LLMNR 224.0.0.252
 ssdp=0
 
-#Enable Memory Deep Sleep
+# Enable Memory Deep Sleep
 gEnableMemDeepSleep=1
 
 # Regulatory Setting; 0=STRICT; 1=CUSTOM
@@ -299,9 +334,12 @@ gDFSradarMappingPriMultiplier=4
 
 gPNOScanSupport=1
 
-#Enable/Disable LPASS support
-# 0 to disable, 1 to enable
-gEnableLpassSupport=1
+# Enable/Disable RX full reorder offload
+gReorderOffloadSupported=1
+
+# Enable/Disable LPASS support
+#  0 to disable, 1 to enable
+gEnableLpassSupport=0
 
 # Whether userspace country code setting shld have priority
 gCountryCodePriority=1
@@ -324,7 +362,7 @@ gIbssTxSpEndInactivityTime=10
 # Enable support for TDLS
 #  0 - disable
 #  1 - enable
-gEnableTDLSSupport=1
+gEnableTDLSSupport=0
 
 # Enable support for Implicit Trigger of TDLS. That is, wlan driver shall
 # initiate TDLS Discovery towards a peer whenever setup criteria (throughput
@@ -354,9 +392,13 @@ gTDLSExternalControl=1
 gEnableTDLSOffChannel=1
 
 # Enable or Disable Random MAC (Spoofing)
-# 1=Enable (default), 0=Disable
+#  1=Enable, 0=Disable (default:1)
 gEnableMacAddrSpoof=1
 
+# Interface change wait time in ms - the timeout to shutdown device
+# if interface is not brought up after loading driver module
+gInterfaceChangeWait=5000
+
 ################ Datapath feature set Begin ################
 # Bus bandwidth threshold values in terms of number of packets
 gBusBandwidthHighThreshold=2000
@@ -366,19 +408,6 @@ gBusBandwidthLowThreshold=150
 # Bus bandwidth compute timeout value in ms
 gBusBandwidthComputeInterval=100
 
-# 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
-
-# VHT Tx/Rx MCS values for 2x2
-# Valid values are 0,1,2. If commented out, the default value is 0.
-# 0=MCS0-7, 1=MCS0-8, 2=MCS0-9
-gEnable2x2=1
-gVhtRxMCS2x2=2
-gVhtTxMCS2x2=2
-
 #IPA config is a bit mask and following are the configurations.
 #bit0 IPA Enable
 #bit1 IPA PRE Filter enable
@@ -388,7 +417,7 @@ gVhtTxMCS2x2=2
 #bit5 IPA uC ENABLE
 #bit6 IPA uC STA ENABLE
 #bit8 IPA Real Time Debugging
-gIPAConfig=0x7d
+gIPAConfig=0
 gIPADescSize=800
 
 # Enable/Disable RX full reorder offload
@@ -398,9 +427,11 @@ gReorderOffloadSupported=1
 # 1 - enable(default)  0 - disable
 gCEClassifyEnable=1
 
-# Enable Rx handling options
-# Rx_thread=1 RPS=2(default for ROME) NAPI=4(default for ihelium)
-rx_mode=5
+# rx mode configuration
+rx_mode=13
+
+# RX queue RPS CPU mask
+rpsRxQueueCpuMapList=e0
 
 # Enable(Tx) fastpath for data traffic.
 # 1 - enable(default)  0 - disable
@@ -414,59 +445,43 @@ gEnableIpTcpUdpChecksumOffload=1
 # 1 - enable  0 - disable
 TSOEnable=1
 
-# Enable Generic Receive Offload
+# Enable Large Receive Offload
 # 1 - enable(default)  0 - disable
-GROEnable=1
-
-# Enable HT MPDU Density
-# 4 for 2 micro sec
-ght_mpdu_density=4
+LROEnable=1
 
-# Enable flow steering to enable multiple CEs for Rx flows.
-# Multiple Rx CEs<==>Multiple Rx IRQs<==>probably different CPUs.
-# Parallel Rx paths.
-# 1 - enable 0 - disable(default)
-gEnableFlowSteering=1
-
-# Time in microseconds after which a NAPI poll must yield
-ce_service_max_yield_time=500
-
-#Maximum number of HTT messages to be processed per NAPI poll
-ce_service_max_rx_ind_flush=1
-
-# Maximum number of MSDUs the firmware will pack in one HTT_T2H_MSG_TYPE_RX_IN_ORD_PADDR_IND
-maxMSDUsPerRxInd=8
-
-# Enable NUD tracking feature
-# 1 - enable 0 - disable(default)
-gEnableNUDTracking=1
 ################ Datapath feature set End ################
 
-################ NAN feature set start ###################
-
 # Enable NAN discovery (NAN 1.0)
-# 1 - enable  0 - disable(default)
+#  1 - enable(default)  0 - disable
 gEnableNanSupport=1
-# Enable NAN Datapath
-genable_nan_datapath=1
 
-################ NAN feature set end #####################
+# Enables/disables tx chain Mask1ss
+gTxChainMask1ss=0
 
-adaptive_dwell_mode_enabled=1
+# Enable cck chain mask
+gCckChainMaskEnable=1
 
-hostscan_adaptive_dwell_mode=1
+# Set the self gen power value
+gSelfGenFrmPwr=3
 
-adapt_dwell_lpf_weight=80
+# Disable reg offload feature
+enable_reg_offload=0
 
-adapt_dwell_wifi_act_threshold=10
+# Enable DFS phyerrors filtering offload
+dfsPhyerrFilterOffload=1
 
-MAWCEnabled=0
+# Enable fw log
+gEnablefwlog=1
+gFwDebugModuleLoglevel=1,0,2,0,4,0,5,0,6,0,7,4,8,0,9,0,11,0,13,0,17,0,18,0,19,0,27,0,29,0,31,0,35,0,36,0,38,0
 
-# Enable/Disable rtt sta mac randomization
-enable_rtt_mac_randomization=1
+# TX flow control for MCC
+TxHbwFlowLowWaterMark=200
+TxHbwFlowHighWaterMarkOffset=94
+TxLbwFlowLowWaterMark=450
+TxLbwFlowHighWaterMarkOffset=50
 
-#Enable/Disable SNR monitoring
-gEnableSNRMonitoring=1
+# Enable orphan for TCP TX
+gEnableTxOrphan=1
 
 gInterfaceChangeWait=20
 
diff --git a/sm6150_au/WCNSS_qcom_cfg_qca6174.ini b/sm6150_au/WCNSS_qcom_cfg_qca6174.ini
index e9c71443eb47e30851f9cb927074ba1b475ff404..121f30a996b8ded69eab26d8d616441bf7fedc3d 100644
--- a/sm6150_au/WCNSS_qcom_cfg_qca6174.ini
+++ b/sm6150_au/WCNSS_qcom_cfg_qca6174.ini
@@ -251,7 +251,7 @@ gThermalMitigationEnable=0
 # Enable LFR roaming on STA during concurrency
 gEnableFastRoamInConcurrency=1
 
-# Maxium Channel time in msec
+# Maximum Channel time in msec
 gMaxMediumTime = 6000
 
 # 802.11K support
@@ -472,7 +472,6 @@ dfsPhyerrFilterOffload=1
 
 # Enable fw log
 gEnablefwlog=1
-dfsPhyerrFilterOffload=4
 gFwDebugModuleLoglevel=1,0,2,0,4,0,5,0,6,0,7,4,8,0,9,0,11,0,13,0,17,0,18,0,19,0,27,0,29,0,31,0,35,0,36,0,38,0
 
 # TX flow control for MCC