diff options
| author | Johannes Berg <johannes.berg@intel.com> | 2024-02-26 22:39:13 +0200 |
|---|---|---|
| committer | iwlwifi publisher <> | 2024-04-17 12:59:09 +0000 |
| commit | a0feb58d3b9741ec58c89fbefcb51096ae13dc66 (patch) | |
| tree | a10691f95c40b265773d8ec6503bc0710f2903f6 | |
| parent | 157af6c17fbe7dfd7530a16cd36abb2a6ec9e3e8 (diff) | |
| download | backport-iwlwifi-a0feb58d3b9741ec58c89fbefcb51096ae13dc66.tar.gz | |
[BUGFIX] 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.
type=bugfix
fixes=I3e61f4cfe9da89008e1854160093c76a1e69dc2a
ticket=none
Change-Id: Ib70a558bc6bdbcec3d9e663079229dfcc2493682
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Reviewed-on: https://gerritwcs.ir.intel.com/c/iwlwifi-stack-dev/+/96336
automatic-review: iil_jenkins iil_jenkins <EC.GER.UNIX.IIL.JENKINS@INTEL.COM>
tested: iil_jenkins iil_jenkins <EC.GER.UNIX.IIL.JENKINS@INTEL.COM>
Reviewed-by: Miriam Rachel Korenblit <miriam.rachel.korenblit@intel.com>
x-iwlwifi-stack-dev: 62d79bfe588497487ef6cecaa452be4a2ea3608b
| -rw-r--r-- | net/mac80211/mlme.c | 3 | ||||
| -rw-r--r-- | versions | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/net/mac80211/mlme.c b/net/mac80211/mlme.c index e1fac3d491..2daa9eb56a 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, @@ -2,4 +2,4 @@ BACKPORTS_VERSION="(see git)" BACKPORTED_KERNEL_VERSION="(see git)" BACKPORTED_KERNEL_NAME="iwlwifi" BACKPORTS_BUILD_TSTAMP=__DATE__ \" \" __TIME__ -BACKPORTS_GIT_TRACKED="iwlwifi-stack-public:master:11944:be190e1a" +BACKPORTS_GIT_TRACKED="iwlwifi-stack-public:master:11945:62d79bfe" |