lkml.org 
[lkml]   [2018]   [Sep]   [24]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH AUTOSEL 4.4 02/18] mac80211: correct use of IEEE80211_VHT_CAP_RXSTBC_X
    Date
    From: Danek Duvall <duvall@comfychair.org>

    [ Upstream commit 67d1ba8a6dc83d90cd58b89fa6cbf9ae35a0cf7f ]

    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>
    Signed-off-by: Sasha Levin <alexander.levin@microsoft.com>
    ---
    net/mac80211/main.c | 5 +----
    1 file changed, 1 insertion(+), 4 deletions(-)

    diff --git a/net/mac80211/main.c b/net/mac80211/main.c
    index 2ee53dc1ddf7..d784d29a4fd6 100644
    --- a/net/mac80211/main.c
    +++ b/net/mac80211/main.c
    @@ -460,10 +460,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 |
    --
    2.17.1
    \
     
     \ /
      Last update: 2018-09-24 16:55    [W:5.340 / U:0.016 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site