Skip to content

Commit

Permalink
wifi: mac80211: fix station NSS capability initialization order
Browse files Browse the repository at this point in the history
[ Upstream commit 819e0f1 ]

Station's spatial streaming capability should be initialized before
handling VHT OMN, because the handling requires the capability information.

Fixes: a8bca3e ("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>
  • Loading branch information
Benjamin Lin authored and gregkh committed Dec 19, 2024
1 parent fbe94d4 commit 80579c1
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions net/mac80211/cfg.c
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -1920,8 +1922,6 @@ static int sta_link_apply_parameters(struct ieee80211_local *local,
sband->band);
}

ieee80211_sta_init_nss(link_sta);

return 0;
}

Expand Down

0 comments on commit 80579c1

Please sign in to comment.