diff options
| author | Johannes Berg <johannes.berg@intel.com> | 2024-02-28 11:40:51 +0300 |
|---|---|---|
| committer | Johannes Berg <johannes.berg@intel.com> | 2024-03-04 16:31:02 +0300 |
| commit | bf7bc8c5974b78a09f266be3a5a84ed3865f30a6 (patch) | |
| tree | 49ba039121d2032762b350e5d23e354afc0e2807 /net/mac80211 | |
| parent | 5fcc7c51f9e72d1e62991f8b32be4a5adf44d556 (diff) | |
| download | linux-bf7bc8c5974b78a09f266be3a5a84ed3865f30a6.tar.xz | |
wifi: mac80211: don't add VHT capa on links without them
When a link doesn't have VHT capability, before the rework
we'd have set IEEE80211_CONN_DISABLE_VHT, but now with the
linear progression of 'mode', we no longer have that. Add
an explicit check for VHT being supported, so we don't add
a zeroed VHT capabilities element where it shouldn't be.
Fixes: 310c8387c638 ("wifi: mac80211: clean up connection process")
Reviewed-by: Miriam Rachel Korenblit <miriam.rachel.korenblit@intel.com>
Link: https://msgid.link/20240228094207.bfe4283bcde7.Ib70a558bc6bdbcec3d9e663079229dfcc2493682@changeid
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'net/mac80211')
| -rw-r--r-- | net/mac80211/mlme.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/net/mac80211/mlme.c b/net/mac80211/mlme.c index c60d23da91fe..a2dca15d9c2e 100644 --- a/net/mac80211/mlme.c +++ b/net/mac80211/mlme.c @@ -1319,7 +1319,8 @@ static size_t ieee80211_assoc_link_elems(struct ieee80211_sub_if_data *sdata, offset); if (sband->band != NL80211_BAND_6GHZ && - assoc_data->link[link_id].conn.mode >= IEEE80211_CONN_MODE_VHT) { + assoc_data->link[link_id].conn.mode >= IEEE80211_CONN_MODE_VHT && + sband->vht_cap.vht_supported) { bool mu_mimo_owner = ieee80211_add_vht_ie(sdata, skb, sband, &assoc_data->link[link_id].ap_vht_cap, |