|
|
@@ -13,7 +13,7 @@ Signed-off-by: Felix Fietkau <[email protected]>
|
|
|
|
|
|
--- a/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 airtime_sched_info *air_sched;
|
|
|
@@ -22,7 +22,7 @@ Signed-off-by: Felix Fietkau <[email protected]>
|
|
|
struct ieee80211_txq *ret = NULL;
|
|
|
struct airtime_info *air_info;
|
|
|
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;
|
|
|
|
|
|
if (unlikely(!now))
|
|
|
@@ -31,7 +31,7 @@ Signed-off-by: Felix Fietkau <[email protected]>
|
|
|
|
|
|
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 txq_info *txqi = to_txq_info(txq);
|
|
|
struct airtime_sched_info *air_sched;
|
|
|
@@ -40,7 +40,7 @@ Signed-off-by: Felix Fietkau <[email protected]>
|
|
|
struct airtime_info *air_info;
|
|
|
u8 ac = txq->ac;
|
|
|
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)
|
|
|
airtime_set_active(air_sched, air_info,
|
|
|
@@ -49,7 +49,7 @@ Signed-off-by: Felix Fietkau <[email protected]>
|
|
|
|
|
|
rb_erase_cached(&txqi->schedule_order,
|
|
|
&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))
|
|
|
goto out;
|
|
|
|