Commit bb512ad0 authored Aug 25, 2014 by Johannes Berg

Revert "mac80211: disable uAPSD if all ACs are under ACM"



This reverts commit 24aa11ab.

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: 24aa11ab ("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>

parent a5fe8e76

net/mac80211/mlme.c

+1 −2

Original line number	Diff line number	Diff line
		@@ -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 {