domenico/openwrt_NSS_ACW
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

kernel: bump 5.4 to 5.4.124

Browse Source 
Manually rebased
  generic/hack-5.4/662-remove_pfifo_fast.patch
  ramips/patches-5.4/0048-asoc-add-mt7620-support.patch

All others updated automatically.

Compile-tested on: armvirt/64, x86/generic, ath79/generic, ramips/mt7621
Runtime-tested on: armvirt/64, x86/generic, ath79/generic

Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
This commit is contained in:
Hauke Mehrtens
2021-06-05 01:08:30 +02:00
parent 1b27d89d40
commit b55d3d6904
45 changed files with 168 additions and 167 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
target/linux/generic/hack-5.4/662-remove_pfifo_fast.patch
View File

@@ -10,7 +10,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
--- a/net/sched/sch_generic.c
+++ b/net/sched/sch_generic.c
@@ -595,211 +595,6 @@ struct Qdisc_ops noqueue_qdisc_ops __rea
@@ -620,230 +620,6 @@ struct Qdisc_ops noqueue_qdisc_ops __rea
.owner = THIS_MODULE,
};
@@ -64,8 +64,10 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
-{
- struct pfifo_fast_priv *priv = qdisc_priv(qdisc);
- struct sk_buff *skb = NULL;
- bool need_retry = true;
- int band;
-
-retry:
- for (band = 0; band < PFIFO_FAST_BANDS && !skb; band++) {
- struct skb_array *q = band2list(priv, band);
-
@@ -76,6 +78,23 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
- }
- if (likely(skb)) {
- qdisc_update_stats_at_dequeue(qdisc, skb);
- } else if (need_retry &&
- test_bit(__QDISC_STATE_MISSED, &qdisc->state)) {
- /* Delay clearing the STATE_MISSED here to reduce
- * the overhead of the second spin_trylock() in
- * qdisc_run_begin() and __netif_schedule() calling
- * in qdisc_run_end().
- */
- clear_bit(__QDISC_STATE_MISSED, &qdisc->state);
-
- /* Make sure dequeuing happens after clearing
- * STATE_MISSED.
- */
- smp_mb__after_atomic();
-
- need_retry = false;
-
- goto retry;
- } else {
- WRITE_ONCE(qdisc->empty, true);
- }