diff options
| author | Johannes Berg <johannes.berg@intel.com> | 2014-08-25 12:08:09 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-10-05 14:54:13 -0700 |
| commit | baa28fb6770eb3ccea48d4880a63bb976608a6ce (patch) | |
| tree | 78d9c987c05ade222361970d9cb0f023216643d0 /net | |
| parent | c301a4b0e53bd0f49a3532e14d19061d8d0ea1db (diff) | |
| download | linux-3.10-baa28fb6770eb3ccea48d4880a63bb976608a6ce.tar.gz linux-3.10-baa28fb6770eb3ccea48d4880a63bb976608a6ce.tar.bz2 linux-3.10-baa28fb6770eb3ccea48d4880a63bb976608a6ce.zip | |
Revert "mac80211: disable uAPSD if all ACs are under ACM"
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>
Diffstat (limited to 'net')
| -rw-r--r-- | net/mac80211/mlme.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/net/mac80211/mlme.c b/net/mac80211/mlme.c index fc94937cd7b..e606e4a113e 100644 --- a/net/mac80211/mlme.c +++ b/net/mac80211/mlme.c @@ -4395,8 +4395,7 @@ int ieee80211_mgd_assoc(struct ieee80211_sub_if_data *sdata, 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 { |