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

Jeff Johnson says:
==================
ath.git patches for v7.2 (PR #2)

For ath12k:
- Add thermal throttling and cooling device support
- Add support for handling incumbent signal interference in 6 GHz
- Add support for channel 177 in the 5 GHz band

In addition, a large number of cleanup and minor bug fixing across
all supported drivers.
==================

Signed-off-by: Johannes Berg <johannes.berg@intel.com>

diff --cc drivers/net/wireless/ath/ath12k/core.c
Simple merge

diff --cc drivers/net/wireless/ath/ath12k/dp_rx.c
index b108ccd0f63703b96ec4368eca71431e0dcf1462,a4fec1dc55c6d6facb87551964c02d7c99bc66c7..a68b28aa1f4ba7f116d0fbdee1d8824875821641
--- 1/drivers/net/wireless/ath/ath12k/dp_rx.c
--- 2/drivers/net/wireless/ath/ath12k/dp_rx.c
+++ b/drivers/net/wireless/ath/ath12k/dp_rx.c
@@@ -1336,11 -1368,9 +1371,9 @@@ void ath12k_dp_rx_deliver_msdu(struct a
        struct ath12k_dp_peer *peer;
        struct ath12k_skb_rxcb *rxcb = ATH12K_SKB_RXCB(msdu);
        struct ieee80211_rx_status *status = rx_info->rx_status;
-       u8 decap = rx_info->decap_type;
        bool is_mcbc = rxcb->is_mcbc;
-       bool is_eapol = rxcb->is_eapol;
  
 -      peer = ath12k_dp_peer_find_by_peerid(dp_pdev, rx_info->peer_id);
 +      peer = ath12k_dp_peer_find_by_peerid(dp_pdev, rxcb->peer_id);
  
        pubsta = peer ? peer->sta : NULL;
  

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

diff --cc drivers/net/wireless/ath/ath12k/wmi.c
Simple merge