From: Kalle Valo <kvalo@kernel.org>
Date: Thu, 31 Oct 2024 14:03:57 +0000 (+0200)
Subject: Merge tag 'ath-next-20241030' of git://git.kernel.org/pub/scm/linux/kernel/git/ath/ath
X-Git-Tag: v6.13-rc1~135^2~57^2~30
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=3c1f19ab3d59d4b01cbb70fc5fbaa8c5805f108b;p=thirdparty%2Fkernel%2Flinux.git

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

ath.git patches for v6.13

This development cycle featured phase 1 of patches to ath12k to
support the new 802.11be MLO feature, along with other ath12k feature
patches.  In older drivers, support for some additional devices were
added. And there was the usual set of bug fixes and cleanups across
most drivers.

Per-driver highlights:

ath12k
* Switch to using wiphy_lock() and remove ar->conf_mutex
* Convert struct ath12k_sta::update_wk to use struct wiphy_work
* Add phase 1 of 802.11be MLO support
* Add firmware coredump collection support
* Add debugfs support for a multitude of statistics
* Fix host representation of multiple hal_rx structs
* Fix use-after-free in ath12k_dp_cc_cleanup()
* Skip Rx TID cleanup for self peer
* Fix warning and crash when unloading in a VM
* Convert CE interrupt handling from tasklet to BH workqueue
* Fix A-MSDU indication in monitor mode

ath11k
* Fix double free issue during SRNG deinit
* Enable firmware diagnostic events for WCN6750
* Fix CE offset address calculation for WCN6750 during SSR
* Fix stack frame size warning in ath11k_vif_wow_set_wakeups()
* Document the inputs for ath11k on WCN6855

ath10k
* Fix multiple stack frame size warnings
* Fix invalid VHT parameters in supported_vht_mcs_rate_nss* structs
* Avoid NULL pointer error during SDIO remove

ath5k
* Add support for Arcadyan ARV45XX AR2417 & Gigaset SX76[23] AR241[34]A
---

3c1f19ab3d59d4b01cbb70fc5fbaa8c5805f108b
diff --cc drivers/net/wireless/ath/ath12k/mac.c
index acf5628adda56,67b2131136f01..d493ec812055f
--- a/drivers/net/wireless/ath/ath12k/mac.c
+++ b/drivers/net/wireless/ath/ath12k/mac.c
@@@ -4737,15 -5096,20 +5096,21 @@@ out
  
  static void ath12k_mac_op_sta_rc_update(struct ieee80211_hw *hw,
  					struct ieee80211_vif *vif,
 -					struct ieee80211_sta *sta,
 +					struct ieee80211_link_sta *link_sta,
  					u32 changed)
  {
 +	struct ieee80211_sta *sta = link_sta->sta;
  	struct ath12k *ar;
- 	struct ath12k_sta *arsta = ath12k_sta_to_arsta(sta);
- 	struct ath12k_vif *arvif = ath12k_vif_to_arvif(vif);
+ 	struct ath12k_sta *ahsta = ath12k_sta_to_ahsta(sta);
+ 	struct ath12k_vif *ahvif = ath12k_vif_to_ahvif(vif);
+ 	struct ath12k_link_sta *arsta;
+ 	struct ath12k_link_vif *arvif;
  	struct ath12k_peer *peer;
  	u32 bw, smps;
+ 	/* TODO: use proper link id once link sta specific rc update support is
+ 	 * available in mac80211.
+ 	 */
+ 	u8 link_id = ATH12K_DEFAULT_LINK_ID;
  
  	ar = ath12k_get_ar_by_vif(hw, vif);
  	if (!ar) {