aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic/hack-5.10
diff options
context:
space:
mode:
authorRui Salvaterra <rsalvaterra@gmail.com>2021-09-22 21:31:09 +0100
committerDaniel Golle <daniel@makrotopia.org>2021-09-30 22:29:33 +0100
commit9664b41c05ff95b8e7ffa7ca2b0c8c35234c5425 (patch)
treecb9b75aaa873156b352d3f6058b1e872c7d4ba31 /target/linux/generic/hack-5.10
parent6e7fadb0c7aa1a4cedc6cc72d640f94efb15c127 (diff)
downloadupstream-9664b41c05ff95b8e7ffa7ca2b0c8c35234c5425.tar.gz
upstream-9664b41c05ff95b8e7ffa7ca2b0c8c35234c5425.tar.bz2
upstream-9664b41c05ff95b8e7ffa7ca2b0c8c35234c5425.zip
kernel: bump 5.10 to 5.10.68
Deleted (upstreamed): generic/backport-5.10/610-v5.13-02-netfilter-Fix-fall-through-warnings-for-Clang.patch generic/backport-5.10/792-v5.15-0001-net-dsa-b53-Fix-calculating-number-of-switch-ports.patch generic/backport-5.10/792-v5.15-0002-net-dsa-b53-Set-correct-number-of-ports-in-the-DSA-s.patch generic/backport-5.10/792-v5.15-0003-net-dsa-b53-Fix-IMP-port-setup-on-BCM5301x.patch generic/backport-5.10/840-0001-PCI-of-Don-t-fail-devm_pci_alloc_host_bridge-on-miss.patch generic/backport-5.10/840-0002-PCI-iproc-Fix-BCMA-probe-resource-handling.patch generic/pending-5.10/498-mtd-mtdconcat-select-readwrite-function.patch Signed-off-by: Rui Salvaterra <rsalvaterra@gmail.com>
Diffstat (limited to 'target/linux/generic/hack-5.10')
-rw-r--r--target/linux/generic/hack-5.10/660-fq_codel_defaults.patch2
-rw-r--r--target/linux/generic/hack-5.10/661-use_fq_codel_by_default.patch4
2 files changed, 3 insertions, 3 deletions
diff --git a/target/linux/generic/hack-5.10/660-fq_codel_defaults.patch b/target/linux/generic/hack-5.10/660-fq_codel_defaults.patch
index 6794349e26..5541c0bc89 100644
--- a/target/linux/generic/hack-5.10/660-fq_codel_defaults.patch
+++ b/target/linux/generic/hack-5.10/660-fq_codel_defaults.patch
@@ -13,7 +13,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
--- a/net/sched/sch_fq_codel.c
+++ b/net/sched/sch_fq_codel.c
-@@ -461,7 +461,11 @@ static int fq_codel_init(struct Qdisc *s
+@@ -469,7 +469,11 @@ static int fq_codel_init(struct Qdisc *s
sch->limit = 10*1024;
q->flows_cnt = 1024;
diff --git a/target/linux/generic/hack-5.10/661-use_fq_codel_by_default.patch b/target/linux/generic/hack-5.10/661-use_fq_codel_by_default.patch
index 33c8c55ab6..103148d0d6 100644
--- a/target/linux/generic/hack-5.10/661-use_fq_codel_by_default.patch
+++ b/target/linux/generic/hack-5.10/661-use_fq_codel_by_default.patch
@@ -55,7 +55,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
register_qdisc(&pfifo_head_drop_qdisc_ops);
--- a/net/sched/sch_fq_codel.c
+++ b/net/sched/sch_fq_codel.c
-@@ -701,7 +701,7 @@ static const struct Qdisc_class_ops fq_c
+@@ -709,7 +709,7 @@ static const struct Qdisc_class_ops fq_c
.walk = fq_codel_walk,
};
@@ -64,7 +64,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
.cl_ops = &fq_codel_class_ops,
.id = "fq_codel",
.priv_size = sizeof(struct fq_codel_sched_data),
-@@ -716,6 +716,7 @@ static struct Qdisc_ops fq_codel_qdisc_o
+@@ -724,6 +724,7 @@ static struct Qdisc_ops fq_codel_qdisc_o
.dump_stats = fq_codel_dump_stats,
.owner = THIS_MODULE,
};