pull-request: ath-current-20260113

[Jeff Johnson]

The following changes since commit a203dbeeca15a9b924f0d51f510921f4bae96801:

  wifi: mac80211: collect station statistics earlier when disconnect (2026-01-08 13:33:11 +0100)

are available in the Git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/ath/ath.git tags/ath-current-20260113

for you to fetch changes up to 31707572108da55a005e7fed32cc3869c16b7c16:

  wifi: ath12k: Fix wrong P2P device link id issue (2026-01-13 07:25:02 -0800)

----------------------------------------------------------------
ath.git update for v6.19-rc6

A collection of small bug fixes in ath10k and ath12k.

Note to maintainers:

This tag includes:
31707572108d ("wifi: ath12k: Fix wrong P2P device link id issue")

That commit contains the following:

Note to linux-next and netdev maintainers:

This patch going through the "current" tree conflicts with
the following going through the "next" tree:
commit 631ee338f04d ("Merge branch 'ath12k-ng' into ath-next")

The conflict resolution is to leave the following file unmodified:
drivers/net/wireless/ath/ath12k/mac.

And to apply the following patch to ath12k_wifi7_mac_op_tx()
in the file drivers/net/wireless/ath/ath12k/wifi7/hw.c -705,7 +705,10

 			return;
 		}
 	} else {
-		link_id = 0;
+		if (vif->type == NL80211_IFTYPE_P2P_DEVICE)
+			link_id = ATH12K_FIRST_SCAN_LINK;
+		else
+			link_id = 0;
 	}

 	arvif = rcu_dereference(ahvif->link[link_id]);

----------------------------------------------------------------
Baochen Qiang (2):
      wifi: ath12k: don't force radio frequency check in freq_to_idx()
      wifi: ath12k: fix dead lock while flushing management frames

Manish Dharanenthiran (1):
      wifi: ath12k: cancel scan only on active scan vdev

Thomas Fourier (2):
      wifi: ath10k: fix dma_free_coherent() pointer
      wifi: ath12k: fix dma_free_coherent() pointer

Yingying Tang (2):
      wifi: ath12k: Fix scan state stuck in ABORTING after cancel_remain_on_channel
      wifi: ath12k: Fix wrong P2P device link id issue

 drivers/net/wireless/ath/ath10k/ce.c  | 16 ++++++++--------
 drivers/net/wireless/ath/ath12k/ce.c  | 12 ++++++------
 drivers/net/wireless/ath/ath12k/mac.c | 16 ++++++++++------
 drivers/net/wireless/ath/ath12k/wmi.c |  9 +--------
 4 files changed, 25 insertions(+), 28 deletions(-)