From: Greg KH <greg@kroah.com>
To: Hauke Mehrtens <hauke@hauke-m.de>
Cc: stable@vger.kernel.org, johannes@sipsolutions.net,
linux-wireless@vger.kernel.org, netdev@vger.kernel.org,
Johannes Berg <johannes.berg@intel.com>,
Miriam Rachel Korenblit <miriam.rachel.korenblit@intel.com>
Subject: Re: [PATCH 6.6] wifi: mac80211: track capability/opmode NSS separately
Date: Tue, 30 Jul 2024 15:53:07 +0200 [thread overview]
Message-ID: <2024073001-unarmored-friday-0b79@gregkh> (raw)
In-Reply-To: <20240729225849.1352302-1-hauke@hauke-m.de>
On Tue, Jul 30, 2024 at 12:58:49AM +0200, Hauke Mehrtens wrote:
> From: Johannes Berg <johannes.berg@intel.com>
>
> [ Upstream commit a8bca3e9371dc5e276af4168be099b2a05554c2a ]
>
> We're currently tracking rx_nss for each station, and that
> is meant to be initialized to the capability NSS and later
> reduced by the operating mode notification NSS.
>
> However, we're mixing up capabilities and operating mode
> NSS in the same variable. This forces us to recalculate
> the NSS capability on operating mode notification RX,
> which is a bit strange; due to the previous fix I had to
> never keep rx_nss as zero, it also means that the capa is
> never taken into account properly.
>
> Fix all this by storing the capability value, that can be
> recalculated unconditionally whenever needed, and storing
> the operating mode notification NSS separately, taking it
> into account when assigning the final rx_nss value.
>
> Cc: stable@vger.kernel.org
> Fixes: dd6c064cfc3f ("wifi: mac80211: set station RX-NSS on reconfig")
> Reviewed-by: Miriam Rachel Korenblit <miriam.rachel.korenblit@intel.com>
> Link: https://msgid.link/20240228120157.0e1c41924d1d.I0acaa234e0267227b7e3ef81a59117c8792116bc@changeid
> Signed-off-by: Johannes Berg <johannes.berg@intel.com>
> [Fixed trivial merge conflict in copyright year net/mac80211/sta_info.h]
> Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
> ---
> net/mac80211/cfg.c | 2 +-
> net/mac80211/ieee80211_i.h | 2 +-
> net/mac80211/rate.c | 2 +-
> net/mac80211/sta_info.h | 6 ++++-
> net/mac80211/vht.c | 46 ++++++++++++++++++--------------------
> 5 files changed, 30 insertions(+), 28 deletions(-)
>
Now queued up, thanks.
greg k-h
prev parent reply other threads:[~2024-07-30 13:53 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-07-29 22:58 [PATCH 6.6] wifi: mac80211: track capability/opmode NSS separately Hauke Mehrtens
2024-07-30 13:53 ` Greg KH [this message]
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=2024073001-unarmored-friday-0b79@gregkh \
--to=greg@kroah.com \
--cc=hauke@hauke-m.de \
--cc=johannes.berg@intel.com \
--cc=johannes@sipsolutions.net \
--cc=linux-wireless@vger.kernel.org \
--cc=miriam.rachel.korenblit@intel.com \
--cc=netdev@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