Skip to content

Commit 6423b21

Browse files
LorenzoBianconigregkh
authored andcommitted
mac80211: check if atf has been disabled in __ieee80211_schedule_txq
commit c13cf5c upstream. Check if atf has been disabled in __ieee80211_schedule_txq() in order to avoid a given sta is always put to the beginning of the active_txqs list and never moved to the end since deficit is not decremented in ieee80211_sta_register_airtime() Fixes: b4809e9 ("mac80211: Add airtime accounting and scheduling to TXQs") Signed-off-by: Lorenzo Bianconi <[email protected]> Acked-by: Toke Høiland-Jørgensen <[email protected]> Link: https://lore.kernel.org/r/93889406c50f1416214c079ca0b8c9faecc5143e.1608975195.git.lorenzo@kernel.org Signed-off-by: Johannes Berg <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
1 parent a00432f commit 6423b21

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

net/mac80211/tx.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -3836,7 +3836,7 @@ void __ieee80211_schedule_txq(struct ieee80211_hw *hw,
38363836
* get immediately moved to the back of the list on the next
38373837
* call to ieee80211_next_txq().
38383838
*/
3839-
if (txqi->txq.sta &&
3839+
if (txqi->txq.sta && local->airtime_flags &&
38403840
wiphy_ext_feature_isset(local->hw.wiphy,
38413841
NL80211_EXT_FEATURE_AIRTIME_FAIRNESS))
38423842
list_add(&txqi->schedule_order,

0 commit comments

Comments
 (0)