From 4acd4da998e71c681f7030f9706abda055f95ccc Mon Sep 17 00:00:00 2001 From: Zoltan HERPAI Date: Wed, 12 Oct 2016 00:14:59 +0200 Subject: Revert "kernel: bump 3.18 to 3.18.39" Stay on 3.18.36 This reverts commit 83767cf94f909f5932540da7641a12b7dfa71d85. --- .../linux/generic/patches-3.18/662-use_fq_codel_by_default.patch | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'target/linux/generic/patches-3.18/662-use_fq_codel_by_default.patch') 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 39abfaabea..5caf933764 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 -@@ -599,7 +599,7 @@ static const struct Qdisc_class_ops fq_c +@@ -592,7 +592,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), -@@ -615,6 +615,7 @@ static struct Qdisc_ops fq_codel_qdisc_o +@@ -608,6 +608,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. */ -@@ -742,7 +742,7 @@ static void attach_one_default_qdisc(str +@@ -739,7 +739,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 -@@ -1949,7 +1949,7 @@ static int __init pktsched_init(void) +@@ -1947,7 +1947,7 @@ static int __init pktsched_init(void) return err; } -- cgit v1.2.3