| Message ID | 93889406c50f1416214c079ca0b8c9faecc5143e.1608975195.git.lorenzo@kernel.org (mailing list archive) |
|---|---|
| State | Accepted |
| Delegated to: | Johannes Berg |
| Headers | show |
| Series | [mac80211] mac80211: check if atf has been disabled in __ieee80211_schedule_txq | expand |
Lorenzo Bianconi <lorenzo@kernel.org> writes: > 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: b4809e9484da1 ("mac80211: Add airtime accounting and scheduling to TXQs") > Signed-off-by: Lorenzo Bianconi <lorenzo@kernel.org> Acked-by: Toke Høiland-Jørgensen <toke@toke.dk> > --- > net/mac80211/tx.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/net/mac80211/tx.c b/net/mac80211/tx.c > index 56a4d0d20a26..fa69644a14f9 100644 > --- a/net/mac80211/tx.c > +++ b/net/mac80211/tx.c > @@ -3836,7 +3836,7 @@ void __ieee80211_schedule_txq(struct ieee80211_hw *hw, > * get immediately moved to the back of the list on the next > * call to ieee80211_next_txq(). > */ > - if (txqi->txq.sta && > + if (txqi->txq.sta && local->airtime_flags && > wiphy_ext_feature_isset(local->hw.wiphy, > NL80211_EXT_FEATURE_AIRTIME_FAIRNESS)) > list_add(&txqi->schedule_order, > -- > 2.29.2
diff --git a/net/mac80211/tx.c b/net/mac80211/tx.c index 56a4d0d20a26..fa69644a14f9 100644 --- a/net/mac80211/tx.c +++ b/net/mac80211/tx.c @@ -3836,7 +3836,7 @@ void __ieee80211_schedule_txq(struct ieee80211_hw *hw, * get immediately moved to the back of the list on the next * call to ieee80211_next_txq(). */ - if (txqi->txq.sta && + if (txqi->txq.sta && local->airtime_flags && wiphy_ext_feature_isset(local->hw.wiphy, NL80211_EXT_FEATURE_AIRTIME_FAIRNESS)) list_add(&txqi->schedule_order,
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: b4809e9484da1 ("mac80211: Add airtime accounting and scheduling to TXQs") Signed-off-by: Lorenzo Bianconi <lorenzo@kernel.org> --- net/mac80211/tx.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)