From 12bd0f282005c57b9ec144c531390e2fa8cd1590 Mon Sep 17 00:00:00 2001 From: Felix Fietkau Date: Thu, 3 Nov 2016 12:13:32 +0100 Subject: [PATCH] mac80211: replace the previous fix with a revert of the faulty upstream commit This avoids potential breakage in rt2x00usb Signed-off-by: Felix Fietkau --- ...c80211-allow-using-AP_LINK_PS-with-mac80211.patch} | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) rename package/kernel/mac80211/patches/{321-mac80211-fix-broken-AP-mode-handling-of-powersave-cl.patch => 321-Revert-mac80211-allow-using-AP_LINK_PS-with-mac80211.patch} (73%) 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 similarity index 73% rename from package/kernel/mac80211/patches/321-mac80211-fix-broken-AP-mode-handling-of-powersave-cl.patch rename to 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 -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 /* 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) -- 2.30.2