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)
committerJohannes Berg <johannes.berg@intel.com>
Tue, 26 Aug 2014 07:45:35 +0000 (09:45 +0200)
commitbb512ad0732232f1d2693bb68f31a76bed8f22ae
treedfc3d371ea46492c44630567e34b1dfbed3a349b
parenta5fe8e7695dc3f547e955ad2b662e3e72969e506
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>
net/mac80211/mlme.c