From 984d37992a2c77f235c8fc3c5ce3b65440b671d6 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Tue, 22 Apr 2025 15:07:22 +0200 Subject: [PATCH] 6.14-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.14/series | 1 + 2 files changed, 34 insertions(+) create mode 100644 queue-6.14/revert-wifi-ath12k-fix-invalid-entry-fetch-in-ath12k_dp_mon_srng_process.patch diff --git a/queue-6.14/revert-wifi-ath12k-fix-invalid-entry-fetch-in-ath12k_dp_mon_srng_process.patch b/queue-6.14/revert-wifi-ath12k-fix-invalid-entry-fetch-in-ath12k_dp_mon_srng_process.patch new file mode 100644 index 0000000000..4257b58d7f --- /dev/null +++ b/queue-6.14/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:03:50 2025 +From: Alexander Tsoy +Date: Tue, 22 Apr 2025 15:02:36 +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: <20250422120237.228960-1-alexander@tsoy.me> + +From: Alexander Tsoy + +This reverts commit 0c1015493f0e3979bcbd3a12ebc0977578c87f21 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 +@@ -2473,7 +2473,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.14/series b/queue-6.14/series index 29765ec091..0d812ad5f2 100644 --- a/queue-6.14/series +++ b/queue-6.14/series @@ -234,3 +234,4 @@ platform-x86-msi-wmi-platform-workaround-a-acpi-firmware-bug.patch drm-amd-display-temporarily-disable-hostvm-on-dcn31.patch nvmet-fc-remove-unused-functions.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