linux-wireless.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Greg KH <greg@kroah.com>
To: Alexander Wetzel <alexander@wetzel-home.de>
Cc: linux-wireless@vger.kernel.org, johannes@sipsolutions.net,
	stable@vger.kernel.org
Subject: Re: [stable v6.1 2/2] wifi: mac80211: Fix iTXQ AMPDU fragmentation handling
Date: Fri, 27 Jan 2023 08:37:02 +0100	[thread overview]
Message-ID: <Y9N/HguY5B2E4kXw@kroah.com> (raw)
In-Reply-To: <Y9N/BQpu/2xC1v1t@kroah.com>

On Fri, Jan 27, 2023 at 08:36:37AM +0100, Greg KH wrote:
> 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@vger.kernel.org
> > Link: https://lore.kernel.org/r/20230106223141.98696-1-alexander@wetzel-home.de
> > Signed-off-by: Alexander Wetzel <alexander@wetzel-home.de>
> > ---
> >  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?

Argh, forgot to apply patch 1/2...

{sigh}  I need more coffee...

  reply	other threads:[~2023-01-27  7:37 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-01-21 22:33 [stable v6.1 1/2] wifi: mac80211: Abort iTXQ runs on queue stop Alexander Wetzel
2023-01-21 22:33 ` [stable v6.1 2/2] wifi: mac80211: Fix iTXQ AMPDU fragmentation handling Alexander Wetzel
2023-01-27  7:36   ` Greg KH
2023-01-27  7:37     ` Greg KH [this message]
2023-01-27  7:38   ` Greg KH

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=Y9N/HguY5B2E4kXw@kroah.com \
    --to=greg@kroah.com \
    --cc=alexander@wetzel-home.de \
    --cc=johannes@sipsolutions.net \
    --cc=linux-wireless@vger.kernel.org \
    --cc=stable@vger.kernel.org \
    /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;
as well as URLs for NNTP newsgroup(s).