linux-next: manual merge of the net-next tree with the ath tree

[Stephen Rothwell]

Hi all,

Today's linux-next merge of the net-next tree got a conflict in:

  drivers/net/wireless/ath/ath12k/mac.c

between commit:

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

from the ath tree and commit:

  c26f294fef2a ("wifi: ath12k: Move ieee80211_ops callback to the arch specific module")

from the net-next tree.

I fixed it up (following the directions in commit 31707572108d, I used
the latter version of the above file and then added the following merge
fix patch) and can carry the fix as necessary. This is now fixed as far as
linux-next is concerned, but any non trivial conflicts should be mentioned
to your upstream maintainer when your tree is submitted for merging.
You may also want to consider cooperating with the maintainer of the
conflicting tree to minimise any particularly complex conflicts.

From: Stephen Rothwell <sfr at canb.auug.org.au>
Date: Wed, 14 Jan 2026 12:34:25 +1100
Subject: [PATCH] fix up for "wifi: ath12k: Move ieee80211_ops callback to the
 arch specific module"

interacting with commit

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

from the ath tree.

Signed-off-by: Stephen Rothwell <sfr at canb.auug.org.au>
---
 drivers/net/wireless/ath/ath12k/wifi7/hw.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/drivers/net/wireless/ath/ath12k/wifi7/hw.c b/drivers/net/wireless/ath/ath12k/wifi7/hw.c
index 1f5dda73230d..8ac06b2fc18f 100644
--- a/drivers/net/wireless/ath/ath12k/wifi7/hw.c
+++ b/drivers/net/wireless/ath/ath12k/wifi7/hw.c
@@ -705,7 +705,10 @@ static void ath12k_wifi7_mac_op_tx(struct ieee80211_hw *hw,
 			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]);
-- 
2.52.0

-- 
Cheers,
Stephen Rothwell
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 488 bytes
Desc: OpenPGP digital signature
URL: <http://lists.infradead.org/pipermail/ath10k/attachments/20260114/c349d185/attachment.sig>