diff options
author | Hauke Mehrtens <hauke@hauke-m.de> | 2020-12-06 00:17:59 +0100 |
---|---|---|
committer | Hauke Mehrtens <hauke@hauke-m.de> | 2020-12-11 20:20:16 +0100 |
commit | 0a59e2a76e6d58d95b8a0bdeca86090ceb794a59 (patch) | |
tree | 63a246005456e157cf0665067591a8ca8a107934 /package/kernel/mac80211/patches/subsys/352-mac80211-rework-locking-for-txq-scheduling-airtime-f.patch | |
parent | 3f5fecfd33d4c1c0bc96b790549ec7dc91e57781 (diff) | |
download | upstream-0a59e2a76e6d58d95b8a0bdeca86090ceb794a59.tar.gz upstream-0a59e2a76e6d58d95b8a0bdeca86090ceb794a59.tar.bz2 upstream-0a59e2a76e6d58d95b8a0bdeca86090ceb794a59.zip |
mac80211: Update to version 4.19.161-1
The removed patches were applied upstream.
The changes to 357-mac80211-optimize-skb-resizing.patch are more
complex. I think the patch already took care of the new changes done
upstream.
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Diffstat (limited to 'package/kernel/mac80211/patches/subsys/352-mac80211-rework-locking-for-txq-scheduling-airtime-f.patch')
-rw-r--r-- | package/kernel/mac80211/patches/subsys/352-mac80211-rework-locking-for-txq-scheduling-airtime-f.patch | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/package/kernel/mac80211/patches/subsys/352-mac80211-rework-locking-for-txq-scheduling-airtime-f.patch b/package/kernel/mac80211/patches/subsys/352-mac80211-rework-locking-for-txq-scheduling-airtime-f.patch index a71748b302..11fe01ec21 100644 --- a/package/kernel/mac80211/patches/subsys/352-mac80211-rework-locking-for-txq-scheduling-airtime-f.patch +++ b/package/kernel/mac80211/patches/subsys/352-mac80211-rework-locking-for-txq-scheduling-airtime-f.patch @@ -95,7 +95,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> * ieee80211_txq_may_transmit - check whether TXQ is allowed to transmit --- a/net/mac80211/tx.c +++ b/net/mac80211/tx.c -@@ -3637,16 +3637,17 @@ EXPORT_SYMBOL(ieee80211_tx_dequeue); +@@ -3648,16 +3648,17 @@ EXPORT_SYMBOL(ieee80211_tx_dequeue); struct ieee80211_txq *ieee80211_next_txq(struct ieee80211_hw *hw, u8 ac) { struct ieee80211_local *local = hw_to_local(hw); @@ -115,7 +115,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> if (txqi->txq.sta) { struct sta_info *sta = container_of(txqi->txq.sta, -@@ -3663,21 +3664,25 @@ struct ieee80211_txq *ieee80211_next_txq +@@ -3674,21 +3675,25 @@ struct ieee80211_txq *ieee80211_next_txq if (txqi->schedule_round == local->schedule_round[ac]) @@ -146,7 +146,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> if (list_empty(&txqi->schedule_order) && (!skb_queue_empty(&txqi->frags) || txqi->tin.backlog_packets)) { -@@ -3697,18 +3702,7 @@ void ieee80211_return_txq(struct ieee802 +@@ -3708,18 +3713,7 @@ void ieee80211_return_txq(struct ieee802 list_add_tail(&txqi->schedule_order, &local->active_txqs[txq->ac]); } @@ -165,7 +165,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> spin_unlock_bh(&local->active_txq_lock[txq->ac]); } EXPORT_SYMBOL(ieee80211_schedule_txq); -@@ -3721,7 +3715,7 @@ bool ieee80211_txq_may_transmit(struct i +@@ -3732,7 +3726,7 @@ bool ieee80211_txq_may_transmit(struct i struct sta_info *sta; u8 ac = txq->ac; @@ -174,7 +174,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> if (!txqi->txq.sta) goto out; -@@ -3751,34 +3745,27 @@ bool ieee80211_txq_may_transmit(struct i +@@ -3762,34 +3756,27 @@ bool ieee80211_txq_may_transmit(struct i sta->airtime[ac].deficit += sta->airtime_weight; list_move_tail(&txqi->schedule_order, &local->active_txqs[ac]); |