Revert "mac80211: disable uAPSD if all ACs are under ACM"
authorJohannes Berg <johannes.berg@intel.com>
Mon, 25 Aug 2014 10:08:09 +0000 (12:08 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sun, 5 Oct 2014 21:54:13 +0000 (14:54 -0700)
commitbaa28fb6770eb3ccea48d4880a63bb976608a6ce
tree78d9c987c05ade222361970d9cb0f023216643d0
parentc301a4b0e53bd0f49a3532e14d19061d8d0ea1db
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>
net/mac80211/mlme.c