| From 2e287a6489bd4368229ec60d5baa757e9482d415 Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Mon, 18 Nov 2024 16:07:22 +0800 |
| Subject: wifi: mac80211: fix station NSS capability initialization order |
| |
| From: Benjamin Lin <benjamin-jw.lin@mediatek.com> |
| |
| [ Upstream commit 819e0f1e58e0ba3800cd9eb96b2a39e44e49df97 ] |
| |
| Station's spatial streaming capability should be initialized before |
| handling VHT OMN, because the handling requires the capability information. |
| |
| Fixes: a8bca3e9371d ("wifi: mac80211: track capability/opmode NSS separately") |
| Signed-off-by: Benjamin Lin <benjamin-jw.lin@mediatek.com> |
| Link: https://patch.msgid.link/20241118080722.9603-1-benjamin-jw.lin@mediatek.com |
| [rewrite subject] |
| Signed-off-by: Johannes Berg <johannes.berg@intel.com> |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| net/mac80211/cfg.c | 4 ++-- |
| 1 file changed, 2 insertions(+), 2 deletions(-) |
| |
| diff --git a/net/mac80211/cfg.c b/net/mac80211/cfg.c |
| index 16d47123a73c..1b1bf044378d 100644 |
| --- a/net/mac80211/cfg.c |
| +++ b/net/mac80211/cfg.c |
| @@ -1911,6 +1911,8 @@ static int sta_link_apply_parameters(struct ieee80211_local *local, |
| params->eht_capa_len, |
| link_sta); |
| |
| + ieee80211_sta_init_nss(link_sta); |
| + |
| if (params->opmode_notif_used) { |
| /* returned value is only needed for rc update, but the |
| * rc isn't initialized here yet, so ignore it |
| @@ -1920,8 +1922,6 @@ static int sta_link_apply_parameters(struct ieee80211_local *local, |
| sband->band); |
| } |
| |
| - ieee80211_sta_init_nss(link_sta); |
| - |
| return 0; |
| } |
| |
| -- |
| 2.39.5 |
| |
