]> git.ipfire.org Git - thirdparty/kernel/stable.git/commit
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 20:41:07 +0000 (13:41 -0700)
commitd9ecad333f0b4abb6d67f572a9476d34ebdaacc0
treec3d1852b4ba51b8b20c2d866cccb85b4a5edcd94
parent240f589d340c956acac25d1d027266d1060ab773
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