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>
This commit is contained in:
Felix Fietkau 2016-11-03 12:13:32 +01:00
parent e2fd98793e
commit 12bd0f2820

View file

@ -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)