kernel: mac80211: refresh patchset

Refreshed:
- 311-mac80211-use-coarse-boottime-for-airtime-fairness-co.patch

Signed-off-by: Nick Hainke <vincent@systemli.org>
This commit is contained in:
Nick Hainke 2021-12-20 21:55:21 +01:00 committed by Daniel Golle
parent 694757a08f
commit 236c3ea730

View file

@ -13,7 +13,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
--- a/net/mac80211/tx.c --- a/net/mac80211/tx.c
+++ b/net/mac80211/tx.c +++ b/net/mac80211/tx.c
@@ -3827,7 +3827,7 @@ struct ieee80211_txq *ieee80211_next_txq @@ -3820,7 +3820,7 @@ struct ieee80211_txq *ieee80211_next_txq
{ {
struct ieee80211_local *local = hw_to_local(hw); struct ieee80211_local *local = hw_to_local(hw);
struct airtime_sched_info *air_sched; struct airtime_sched_info *air_sched;
@ -22,7 +22,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
struct ieee80211_txq *ret = NULL; struct ieee80211_txq *ret = NULL;
struct airtime_info *air_info; struct airtime_info *air_info;
struct txq_info *txqi = NULL; struct txq_info *txqi = NULL;
@@ -3954,7 +3954,7 @@ void ieee80211_update_airtime_weight(str @@ -3947,7 +3947,7 @@ void ieee80211_update_airtime_weight(str
u64 weight_sum = 0; u64 weight_sum = 0;
if (unlikely(!now)) if (unlikely(!now))
@ -31,7 +31,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
lockdep_assert_held(&air_sched->lock); lockdep_assert_held(&air_sched->lock);
@@ -3980,7 +3980,7 @@ void ieee80211_schedule_txq(struct ieee8 @@ -3973,7 +3973,7 @@ void ieee80211_schedule_txq(struct ieee8
struct ieee80211_local *local = hw_to_local(hw); struct ieee80211_local *local = hw_to_local(hw);
struct txq_info *txqi = to_txq_info(txq); struct txq_info *txqi = to_txq_info(txq);
struct airtime_sched_info *air_sched; struct airtime_sched_info *air_sched;
@ -40,7 +40,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
struct airtime_info *air_info; struct airtime_info *air_info;
u8 ac = txq->ac; u8 ac = txq->ac;
bool was_active; bool was_active;
@@ -4038,7 +4038,7 @@ static void __ieee80211_unschedule_txq(s @@ -4031,7 +4031,7 @@ static void __ieee80211_unschedule_txq(s
if (!purge) if (!purge)
airtime_set_active(air_sched, air_info, airtime_set_active(air_sched, air_info,
@ -49,7 +49,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
rb_erase_cached(&txqi->schedule_order, rb_erase_cached(&txqi->schedule_order,
&air_sched->active_txqs); &air_sched->active_txqs);
@@ -4126,7 +4126,7 @@ bool ieee80211_txq_may_transmit(struct i @@ -4119,7 +4119,7 @@ bool ieee80211_txq_may_transmit(struct i
if (RB_EMPTY_NODE(&txqi->schedule_order)) if (RB_EMPTY_NODE(&txqi->schedule_order))
goto out; goto out;