diff options
| author | Koen Vandeputte <koen.vandeputte@ncentric.com> | 2019-04-08 14:15:26 +0200 |
|---|---|---|
| committer | Koen Vandeputte <koen.vandeputte@ncentric.com> | 2019-04-08 14:53:39 +0200 |
| commit | 8df12d76c642cd2e094e2c02fdf7b676fb902bc7 (patch) | |
| tree | 9ed8d8949c7a12c11849831301d20f847da83d46 /target/linux/generic/hack-4.19/662-remove_pfifo_fast.patch | |
| parent | 5387bc9cbb9ed205f08766523a296f21dfa83b56 (diff) | |
| download | upstream-8df12d76c642cd2e094e2c02fdf7b676fb902bc7.tar.gz upstream-8df12d76c642cd2e094e2c02fdf7b676fb902bc7.tar.bz2 upstream-8df12d76c642cd2e094e2c02fdf7b676fb902bc7.zip | |
kernel: bump 4.19 to 4.19.34
Refreshed all patches.
Removed:
- 030-PCI-dwc-skip-MSI-init-if-MSIs-have-been-explicitly-d.patch
Altered:
- 366-netfilter-nf_flow_table-clean-up-and-fix-dst-handlin.patch
- 650-netfilter-add-xt_OFFLOAD-target.patch
- 662-remove_pfifo_fast.patch
- 332-arc-add-OWRTDTB-section.patch
- 100-clocksource-drivers-arch_timer-Workaround-for-Allwin.patch
- 702-phy_add_aneg_done_function.patch
New symbols:
- ARC_IRQ_NO_AUTOSAVE
- SUN50I_ERRATUM_UNKNOWN1
Compile-tested: cns3xxx, imx6, sunxi
Runtime-tested: cns3xxx, imx6
Signed-off-by: Koen Vandeputte <koen.vandeputte@ncentric.com>
Diffstat (limited to 'target/linux/generic/hack-4.19/662-remove_pfifo_fast.patch')
| -rw-r--r-- | target/linux/generic/hack-4.19/662-remove_pfifo_fast.patch | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/target/linux/generic/hack-4.19/662-remove_pfifo_fast.patch b/target/linux/generic/hack-4.19/662-remove_pfifo_fast.patch index 8f54c516f9..0009940cd1 100644 --- a/target/linux/generic/hack-4.19/662-remove_pfifo_fast.patch +++ b/target/linux/generic/hack-4.19/662-remove_pfifo_fast.patch @@ -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,208 +595,6 @@ struct Qdisc_ops noqueue_qdisc_ops __rea +@@ -595,207 +595,6 @@ struct Qdisc_ops noqueue_qdisc_ops __rea .owner = THIS_MODULE, }; @@ -52,7 +52,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> - if (unlikely(err)) - return qdisc_drop_cpu(skb, qdisc, to_free); - -- qdisc_qstats_cpu_qlen_inc(qdisc); +- qdisc_qstats_atomic_qlen_inc(qdisc); - /* Note: skb can not be used after skb_array_produce(), - * so we better not use qdisc_qstats_cpu_backlog_inc() - */ @@ -77,7 +77,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> - if (likely(skb)) { - qdisc_qstats_cpu_backlog_dec(qdisc, skb); - qdisc_bstats_cpu_update(qdisc, skb); -- qdisc_qstats_cpu_qlen_dec(qdisc); +- qdisc_qstats_atomic_qlen_dec(qdisc); - } - - return skb; @@ -121,7 +121,6 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> - struct gnet_stats_queue *q = per_cpu_ptr(qdisc->cpu_qstats, i); - - q->backlog = 0; -- q->qlen = 0; - } -} - |