diff options
| author | Danek Duvall <duvall@comfychair.org> | 2018-08-23 01:01:04 +0200 |
|---|---|---|
| committer | Johannes Berg <johannes.berg@intel.com> | 2018-08-28 11:08:59 +0200 |
| commit | 67d1ba8a6dc83d90cd58b89fa6cbf9ae35a0cf7f (patch) | |
| tree | 189ed1df3e24b4b56933514039b320a1842cc9a1 /net/mac80211 | |
| parent | cfg80211: remove division by size of sizeof(struct ieee80211_wmm_rule) (diff) | |
| download | linux-67d1ba8a6dc83d90cd58b89fa6cbf9ae35a0cf7f.tar.xz linux-67d1ba8a6dc83d90cd58b89fa6cbf9ae35a0cf7f.zip | |
mac80211: correct use of IEEE80211_VHT_CAP_RXSTBC_X
The mod mask for VHT capabilities intends to say that you can override
the number of STBC receive streams, and it does, but only by accident.
The IEEE80211_VHT_CAP_RXSTBC_X aren't bits to be set, but values (albeit
left-shifted). ORing the bits together gets the right answer, but we
should use the _MASK macro here instead.
Signed-off-by: Danek Duvall <duvall@comfychair.org>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'net/mac80211')
| -rw-r--r-- | net/mac80211/main.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/net/mac80211/main.c b/net/mac80211/main.c index 0358f20b675f..27cd64acaf00 100644 --- a/net/mac80211/main.c +++ b/net/mac80211/main.c @@ -470,10 +470,7 @@ static const struct ieee80211_vht_cap mac80211_vht_capa_mod_mask = { cpu_to_le32(IEEE80211_VHT_CAP_RXLDPC | IEEE80211_VHT_CAP_SHORT_GI_80 | IEEE80211_VHT_CAP_SHORT_GI_160 | - IEEE80211_VHT_CAP_RXSTBC_1 | - IEEE80211_VHT_CAP_RXSTBC_2 | - IEEE80211_VHT_CAP_RXSTBC_3 | - IEEE80211_VHT_CAP_RXSTBC_4 | + IEEE80211_VHT_CAP_RXSTBC_MASK | IEEE80211_VHT_CAP_TXSTBC | IEEE80211_VHT_CAP_SU_BEAMFORMER_CAPABLE | IEEE80211_VHT_CAP_SU_BEAMFORMEE_CAPABLE | |