From: Jeff Johnson <jeff.johnson@oss.qualcomm.com>
To: P Praneesh <praneesh.p@oss.qualcomm.com>, ath12k@lists.infradead.org
Cc: linux-wireless@vger.kernel.org
Subject: Re: [PATCH ath-next 0/4] wifi: ath12k: Fix multicast memory leak in tx path
Date: Mon, 7 Apr 2025 10:16:03 -0700 [thread overview]
Message-ID: <406a43b8-10ad-4bb2-b27b-e97bb1c992b0@oss.qualcomm.com> (raw)
In-Reply-To: <20250402181454.2699777-1-praneesh.p@oss.qualcomm.com>
On 4/2/2025 11:14 AM, P Praneesh wrote:
> Address the memory leak caused by extended skb allocation observed during
> multicast transmission in this series.
>
> P Praneesh (4):
> wifi: ath12k: Handle error cases during extended skb allocation
> wifi: ath12k: Refactor tx descriptor handling in tx completion handler
> wifi: ath12k: Fix memory leak during extended skb allocation
> wifi: ath12k: Use skb->len for dma_unmap_single() length parameter
>
> drivers/net/wireless/ath/ath12k/dp.c | 10 ++-
> drivers/net/wireless/ath/ath12k/dp.h | 7 ++
> drivers/net/wireless/ath/ath12k/dp_tx.c | 87 ++++++++++++++-----------
> 3 files changed, 64 insertions(+), 40 deletions(-)
>
>
> base-commit: ba613742db305037ca2193b2b552b769c4f2a5f7
Please rebase to current ath/main
Applying: wifi: ath12k: Handle error cases during extended skb allocation
Applying: wifi: ath12k: Refactor tx descriptor handling in tx completion handler
Using index info to reconstruct a base tree...
M drivers/net/wireless/ath/ath12k/dp.h
M drivers/net/wireless/ath/ath12k/dp_tx.c
Falling back to patching base and 3-way merge...
Auto-merging drivers/net/wireless/ath/ath12k/dp_tx.c
CONFLICT (content): Merge conflict in drivers/net/wireless/ath/ath12k/dp_tx.c
Auto-merging drivers/net/wireless/ath/ath12k/dp.h
Recorded preimage for 'drivers/net/wireless/ath/ath12k/dp_tx.c'
error: Failed to merge in the changes.
Patch failed at 0002 wifi: ath12k: Refactor tx descriptor handling in tx completion handler
/jeff
next prev parent reply other threads:[~2025-04-07 18:51 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-04-02 18:14 [PATCH ath-next 0/4] wifi: ath12k: Fix multicast memory leak in tx path P Praneesh
2025-04-02 18:14 ` [PATCH ath-next 1/4] wifi: ath12k: Handle error cases during extended skb allocation P Praneesh
2025-04-02 18:14 ` [PATCH ath-next 2/4] wifi: ath12k: Refactor tx descriptor handling in tx completion handler P Praneesh
2025-04-02 18:14 ` [PATCH ath-next 3/4] wifi: ath12k: Fix memory leak during extended skb allocation P Praneesh
2025-04-02 18:14 ` [PATCH ath-next 4/4] wifi: ath12k: Use skb->len for dma_unmap_single() length parameter P Praneesh
2025-04-07 17:16 ` Jeff Johnson [this message]
2025-04-08 6:07 ` [PATCH ath-next 0/4] wifi: ath12k: Fix multicast memory leak in tx path Praneesh P
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=406a43b8-10ad-4bb2-b27b-e97bb1c992b0@oss.qualcomm.com \
--to=jeff.johnson@oss.qualcomm.com \
--cc=ath12k@lists.infradead.org \
--cc=linux-wireless@vger.kernel.org \
--cc=praneesh.p@oss.qualcomm.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox