Merge tag 'ath-next-20240130' of git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/ath

ath.git patches for v6.9

We have new features for both ath11k and ath12k. ath12k is now under
heavy refactoring in preparation for MLO support.

Major changes:

ath12k

* refactoring in preparation for Multi-Link Operation (MLO) support

* 1024 Block Ack window size support

* provide firmware wmi logs via a trace event

ath11k

* 36 bit DMA mask support

* support 6 GHz station power modes: Low Power Indoor (LPI), Standard
  Power) SP and Very Low Power (VLP)

diff --cc drivers/net/wireless/ath/ath11k/core.h
index 02e160d831bed13f3358034048ce5b03d36dc090,12fa5b28520f05f2cfd1bc3f67bbaaa20c16851e..0b2d4a93d706e129f8eae67168a665daf63880eb
--- 1/drivers/net/wireless/ath/ath11k/core.h
--- 2/drivers/net/wireless/ath/ath11k/core.h
+++ b/drivers/net/wireless/ath/ath11k/core.h
@@@ -368,6 -405,12 +405,8 @@@ struct ath11k_vif 
        struct ieee80211_chanctx_conf chanctx;
        struct ath11k_arp_ns_offload arp_ns_offload;
        struct ath11k_rekey_data rekey_data;
 -
 -#ifdef CONFIG_ATH11K_DEBUGFS
 -      struct dentry *debugfs_twt;
 -#endif /* CONFIG_ATH11K_DEBUGFS */
+ 
+       struct ath11k_reg_tpc_power_info reg_tpc_info;
  };
  
  struct ath11k_vif_iter {

diff --cc drivers/net/wireless/ath/ath11k/mac.c
Simple merge