]> www.infradead.org Git - users/dwmw2/linux.git/commitdiff
wifi: mac80211: fix station NSS capability initialization order
authorBenjamin Lin <benjamin-jw.lin@mediatek.com>
Mon, 18 Nov 2024 08:07:22 +0000 (16:07 +0800)
committerJohannes Berg <johannes.berg@intel.com>
Tue, 3 Dec 2024 10:29:16 +0000 (11:29 +0100)
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>
net/mac80211/cfg.c

index b853afe2d2a68e54d309950711910d56e17b57f1..d3fc158ccaf61d0c1b871137395d7dc205dfe346 100644 (file)
@@ -1935,6 +1935,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
@@ -1944,8 +1946,6 @@ static int sta_link_apply_parameters(struct ieee80211_local *local,
                                              sband->band);
        }
 
-       ieee80211_sta_init_nss(link_sta);
-
        return 0;
 }