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:52:20 +0000 (14:52 -0700)
commit32fcd59e6ba2fec1707bca80da3c4e5a5f5558a5
tree7316fa58eab458ef562a253c873643effa509661
parentbd6f4290fa6cdd0583b936b4217dd8428d17186b
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