[source] mac80211: replace the previous fix with a revert of the faulty upstream commit

LEDE Commits lede-commits at lists.infradead.org
Thu Nov 3 04:13:59 PDT 2016

nbd pushed a commit to source.git, branch master:

commit 12bd0f282005c57b9ec144c531390e2fa8cd1590
Author: Felix Fietkau <nbd at nbd.name>
AuthorDate: Thu Nov 3 12:13:32 2016 +0100

    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 at nbd.name>
 ...evert-mac80211-allow-using-AP_LINK_PS-with-mac80211.patch} | 11 ++++++-----
 1 file 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
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 bbf7918..ace20e7 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 at 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 at 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))
  	if (sta->dead)

More information about the lede-commits mailing list