From c97a294307e0978cccd27c09bb73dd2b704e8099 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Tue, 22 Apr 2025 15:07:13 +0200 Subject: [PATCH] 6.12-stable patches added patches: revert-wifi-ath12k-fix-invalid-entry-fetch-in-ath12k_dp_mon_srng_process.patch --- ...-fetch-in-ath12k_dp_mon_srng_process.patch | 33 +++++++++++++++++++ queue-6.12/series | 1 + 2 files changed, 34 insertions(+) create mode 100644 queue-6.12/revert-wifi-ath12k-fix-invalid-entry-fetch-in-ath12k_dp_mon_srng_process.patch diff --git a/queue-6.12/revert-wifi-ath12k-fix-invalid-entry-fetch-in-ath12k_dp_mon_srng_process.patch b/queue-6.12/revert-wifi-ath12k-fix-invalid-entry-fetch-in-ath12k_dp_mon_srng_process.patch new file mode 100644 index 0000000000..c78d10e982 --- /dev/null +++ b/queue-6.12/revert-wifi-ath12k-fix-invalid-entry-fetch-in-ath12k_dp_mon_srng_process.patch @@ -0,0 +1,33 @@ +From alexander@tsoy.me Tue Apr 22 15:04:41 2025 +From: Alexander Tsoy +Date: Tue, 22 Apr 2025 15:03:37 +0300 +Subject: Revert "wifi: ath12k: Fix invalid entry fetch in ath12k_dp_mon_srng_process" +To: Greg Kroah-Hartman , stable@vger.kernel.org +Cc: patches@lists.linux.dev, P Praneesh , Jeff Johnson , Sasha Levin +Message-ID: <20250422120338.229099-1-alexander@tsoy.me> + +From: Alexander Tsoy + +This reverts commit 535b666118f6ddeae90a480a146c061796d37022 which is +commit 63fdc4509bcf483e79548de6bc08bf3c8e504bb3 upstream as it was +backported incorrectly. + +A subsequent commit will re-backport the original patch. + +Signed-off-by: Alexander Tsoy +Signed-off-by: Greg Kroah-Hartman +--- + drivers/net/wireless/ath/ath12k/dp_mon.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/drivers/net/wireless/ath/ath12k/dp_mon.c ++++ b/drivers/net/wireless/ath/ath12k/dp_mon.c +@@ -2533,7 +2533,7 @@ int ath12k_dp_mon_rx_process_stats(struc + dest_idx = 0; + move_next: + ath12k_dp_mon_buf_replenish(ab, buf_ring, 1); +- ath12k_hal_srng_dst_get_next_entry(ab, srng); ++ ath12k_hal_srng_src_get_next_entry(ab, srng); + num_buffs_reaped++; + } + diff --git a/queue-6.12/series b/queue-6.12/series index e32a3a9e4d..1225186728 100644 --- a/queue-6.12/series +++ b/queue-6.12/series @@ -207,3 +207,4 @@ block-remove-rq_list_move.patch block-add-a-rq_list-type.patch block-don-t-reorder-requests-in-blk_add_rq_to_plug.patch mm-vma-add-give_up_on_oom-option-on-modify-merge-use-in-uffd-release.patch +revert-wifi-ath12k-fix-invalid-entry-fetch-in-ath12k_dp_mon_srng_process.patch -- 2.47.3