lkml.org 
[lkml]   [2017]   [Jul]   [3]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.9 115/172] mac80211: initialize SMPS field in HT capabilities
    Date
    4.9-stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Felix Fietkau <nbd@nbd.name>


    [ Upstream commit 43071d8fb3b7f589d72663c496a6880fb097533c ]

    ibss and mesh modes copy the ht capabilites from the band without
    overriding the SMPS state. Unfortunately the default value 0 for the
    SMPS field means static SMPS instead of disabled.

    This results in HT ibss and mesh setups using only single-stream rates,
    even though SMPS is not supposed to be active.

    Initialize SMPS to disabled for all bands on ieee80211_hw_register to
    ensure that the value is sane where it is not overriden with the real
    SMPS state.

    Reported-by: Elektra Wagenrad <onelektra@gmx.net>
    Signed-off-by: Felix Fietkau <nbd@nbd.name>
    [move VHT TODO comment to a better place]
    Signed-off-by: Johannes Berg <johannes.berg@intel.com>

    Signed-off-by: Sasha Levin <alexander.levin@verizon.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    ---
    net/mac80211/main.c | 13 +++++++++----
    1 file changed, 9 insertions(+), 4 deletions(-)

    --- a/net/mac80211/main.c
    +++ b/net/mac80211/main.c
    @@ -908,12 +908,17 @@ int ieee80211_register_hw(struct ieee802
    supp_ht = supp_ht || sband->ht_cap.ht_supported;
    supp_vht = supp_vht || sband->vht_cap.vht_supported;

    - if (sband->ht_cap.ht_supported)
    - local->rx_chains =
    - max(ieee80211_mcs_to_chains(&sband->ht_cap.mcs),
    - local->rx_chains);
    + if (!sband->ht_cap.ht_supported)
    + continue;

    /* TODO: consider VHT for RX chains, hopefully it's the same */
    + local->rx_chains =
    + max(ieee80211_mcs_to_chains(&sband->ht_cap.mcs),
    + local->rx_chains);
    +
    + /* no need to mask, SM_PS_DISABLED has all bits set */
    + sband->ht_cap.cap |= WLAN_HT_CAP_SM_PS_DISABLED <<
    + IEEE80211_HT_CAP_SM_PS_SHIFT;
    }

    /* if low-level driver supports AP, we also support VLAN */

    \
     
     \ /
      Last update: 2017-07-03 16:22    [W:4.660 / U:1.036 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site