From: Johannes Berg Date: Mon, 25 Aug 2014 10:08:09 +0000 (+0200) Subject: Revert "mac80211: disable uAPSD if all ACs are under ACM" X-Git-Tag: fixes-for-v3.18-merge-window~162^2^2~1^2~5 X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bb512ad0732232f1d2693bb68f31a76bed8f22ae;p=pandora-kernel.git 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 Signed-off-by: Johannes Berg --- Reading git-diff-tree failed