aboutsummaryrefslogtreecommitdiffstats
path: root/package
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@nbd.name>2016-11-03 12:13:32 +0100
committerFelix Fietkau <nbd@nbd.name>2016-11-03 12:13:50 +0100
commit12bd0f282005c57b9ec144c531390e2fa8cd1590 (patch)
treed0045458e7d4ebfe5c0d0782a1bdba47b3568f2a /package
parente2fd98793e60306a06427a9374e893d380373ef1 (diff)
downloadupstream-12bd0f282005c57b9ec144c531390e2fa8cd1590.tar.gz
upstream-12bd0f282005c57b9ec144c531390e2fa8cd1590.tar.bz2
upstream-12bd0f282005c57b9ec144c531390e2fa8cd1590.zip
mac80211: replace the previous fix with a revert of the faulty upstream commit
This avoids potential breakage in rt2x00usb Signed-off-by: Felix Fietkau <nbd@nbd.name>
Diffstat (limited to 'package')
-rw-r--r--package/kernel/mac80211/patches/321-Revert-mac80211-allow-using-AP_LINK_PS-with-mac80211.patch (renamed from package/kernel/mac80211/patches/321-mac80211-fix-broken-AP-mode-handling-of-powersave-cl.patch)11
1 files changed, 6 insertions, 5 deletions
diff --git a/package/kernel/mac80211/patches/321-mac80211-fix-broken-AP-mode-handling-of-powersave-cl.patch b/package/kernel/mac80211/patches/321-Revert-mac80211-allow-using-AP_LINK_PS-with-mac80211.patch
index bbf791810c..ace20e706b 100644
--- a/package/kernel/mac80211/patches/321-mac80211-fix-broken-AP-mode-handling-of-powersave-cl.patch
+++ b/package/kernel/mac80211/patches/321-Revert-mac80211-allow-using-AP_LINK_PS-with-mac80211.patch
@@ -1,9 +1,10 @@
From: Felix Fietkau <nbd@nbd.name>
-Date: Thu, 3 Nov 2016 10:47:21 +0100
-Subject: [PATCH] mac80211: fix broken AP mode handling of powersave clients
+Date: Thu, 3 Nov 2016 12:10:34 +0100
+Subject: [PATCH] Revert "mac80211: allow using AP_LINK_PS with
+ mac80211-generated TIM IE"
+
+This reverts commit c68df2e7be0c1238ea3c281fd744a204ef3b15a0.
-Commit c68df2e7be0c ("mac80211: allow using AP_LINK_PS with
-mac80211-generated TIM IE") introduced a logic error, where
__sta_info_recalc_tim turns into a no-op if local->ops->set_tim is not
set. This prevents the beacon TIM bit from being set for all drivers
that do not implement this op (almost all of them), thus thoroughly
@@ -21,7 +22,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
/* No need to do anything if the driver does all */
- if (!local->ops->set_tim)
-+ if (local->ops->set_tim)
++ if (ieee80211_hw_check(&local->hw, AP_LINK_PS))
return;
if (sta->dead)