diff --git a/bengal/wlan.mk b/bengal/wlan.mk
index 58f1a71df8848953bad300b62f59ed948a836032..b40f5af8955a94c9ae29d334bfd154a39719599e 100644
--- a/bengal/wlan.mk
+++ b/bengal/wlan.mk
@@ -30,3 +30,6 @@ QC_WIFI_HIDL_FEATURE_DUAL_AP := true
 
 #Enable cal delete feature
 TARGET_CAL_DATA_CLEAR := true
+
+# Enable IWIFI Lazy HAL
+TARGET_USES_WIFI_LAZY_HAL := true
diff --git a/kona/WCNSS_qcom_cfg_qca6390.ini b/kona/WCNSS_qcom_cfg_qca6390.ini
new file mode 100644
index 0000000000000000000000000000000000000000..04f5fce79d27827ef28e39b57df04aa5eb5cedb1
--- /dev/null
+++ b/kona/WCNSS_qcom_cfg_qca6390.ini
@@ -0,0 +1,310 @@
+# This file allows user to override the factory
+# defaults for the WLAN Driver
+
+# Phy Mode (auto, b, g, n, etc)
+# Valid values are 0-12, with 0(Min) = Auto, 12(Max) = 11ax
+# 1 = 11abg, 2 = 11b, 3 = 11g, 4 = 11n, 5 = 11g only, 6 = 11n only
+# 7 = 11b only 8 = 11ac only, 9 = 11ac, 12 = 11ax.
+gDot11Mode=0
+
+# UAPSD service interval for VO,VI, BE, BK traffic
+InfraUapsdVoSrvIntv=0
+InfraUapsdViSrvIntv=0
+InfraUapsdBeSrvIntv=0
+InfraUapsdBkSrvIntv=0
+
+# Flag to allow STA send AddTspec even when ACM is Off
+gAddTSWhenACMIsOff=1
+
+#Enable OBSS protection
+gEnableApOBSSProt=1
+
+# Maximum Tx power
+# gTxPowerCap=30
+
+# Fragmentation Threshold
+# gFragmentationThreshold=2346
+
+# RTS threshold
+RTSThreshold=1048576
+
+# WMM Enable/Disable
+WmmIsEnabled=0
+
+# 802.11d support
+g11dSupportEnabled=0
+
+# DFS Master Capability
+gEnableDFSMasterCap=1
+
+ImplicitQosIsEnabled=0
+
+gNeighborScanTimerPeriod=200
+gNeighborLookupThreshold=76
+
+# Legacy (non-ESE, non-802.11r) Fast Roaming Support
+# To enable, set FastRoamEnabled=1
+# To disable, set FastRoamEnabled=0
+FastRoamEnabled=1
+
+#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
+
+#gApKeepAlivePeriod is time to spend to check whether frame
+#are succeed to send or not. Hence total effective detection time is
+#(gApLinkMonitorPeriod + gApKeepAlivePeriod)
+
+# Enable DFS channel roam
+# 0: DISABLE, 1: ENABLED_NORMAL, 2: ENABLED_ACTIVE
+gAllowDFSChannelRoam=1
+
+gVhtChannelWidth=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
+
+# 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
+
+# 1=enable tx STBC; 0=disable
+gEnableTXSTBC=1
+
+#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
+gEnableTxBFin20MHz=1
+
+#Enable/Disable SU Tx beamformer support
+gEnableTxSUBeamformer=1
+
+# 802.11K support
+gRrmEnable=1
+
+# Firmware log mode
+# Valid values are 0,1,2
+# 0=Disable, 1=WMI, 2=DIAG
+gEnablefwlog=2
+
+# Maximum Receive AMPDU size (VHT only. Valid values:
+# 0->8k 1->16k 2->32k 3->64k 4->128k)
+gVhtAmpduLenExponent=7
+
+# Maximum MPDU length (VHT only. Valid values:
+# 0->3895 octets, 1->7991 octets, 2->11454 octets)
+gVhtMpduLen=2
+
+#Enable or Disable p2p device address administered
+isP2pDeviceAddrAdministrated=0
+
+#Enable VHT on 2.4Ghz
+gEnableVhtFor24GHzBand=1
+
+#Maximum number of offload peers supported
+# gMaxOffloadPeers=2
+
+# controlling the following offload patterns
+# through ini parameter. Default value is 1
+# to disable set it to zero. ssdp = 0
+# Setup multicast pattern for mDNS 224.0.0.251,
+# SSDP 239.255.255.250 and LLMNR 224.0.0.252
+ssdp=0
+
+# RA filtering rate limit param, the current value would not
+# help if the lifetime in RA is less than 3*60=3min. Then
+# we need to change it, though it is uncommon.
+# gRAFilterEnable=0
+gRArateLimitInterval=600
+
+# Maximum number of concurrent connections
+gMaxConcurrentActiveSessions=3
+
+# Disable/Enable GreenAP
+# 0 to disable, 1 to enable, default: 1
+gEnableGreenAp=0
+
+#Enable/Disable LPASS support
+# 0 to disable, 1 to enable
+gEnableLpassSupport=1
+
+# Whether userspace country code setting shld have priority
+gCountryCodePriority=1
+
+# Enable or Disable Multi-user MIMO
+# 1=Enable (default), 0=Disable
+gEnableMuBformee=1
+
+# Enable support for TDLS
+#  0 - disable
+#  1 - enable
+gEnableTDLSSupport=1
+
+# Enable support for Implicit Trigger of TDLS. That is, wlan driver shall
+# initiate TDLS Discovery towards a peer whenever setup criteria (throughput
+# and RSSI) is met and then will initiate teardown when teardown criteria
+# (idle packet count and RSSI) is met.
+#  0 - disable
+#  1 - enable
+gEnableTDLSImplicitTrigger=1
+
+# Enable TDLS External Control. That is, user space application has to
+# first configure a peer MAC in wlan driver towards which TDLS is desired.
+# Device will establish TDLS only towards those configured peers whenever
+# TDLS criteria (throughput and RSSI threshold) is met and teardown TDLS
+# when teardown criteria (idle packet count and RSSI) is met. However,
+# device will accept TDLS connection if it is initiated from any other peer,
+# even if that peer is not configured.
+#  0 - disable
+#  1 - enable
+# For TDLS External Control, Implicit Trigger must also be enabled.
+gTDLSExternalControl=1
+
+# Enable support for TDLS off-channel operation
+#  0 - disable
+#  1 - enable
+# TDLS off-channel operation will be invoked when there is only one
+# TDLS connection.
+gEnableTDLSOffChannel=1
+
+# 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
+#bit2 IPv6 enable
+#bit3 IPA Resource Manager (RM) enable
+#bit4 IPA Clock scaling enable
+#bit5 IPA uC ENABLE
+#bit6 IPA uC STA ENABLE
+#bit8 IPA Real Time Debugging
+gIPAConfig=0x7d
+gIPADescSize=800
+
+# Enable TCP Segmentation Offload
+# 1 - enable  0 - disable
+TSOEnable=1
+
+# Enable Generic Receive Offload
+# 1 - enable(default)  0 - disable
+GROEnable=1
+
+# Enable HT MPDU Density
+# 4 for 2 micro sec
+ght_mpdu_density=4
+
+# 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
+
+
+
+# Maximum number of MSDUs the firmware will pack in one HTT_T2H_MSG_TYPE_RX_IN_ORD_PADDR_IND
+maxMSDUsPerRxInd=8
+
+################ Datapath feature set End ################
+
+################ NAN feature set start ###################
+
+# Enable NAN discovery (NAN 1.0)
+# 1 - enable  0 - disable(default)
+gEnableNanSupport=1
+# Enable NAN Datapath
+genable_nan_datapath=1
+
+################ NAN feature set end #####################
+
+hostscan_adaptive_dwell_mode=1
+
+# Enable/Disable rtt sta mac randomization
+enable_rtt_mac_randomization=1
+
+#Enable/Disable SNR monitoring
+gEnableSNRMonitoring=1
+
+# HTC Credit count for WMI operation
+# 1 to serialize the WMI commands
+# 0 default works with FW advertised credits, 2 credits usually
+gWmiCreditCount=1
+
+# Enable enhanced ACS
+acs_with_more_param=1
+# bits 0-3:   rssi weight
+# bits 4-7:   bss count weight
+# bits 8-11:  noise floor weight
+# bits 12-15: channel free weight
+# bits 16-19: tx power range weight
+# bits 20-23: tx power throughput weight
+# bits 24-31: reserved
+AutoChannelSelectWeight=0x00fafafa
+
+# Enable/Disable broadcast TWT
+bcast_twt=1
+
+# Enable broadcast logging to the userspace entities
+gMulticastHostFwMsgs=1
+# Disable packetlog explicitly
+gEnablePacketLog=0
+
+# Set IPA bandwidth levels in mbps
+gIPALowBandwidthMbps=100
+gIPAMediumBandwidthMbps=400
+gIPAHighBandwidthMbps=800
+
+# Enable wlm_latency_enable feature
+# 0 - disable, 1 - enable(default)
+wlm_latency_enable=1
+
+# This ini is used to give higher priority for 5g scc than dbs.
+# It is bitmap per enum policy_mgr_con_mode.
+# For example in GO+STA(5G) mode, when TPUT is onfigured as wlan system
+# preference option, If 5G SCC needs higher priority than dbs, set it as 8.
+g_prefer_5g_scc_to_dbs=8
+
+END
+
+# Note: Configuration parser would not read anything past the END marker
+
diff --git a/kona/WCNSS_qcom_cfg_qca6490.ini b/kona/WCNSS_qcom_cfg_qca6490.ini
new file mode 100644
index 0000000000000000000000000000000000000000..dd5007e7a8d73e87745ec33436dbc36f88e04325
--- /dev/null
+++ b/kona/WCNSS_qcom_cfg_qca6490.ini
@@ -0,0 +1,329 @@
+# This file allows user to override the factory
+# defaults for the WLAN Driver
+
+# Phy Mode (auto, b, g, n, etc)
+# Valid values are 0-12, with 0(Min) = Auto, 12(Max) = 11ax
+# 1 = 11abg, 2 = 11b, 3 = 11g, 4 = 11n, 5 = 11g only, 6 = 11n only
+# 7 = 11b only 8 = 11ac only, 9 = 11ac, 12 = 11ax.
+gDot11Mode=0
+
+# UAPSD service interval for VO,VI, BE, BK traffic
+InfraUapsdVoSrvIntv=0
+InfraUapsdViSrvIntv=0
+InfraUapsdBeSrvIntv=0
+InfraUapsdBkSrvIntv=0
+
+# Flag to allow STA send AddTspec even when ACM is Off
+gAddTSWhenACMIsOff=1
+
+#Enable OBSS protection
+gEnableApOBSSProt=1
+
+# Maximum Tx power
+# gTxPowerCap=30
+
+# Fragmentation Threshold
+# gFragmentationThreshold=2346
+
+# RTS threshold
+RTSThreshold=1048576
+
+# WMM Enable/Disable
+WmmIsEnabled=0
+
+# 802.11d support
+g11dSupportEnabled=0
+
+# DFS Master Capability
+gEnableDFSMasterCap=1
+
+ImplicitQosIsEnabled=0
+
+gNeighborScanTimerPeriod=200
+gNeighborLookupThreshold=76
+
+# Legacy (non-ESE, non-802.11r) Fast Roaming Support
+# To enable, set FastRoamEnabled=1
+# To disable, set FastRoamEnabled=0
+FastRoamEnabled=1
+
+#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
+
+#gApKeepAlivePeriod is time to spend to check whether frame
+#are succeed to send or not. Hence total effective detection time is
+#(gApLinkMonitorPeriod + gApKeepAlivePeriod)
+
+# Enable DFS channel roam
+# 0: DISABLE, 1: ENABLED_NORMAL, 2: ENABLED_ACTIVE
+gAllowDFSChannelRoam=1
+
+gVhtChannelWidth=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
+
+# 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
+
+# 1=enable tx STBC; 0=disable
+gEnableTXSTBC=1
+
+#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
+gEnableTxBFin20MHz=1
+
+#Enable/Disable SU Tx beamformer support
+gEnableTxSUBeamformer=1
+
+# 802.11K support
+gRrmEnable=1
+
+# Firmware log mode
+# Valid values are 0,1,2
+# 0=Disable, 1=WMI, 2=DIAG
+gEnablefwlog=2
+
+# Maximum Receive AMPDU size (VHT only. Valid values:
+# 0->8k 1->16k 2->32k 3->64k 4->128k)
+gVhtAmpduLenExponent=7
+
+# Maximum MPDU length (VHT only. Valid values:
+# 0->3895 octets, 1->7991 octets, 2->11454 octets)
+gVhtMpduLen=2
+
+#Enable or Disable p2p device address administered
+isP2pDeviceAddrAdministrated=0
+
+#Enable VHT on 2.4Ghz
+gEnableVhtFor24GHzBand=1
+
+#Maximum number of offload peers supported
+# gMaxOffloadPeers=2
+
+# controlling the following offload patterns
+# through ini parameter. Default value is 1
+# to disable set it to zero. ssdp = 0
+# Setup multicast pattern for mDNS 224.0.0.251,
+# SSDP 239.255.255.250 and LLMNR 224.0.0.252
+ssdp=0
+
+# RA filtering rate limit param, the current value would not
+# help if the lifetime in RA is less than 3*60=3min. Then
+# we need to change it, though it is uncommon.
+# gRAFilterEnable=0
+gRArateLimitInterval=600
+
+# Maximum number of concurrent connections
+gMaxConcurrentActiveSessions=3
+
+# Disable/Enable GreenAP
+# 0 to disable, 1 to enable, default: 1
+gEnableGreenAp=0
+
+#Enable/Disable LPASS support
+# 0 to disable, 1 to enable
+gEnableLpassSupport=1
+
+# Whether userspace country code setting shld have priority
+gCountryCodePriority=1
+
+# Enable or Disable Multi-user MIMO
+# 1=Enable (default), 0=Disable
+gEnableMuBformee=1
+
+# Enable support for TDLS
+#  0 - disable
+#  1 - enable
+gEnableTDLSSupport=1
+
+# Enable support for Implicit Trigger of TDLS. That is, wlan driver shall
+# initiate TDLS Discovery towards a peer whenever setup criteria (throughput
+# and RSSI) is met and then will initiate teardown when teardown criteria
+# (idle packet count and RSSI) is met.
+#  0 - disable
+#  1 - enable
+gEnableTDLSImplicitTrigger=1
+
+# Enable TDLS External Control. That is, user space application has to
+# first configure a peer MAC in wlan driver towards which TDLS is desired.
+# Device will establish TDLS only towards those configured peers whenever
+# TDLS criteria (throughput and RSSI threshold) is met and teardown TDLS
+# when teardown criteria (idle packet count and RSSI) is met. However,
+# device will accept TDLS connection if it is initiated from any other peer,
+# even if that peer is not configured.
+#  0 - disable
+#  1 - enable
+# For TDLS External Control, Implicit Trigger must also be enabled.
+gTDLSExternalControl=1
+
+# Enable support for TDLS off-channel operation
+#  0 - disable
+#  1 - enable
+# TDLS off-channel operation will be invoked when there is only one
+# TDLS connection.
+gEnableTDLSOffChannel=1
+
+# 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
+#bit2 IPv6 enable
+#bit3 IPA Resource Manager (RM) enable
+#bit4 IPA Clock scaling enable
+#bit5 IPA uC ENABLE
+#bit6 IPA uC STA ENABLE
+#bit8 IPA Real Time Debugging
+gIPAConfig=0
+gIPADescSize=800
+
+# Increase TCL ringsize
+dp_tx_ring_size=3072
+
+# Enable TCP Segmentation Offload
+# 1 - enable  0 - disable
+TSOEnable=1
+
+# Enable Generic Receive Offload
+# 1 - enable(default)  0 - disable
+GROEnable=1
+
+# Enable HT MPDU Density
+# 4 for 2 micro sec
+ght_mpdu_density=4
+
+# 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
+
+# Enable Rx FISA support
+# 0 - disable(default for non-QCA6490), 1 - enable(default for QCA6490)
+dp_rx_fisa_enable=1
+
+# FISA FSE flow table size
+dp_rx_flow_search_table_size=128
+
+# Maximum number of MSDUs the firmware will pack in one HTT_T2H_MSG_TYPE_RX_IN_ORD_PADDR_IND
+maxMSDUsPerRxInd=8
+
+################ Datapath feature set End ################
+
+################ NAN feature set start ###################
+
+# Enable NAN discovery (NAN 1.0)
+# 1 - enable  0 - disable(default)
+gEnableNanSupport=1
+# Enable NAN Datapath
+genable_nan_datapath=1
+
+################ NAN feature set end #####################
+
+hostscan_adaptive_dwell_mode=1
+
+# Enable/Disable rtt sta mac randomization
+enable_rtt_mac_randomization=1
+
+#Enable/Disable SNR monitoring
+gEnableSNRMonitoring=1
+
+# HTC Credit count for WMI operation
+# 1 to serialize the WMI commands
+# 0 default works with FW advertised credits, 2 credits usually
+gWmiCreditCount=1
+
+# Enable enhanced ACS
+acs_with_more_param=1
+# bits 0-3:   rssi weight
+# bits 4-7:   bss count weight
+# bits 8-11:  noise floor weight
+# bits 12-15: channel free weight
+# bits 16-19: tx power range weight
+# bits 20-23: tx power throughput weight
+# bits 24-31: reserved
+AutoChannelSelectWeight=0x00fafafa
+
+# Enable/Disable broadcast TWT
+bcast_twt=1
+
+# Enable Runtime PM
+# 0 - RTPM disabled, so CxPC aware RTPM will be disabled as well
+# 1 - RTPM enabled, but CxPC aware RTPM disabled (i.e, Static Runtime PM)
+# 2 - RTPM enabled and CxPC aware RTPM enabled as well (i.e, Dynamic Runtime PM)
+gRuntimePM=2
+gRuntimePMDelay=500
+
+active_max_channel_time_6g=60
+passive_max_channel_time_6g=60
+
+# Enable broadcast logging to the userspace entities
+gMulticastHostFwMsgs=1
+# Disable packetlog explicitly
+gEnablePacketLog=0
+
+# Set IPA bandwidth levels in mbps
+gIPALowBandwidthMbps=100
+gIPAMediumBandwidthMbps=400
+gIPAHighBandwidthMbps=800
+
+# Enable wlm_latency_enable feature
+# 0 - disable, 1 - enable(default)
+wlm_latency_enable=1
+spectral_disable=1
+
+# This ini is used to give higher priority for 5g scc than dbs.
+# It is bitmap per enum policy_mgr_con_mode.
+# For example in GO+STA(5G) mode, when TPUT is onfigured as wlan system
+# preference option, If 5G SCC needs higher priority than dbs, set it as 8.
+g_prefer_5g_scc_to_dbs=8
+
+END
+
+# Note: Configuration parser would not read anything past the END marker
+
diff --git a/msmnile_au/WCNSS_qcom_cfg_qca6174.ini b/msmnile_au/WCNSS_qcom_cfg_qca6174.ini
index 67d2ef131855d4ab383be552bad116256928ae13..a3f0b05d2ec8e43bf7b698e766820494d4177353 100644
--- a/msmnile_au/WCNSS_qcom_cfg_qca6174.ini
+++ b/msmnile_au/WCNSS_qcom_cfg_qca6174.ini
@@ -468,6 +468,8 @@ enable_rtt_mac_randomization=1
 #Enable/Disable SNR monitoring
 gEnableSNRMonitoring=1
 
+gInterfaceChangeWait=20
+
 END
 
 # Note: Configuration parser would not read anything past the END marker
diff --git a/msmnile_au/WCNSS_qcom_cfg_qca6390.ini b/msmnile_au/WCNSS_qcom_cfg_qca6390.ini
index 72beecd090179509ea49e48f9ebbe819645645d9..4a28541aead3921b32f7cfa43db573abf0602ada 100644
--- a/msmnile_au/WCNSS_qcom_cfg_qca6390.ini
+++ b/msmnile_au/WCNSS_qcom_cfg_qca6390.ini
@@ -492,10 +492,12 @@ gEnableSNRMonitoring=1
 #Set STA+SAP SCC dfs master support
 g_sta_sap_scc_on_dfs_chan=2
 
-gInterfaceChangeWait=0
+gInterfaceChangeWait=20
 
 spectral_disable=1
 
+gSetAntennaIsolation=30
+
 END
 
 # Note: Configuration parser would not read anything past the END marker
diff --git a/msmnile_au/WCNSS_qcom_cfg_qcn7605.ini b/msmnile_au/WCNSS_qcom_cfg_qcn7605.ini
index 4e0a65e0c719a20cd8a25c1982aeaff41c60f321..76b55404f698b5973a39d588310080fa53fbf3b8 100644
--- a/msmnile_au/WCNSS_qcom_cfg_qcn7605.ini
+++ b/msmnile_au/WCNSS_qcom_cfg_qcn7605.ini
@@ -258,8 +258,7 @@ gVhtMpduLen=2
 # 1 - Enable magic pattern match on all interfaces.
 # 2 - Enable pattern byte match on all interfaces.
 # 3 - Enable both magic pattern and pattern byte match on all interfaces.
-# Default value of gEnableWoW is 3.
-gEnableWoW=0
+gEnableWoW=3
 
 # Enable or Disable MCC Adaptive Scheduler at the FW
 # 1=Enable (default), 0=Disable
@@ -468,12 +467,17 @@ adapt_dwell_wifi_act_threshold=10
 # 0- Disable DTIM Synth
 gEnableLPRx=0
 
-gInterfaceChangeWait=500000
+# Set WMI Credit
+gWmiCreditCount=1
+
+gInterfaceChangeWait=20
 gBpfFilterEnable=0
 gActiveMcBcBpfMode=0 
 gSoftApMaxPeers=10
 gNumVdevs=3
 gRuntimePM=0
+
+gSetAntennaIsolation=30
 END
 
 # Note: Configuration parser would not read anything past the END marker
diff --git a/msmnile_au/wlan.mk b/msmnile_au/wlan.mk
index 2fec3884f2b2efd474f27c60e8d86d2beea275ab..461d933ac2bac924a6456c2ca5d84f2b869c87ff 100644
--- a/msmnile_au/wlan.mk
+++ b/msmnile_au/wlan.mk
@@ -52,4 +52,4 @@ endif
 # (<wlan_chip> is from $TARGET_WLAN_CHIP).
 #   WLAN_CFG_OVERRIDE_<wlan_chip> := WLAN_CFG_1=n WLAN_CFG_2=y WLAN_CFG_3=n
 WLAN_CFG_OVERRIDE_qca6390 := CONFIG_FEATURE_COEX=y CONFIG_QCACLD_FEATURE_BTC_CHAIN_MODE=y
-WLAN_CFG_OVERRIDE_qcn7605 := CONFIG_FEATURE_COEX=y CONFIG_QCACLD_FEATURE_BTC_CHAIN_MODE=y CONFIG_FW_THERMAL_THROTTLE=y
+WLAN_CFG_OVERRIDE_qcn7605 := CONFIG_FEATURE_COEX=y CONFIG_QCACLD_FEATURE_BTC_CHAIN_MODE=y CONFIG_FW_THERMAL_THROTTLE=y CONFIG_TARGET_11D_SCAN=y
diff --git a/sdmshrike_au/WCNSS_qcom_cfg_qca6174.ini b/sdmshrike_au/WCNSS_qcom_cfg_qca6174.ini
index 7da95700e62e1f163791e58831f90e614e999884..04cbf56e83481c4fadad7cab8a0966bf19dd94b2 100644
--- a/sdmshrike_au/WCNSS_qcom_cfg_qca6174.ini
+++ b/sdmshrike_au/WCNSS_qcom_cfg_qca6174.ini
@@ -468,6 +468,8 @@ enable_rtt_mac_randomization=1
 #Enable/Disable SNR monitoring
 gEnableSNRMonitoring=1
 
+gInterfaceChangeWait=20
+
 END
 
 # Note: Configuration parser would not read anything past the END marker
diff --git a/sdmshrike_au/WCNSS_qcom_cfg_qca6390.ini b/sdmshrike_au/WCNSS_qcom_cfg_qca6390.ini
index facd21b3d13dba67177597cb14f00431f262f1e2..22be1cb5d5c40425908d4189371d671ac56d027c 100644
--- a/sdmshrike_au/WCNSS_qcom_cfg_qca6390.ini
+++ b/sdmshrike_au/WCNSS_qcom_cfg_qca6390.ini
@@ -492,7 +492,7 @@ gEnableSNRMonitoring=1
 #Set STA+SAP SCC dfs master support
 g_sta_sap_scc_on_dfs_chan=2
 
-gInterfaceChangeWait=0
+gInterfaceChangeWait=20
 spectral_disable=1
 
 END
diff --git a/sdmshrike_au/WCNSS_qcom_cfg_qcn7605.ini b/sdmshrike_au/WCNSS_qcom_cfg_qcn7605.ini
index 1834c7837a5fc0297affae9b881a7bd669a4d2ef..f8df50481e271e1940f9964c1e6d7943297092e7 100644
--- a/sdmshrike_au/WCNSS_qcom_cfg_qcn7605.ini
+++ b/sdmshrike_au/WCNSS_qcom_cfg_qcn7605.ini
@@ -257,8 +257,7 @@ gVhtMpduLen=2
 # 1 - Enable magic pattern match on all interfaces.
 # 2 - Enable pattern byte match on all interfaces.
 # 3 - Enable both magic pattern and pattern byte match on all interfaces.
-# Default value of gEnableWoW is 3.
-gEnableWoW=0
+gEnableWoW=3
 
 # Enable or Disable MCC Adaptive Scheduler at the FW
 # 1=Enable (default), 0=Disable
@@ -467,7 +466,10 @@ adapt_dwell_wifi_act_threshold=10
 # 0- Disable DTIM Synth
 gEnableLPRx=0
 
-gInterfaceChangeWait=500000
+# Set WMI Credit
+gWmiCreditCount=1
+
+gInterfaceChangeWait=20
 gBpfFilterEnable=0
 gActiveMcBcBpfMode=0 
 gSoftApMaxPeers=10
diff --git a/sdmshrike_au/wlan.mk b/sdmshrike_au/wlan.mk
index 0c1debbbf5caa0a76dc7eb56ef601f6a95d0c00b..761aedcb3b74b96e68fd315bec8ec6acd35457d5 100644
--- a/sdmshrike_au/wlan.mk
+++ b/sdmshrike_au/wlan.mk
@@ -51,4 +51,4 @@ endif
 # To disable WLAN_CFG_1/WLAN_CFG_3 and enable WLAN_CFG_2 for <wlan_chip>
 # (<wlan_chip> is from $TARGET_WLAN_CHIP).
 #   WLAN_CFG_OVERRIDE_<wlan_chip> := WLAN_CFG_1=n WLAN_CFG_2=y WLAN_CFG_3=n
-WLAN_CFG_OVERRIDE_qcn7605 := CONFIG_FW_THERMAL_THROTTLE=y
+WLAN_CFG_OVERRIDE_qcn7605 := CONFIG_FW_THERMAL_THROTTLE=y CONFIG_TARGET_11D_SCAN=y
diff --git a/sm6150_au/WCNSS_qcom_cfg_qca6174.ini b/sm6150_au/WCNSS_qcom_cfg_qca6174.ini
index c7894a3efbf23c9d368cc6e1f81eb0441bfdef16..e9c71443eb47e30851f9cb927074ba1b475ff404 100644
--- a/sm6150_au/WCNSS_qcom_cfg_qca6174.ini
+++ b/sm6150_au/WCNSS_qcom_cfg_qca6174.ini
@@ -484,6 +484,8 @@ TxLbwFlowHighWaterMarkOffset=50
 # Enable orphan for TCP TX
 gEnableTxOrphan=1
 
+gInterfaceChangeWait=20
+
 END
 
 # Note: Configuration parser would not read anything past the END marker
diff --git a/sm6150_au/WCNSS_qcom_cfg_qca6390.ini b/sm6150_au/WCNSS_qcom_cfg_qca6390.ini
index facd21b3d13dba67177597cb14f00431f262f1e2..e00c5f1733addc161bd150e081394a9d495d051e 100644
--- a/sm6150_au/WCNSS_qcom_cfg_qca6390.ini
+++ b/sm6150_au/WCNSS_qcom_cfg_qca6390.ini
@@ -492,9 +492,11 @@ gEnableSNRMonitoring=1
 #Set STA+SAP SCC dfs master support
 g_sta_sap_scc_on_dfs_chan=2
 
-gInterfaceChangeWait=0
+gInterfaceChangeWait=20
 spectral_disable=1
 
+gSetAntennaIsolation=30
+
 END
 
 # Note: Configuration parser would not read anything past the END marker
diff --git a/sm6150_au/WCNSS_qcom_cfg_qcn7605.ini b/sm6150_au/WCNSS_qcom_cfg_qcn7605.ini
index 1834c7837a5fc0297affae9b881a7bd669a4d2ef..1c75e75aa3b76378618af304b7968880c8f5c3d3 100644
--- a/sm6150_au/WCNSS_qcom_cfg_qcn7605.ini
+++ b/sm6150_au/WCNSS_qcom_cfg_qcn7605.ini
@@ -257,8 +257,7 @@ gVhtMpduLen=2
 # 1 - Enable magic pattern match on all interfaces.
 # 2 - Enable pattern byte match on all interfaces.
 # 3 - Enable both magic pattern and pattern byte match on all interfaces.
-# Default value of gEnableWoW is 3.
-gEnableWoW=0
+gEnableWoW=3
 
 # Enable or Disable MCC Adaptive Scheduler at the FW
 # 1=Enable (default), 0=Disable
@@ -467,12 +466,17 @@ adapt_dwell_wifi_act_threshold=10
 # 0- Disable DTIM Synth
 gEnableLPRx=0
 
-gInterfaceChangeWait=500000
+# Set WMI Credit
+gWmiCreditCount=1
+
+gInterfaceChangeWait=20
 gBpfFilterEnable=0
 gActiveMcBcBpfMode=0 
 gSoftApMaxPeers=10
 gNumVdevs=3
 gRuntimePM=0
+
+gSetAntennaIsolation=30
 END
 
 # Note: Configuration parser would not read anything past the END marker
diff --git a/sm6150_au/wlan.mk b/sm6150_au/wlan.mk
index 798962094378aac93759ca2ca9ebba400dca4c62..d18a37ca3a4443b5baeb9e5b3fff118a56db6d2e 100644
--- a/sm6150_au/wlan.mk
+++ b/sm6150_au/wlan.mk
@@ -53,4 +53,4 @@ endif
 # (<wlan_chip> is from $TARGET_WLAN_CHIP).
 #   WLAN_CFG_OVERRIDE_<wlan_chip> := WLAN_CFG_1=n WLAN_CFG_2=y WLAN_CFG_3=n
 WLAN_CFG_OVERRIDE_qca6390 := CONFIG_FEATURE_COEX=y CONFIG_QCACLD_FEATURE_BTC_CHAIN_MODE=y
-WLAN_CFG_OVERRIDE_qcn7605 := CONFIG_FEATURE_COEX=y CONFIG_QCACLD_FEATURE_BTC_CHAIN_MODE=y CONFIG_FW_THERMAL_THROTTLE=y CONFIG_IPA_DISABLE_OVERRIDE=y
+WLAN_CFG_OVERRIDE_qcn7605 := CONFIG_FEATURE_COEX=y CONFIG_QCACLD_FEATURE_BTC_CHAIN_MODE=y CONFIG_FW_THERMAL_THROTTLE=y CONFIG_IPA_DISABLE_OVERRIDE=y CONFIG_TARGET_11D_SCAN=y