aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic/patches-3.18/662-use_fq_codel_by_default.patch
diff options
context:
space:
mode:
authorZoltan HERPAI <wigyori@uid0.hu>2016-10-27 15:13:36 +0200
committerZoltan HERPAI <wigyori@uid0.hu>2016-10-27 15:13:36 +0200
commitf14d3f5d46d9ef534cd51360f066260fb434548f (patch)
tree81ec5060ed9ba99e9bd1eeb2556737cfe0015158 /target/linux/generic/patches-3.18/662-use_fq_codel_by_default.patch
parentce116bc6f997d8d6e6b976cacce5d4c60d705fc6 (diff)
downloadmaster-187ad058-f14d3f5d46d9ef534cd51360f066260fb434548f.tar.gz
master-187ad058-f14d3f5d46d9ef534cd51360f066260fb434548f.tar.bz2
master-187ad058-f14d3f5d46d9ef534cd51360f066260fb434548f.zip
generic/3.18: bump kernel to 3.18.44
Patch 610- is updated as check_entry helper was killed in 3.18.37 Patch 666- is updated (thanks to Stijn Tintel) Fixes CVE-2016-5195 (dirtycow) Compile-tested on adm5120 and mcs814x Signed-off-by: Zoltan HERPAI <wigyori@uid0.hu>
Diffstat (limited to 'target/linux/generic/patches-3.18/662-use_fq_codel_by_default.patch')
-rw-r--r--target/linux/generic/patches-3.18/662-use_fq_codel_by_default.patch8
1 files changed, 4 insertions, 4 deletions
diff --git a/target/linux/generic/patches-3.18/662-use_fq_codel_by_default.patch b/target/linux/generic/patches-3.18/662-use_fq_codel_by_default.patch
index 5caf933764..39abfaabea 100644
--- a/target/linux/generic/patches-3.18/662-use_fq_codel_by_default.patch
+++ b/target/linux/generic/patches-3.18/662-use_fq_codel_by_default.patch
@@ -13,7 +13,7 @@
device, it has to decide which ones to send first, which ones to
--- a/net/sched/sch_fq_codel.c
+++ b/net/sched/sch_fq_codel.c
-@@ -592,7 +592,7 @@ static const struct Qdisc_class_ops fq_c
+@@ -599,7 +599,7 @@ static const struct Qdisc_class_ops fq_c
.walk = fq_codel_walk,
};
@@ -22,7 +22,7 @@
.cl_ops = &fq_codel_class_ops,
.id = "fq_codel",
.priv_size = sizeof(struct fq_codel_sched_data),
-@@ -608,6 +608,7 @@ static struct Qdisc_ops fq_codel_qdisc_o
+@@ -615,6 +615,7 @@ static struct Qdisc_ops fq_codel_qdisc_o
.dump_stats = fq_codel_dump_stats,
.owner = THIS_MODULE,
};
@@ -51,7 +51,7 @@
EXPORT_SYMBOL(default_qdisc_ops);
/* Main transmission queue. */
-@@ -739,7 +739,7 @@ static void attach_one_default_qdisc(str
+@@ -742,7 +742,7 @@ static void attach_one_default_qdisc(str
if (dev->tx_queue_len) {
qdisc = qdisc_create_dflt(dev_queue,
@@ -84,7 +84,7 @@
if (qdisc == NULL) {
--- a/net/sched/sch_api.c
+++ b/net/sched/sch_api.c
-@@ -1947,7 +1947,7 @@ static int __init pktsched_init(void)
+@@ -1949,7 +1949,7 @@ static int __init pktsched_init(void)
return err;
}