On Tue, Jul 30, 2024 at 12:58:49AM +0200, Hauke Mehrtens wrote:
> From: Johannes Berg <johannes.berg@xxxxxxxxx>
>
> [ 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@xxxxxxxxxxxxxxx
> Fixes: dd6c064cfc3f ("wifi: mac80211: set station RX-NSS on reconfig")
> Reviewed-by: Miriam Rachel Korenblit <miriam.rachel.korenblit@xxxxxxxxx>
> Link: https://msgid.link/20240228120157.0e1c41924d1d.I0acaa234e0267227b7e3ef81a59117c8792116bc@changeid
> Signed-off-by: Johannes Berg <johannes.berg@xxxxxxxxx>
> [Fixed trivial merge conflict in copyright year net/mac80211/sta_info.h]
> Signed-off-by: Hauke Mehrtens <hauke@xxxxxxxxxx>
> ---
> 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
