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/322-mac80211-Add-airtime-accounting-and-scheduling-to-TX.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/322-mac80211-Add-airtime-accounting-and-scheduling-to-TX.patch')
| -rw-r--r-- | package/kernel/mac80211/patches/subsys/322-mac80211-Add-airtime-accounting-and-scheduling-to-TX.patch | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/package/kernel/mac80211/patches/subsys/322-mac80211-Add-airtime-accounting-and-scheduling-to-TX.patch b/package/kernel/mac80211/patches/subsys/322-mac80211-Add-airtime-accounting-and-scheduling-to-TX.patch index a09cf3d749..d028ee2496 100644 --- a/package/kernel/mac80211/patches/subsys/322-mac80211-Add-airtime-accounting-and-scheduling-to-TX.patch +++ b/package/kernel/mac80211/patches/subsys/322-mac80211-Add-airtime-accounting-and-scheduling-to-TX.patch @@ -125,7 +125,7 @@ Signed-off-by: Johannes Berg <johannes.berg@intel.com> * The values are not guaranteed to be coherent with regard to each other, i.e. --- a/net/mac80211/cfg.c +++ b/net/mac80211/cfg.c -@@ -1390,6 +1390,9 @@ static int sta_apply_parameters(struct i +@@ -1391,6 +1391,9 @@ static int sta_apply_parameters(struct i if (ieee80211_vif_is_mesh(&sdata->vif)) sta_apply_mesh_params(local, sta, params); @@ -289,7 +289,7 @@ Signed-off-by: Johannes Berg <johannes.berg@intel.com> } } -@@ -381,9 +378,12 @@ struct sta_info *sta_info_alloc(struct i +@@ -399,9 +396,12 @@ struct sta_info *sta_info_alloc(struct i if (sta_prepare_rate_control(local, sta, gfp)) goto free_txq; @@ -302,7 +302,7 @@ Signed-off-by: Johannes Berg <johannes.berg@intel.com> } for (i = 0; i < IEEE80211_NUM_TIDS; i++) -@@ -1826,6 +1826,27 @@ void ieee80211_sta_set_buffered(struct i +@@ -1838,6 +1838,27 @@ void ieee80211_sta_set_buffered(struct i } EXPORT_SYMBOL(ieee80211_sta_set_buffered); @@ -330,7 +330,7 @@ Signed-off-by: Johannes Berg <johannes.berg@intel.com> int sta_info_move_state(struct sta_info *sta, enum ieee80211_sta_state new_state) { -@@ -2192,6 +2213,23 @@ void sta_set_sinfo(struct sta_info *sta, +@@ -2208,6 +2229,23 @@ void sta_set_sinfo(struct sta_info *sta, sinfo->filled |= BIT_ULL(NL80211_STA_INFO_TX_FAILED); } @@ -412,7 +412,7 @@ Signed-off-by: Johannes Berg <johannes.berg@intel.com> spin_lock_bh(&local->active_txq_lock[txqi->txq.ac]); list_del_init(&txqi->schedule_order); spin_unlock_bh(&local->active_txq_lock[txqi->txq.ac]); -@@ -3631,11 +3634,28 @@ struct ieee80211_txq *ieee80211_next_txq +@@ -3642,11 +3645,28 @@ struct ieee80211_txq *ieee80211_next_txq lockdep_assert_held(&local->active_txq_lock[ac]); @@ -442,7 +442,7 @@ Signed-off-by: Johannes Berg <johannes.berg@intel.com> return NULL; list_del_init(&txqi->schedule_order); -@@ -3653,12 +3673,74 @@ void ieee80211_return_txq(struct ieee802 +@@ -3664,12 +3684,74 @@ void ieee80211_return_txq(struct ieee802 lockdep_assert_held(&local->active_txq_lock[txq->ac]); if (list_empty(&txqi->schedule_order) && |