On Sat, Jan 21, 2023 at 11:33:30PM +0100, Alexander Wetzel wrote:
> This is a backport of 'commit 592234e941f1 ("wifi: mac80211: Fix iTXQ
> AMPDU fragmentation handling")' from linux 6.2.
>
> mac80211 must not enable aggregation wile transmitting a fragmented
> MPDU. Enforce that for mac80211 internal TX queues (iTXQs).
>
> Cc: stable@xxxxxxxxxxxxxxx
> Link: https://lore.kernel.org/r/20230106223141.98696-1-alexander@xxxxxxxxxxxxxx
> Signed-off-by: Alexander Wetzel <alexander@xxxxxxxxxxxxxx>
> ---
> net/mac80211/agg-tx.c | 2 --
> net/mac80211/ht.c | 37 +++++++++++++++++++++++++++++++++++++
> net/mac80211/tx.c | 13 +++++++------
> 3 files changed, 44 insertions(+), 8 deletions(-)
This backport fails to apply to the 6.1.y tree:
Applying patch wifi-mac80211-fix-itxq-ampdu-fragmentation-handling.patch
patching file net/mac80211/agg-tx.c
patching file net/mac80211/ht.c
patching file net/mac80211/tx.c
Hunk #2 FAILED at 3726.
Hunk #3 FAILED at 3739.
Hunk #4 succeeded at 3744 (offset -7 lines).
Hunk #5 succeeded at 3797 (offset -7 lines).
2 out of 5 hunks FAILED -- rejects in file net/mac80211/tx.c
Try again?
thanks,
greg k-h
