A collection of small bug fixes in ath10k and ath12k.
Note to maintainers:
This tag includes:
3170757210 ("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 631ee338f0 ("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]);
-----BEGIN PGP SIGNATURE-----
iHUEABYKAB0WIQQ/mtSHzPUi16IfDEksFbugiYzLewUCaWaA/wAKCRAsFbugiYzL
e7I3AQDpny3vixgzoMro8RtHWI8VWp8WkTRTCnpiVM46GzZi+gD6A4as/pYZqDiB
oZ0szrG8IK+Jci0l6Q7HkNl7Xf83ogM=
=ZvBw
-----END PGP SIGNATURE-----
Merge tag 'ath-current-20260113' of git://git.kernel.org/pub/scm/linux/kernel/git/ath/ath into wireless
Jeff Johnson says:
==================
ath.git update for v6.19-rc6
A collection of small bug fixes in ath10k and ath12k.
==================
Link: https://patch.msgid.link/98386125-c0bb-495e-b2ba-2765aaed19d8@oss.qualcomm.com
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
e7df856787