Message ID | 20250402181454.2699777-1-praneesh.p@oss.qualcomm.com |
---|---|
Headers | show |
Series | wifi: ath12k: Fix multicast memory leak in tx path | expand |
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
On 4/7/2025 10:46 PM, Jeff Johnson wrote: > 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 > Sure, I'll rebase to the TOT and send the next version.