diff options
| author | Johannes Berg <johannes.berg@intel.com> | 2014-08-25 12:08:09 +0200 |
|---|---|---|
| committer | Johannes Berg <johannes.berg@intel.com> | 2014-08-26 09:45:35 +0200 |
| commit | bb512ad0732232f1d2693bb68f31a76bed8f22ae (patch) | |
| tree | dfc3d371ea46492c44630567e34b1dfbed3a349b | |
| parent | regulatory: add NUL to alpha2 (diff) | |
| download | linux-bb512ad0732232f1d2693bb68f31a76bed8f22ae.tar.xz linux-bb512ad0732232f1d2693bb68f31a76bed8f22ae.zip | |
Revert "mac80211: disable uAPSD if all ACs are under ACM"
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.
Cc: stable@vger.kernel.org
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>
| -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 31a8afaf7332..b82a12a9f0f1 100644 --- a/net/mac80211/mlme.c +++ b/net/mac80211/mlme.c @@ -4376,8 +4376,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 { |