lkml.org 
[lkml]   [2014]   [Oct]   [3]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 3.16 270/357] Revert "mac80211: disable uAPSD if all ACs are under ACM"
    Date
    3.16-stable review patch.  If anyone has any objections, please let me know.

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

    From: Johannes Berg <johannes.berg@intel.com>

    commit bb512ad0732232f1d2693bb68f31a76bed8f22ae upstream.

    This reverts commit 24aa11ab8ae03292d38ec0dbd9bc2ac49fe8a6dd.

    That commit was wrong since it uses data that hasn't even been set
    up yet, but might be a hold-over from a previous connection.

    Additionally, it seems like a driver-specific workaround that
    shouldn't have been in mac80211 to start with.

    Fixes: 24aa11ab8ae0 ("mac80211: disable uAPSD if all ACs are under ACM")
    Reviewed-by: Luciano Coelho <luciano.coelho@intel.com>
    Signed-off-by: Johannes Berg <johannes.berg@intel.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    net/mac80211/mlme.c | 3 +--
    1 file changed, 1 insertion(+), 2 deletions(-)

    --- a/net/mac80211/mlme.c
    +++ b/net/mac80211/mlme.c
    @@ -4355,8 +4355,7 @@ int ieee80211_mgd_assoc(struct ieee80211
    rcu_read_unlock();

    if (bss->wmm_used && bss->uapsd_supported &&
    - (sdata->local->hw.flags & IEEE80211_HW_SUPPORTS_UAPSD) &&
    - sdata->wmm_acm != 0xff) {
    + (sdata->local->hw.flags & IEEE80211_HW_SUPPORTS_UAPSD)) {
    assoc_data->uapsd = true;
    ifmgd->flags |= IEEE80211_STA_UAPSD_ENABLED;
    } else {



    \
     
     \ /
      Last update: 2014-10-04 02:22    [W:2.322 / U:0.208 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site