2012-09-26 14:17:17 +00:00
|
|
|
From b49ab5f6bb7e609190065cb9a605de809e50ab60 Mon Sep 17 00:00:00 2001
|
kernel: add codel and fq_codel to generic 3.3 patch set (based on patch by Dave Täht)
Codel is a new AQM algorithm and RED replacement designed by
Kathie Nichols and Van Jacobson, and published in ACM queue:
http://queue.acm.org/detail.cfm?id=2209336
Codel stands for "Controlled Delay", and needs no knobs in the
general case, twiddled, for optimum results. It aims for 5ms of
delay, at most, when in use.
Additionally,
fq_codel (by eric dumazet) builds on codel to provide fair queuing
superior to what could be had with SFQ, and drop behavior saner
than RED, BLUE, or choke.
These patches are backported from net-next and are known to work
on Linux 3.3.4 and later.
Includes updates to codel for better portability and speed
SVN-Revision: 31756
2012-05-16 15:23:03 +00:00
|
|
|
From: Sasha Levin <levinsasha928@gmail.com>
|
|
|
|
|
Date: Mon, 14 May 2012 11:57:06 +0000
|
2012-09-26 14:17:17 +00:00
|
|
|
Subject: [PATCH] net: codel: fix build errors
|
|
|
|
|
|
|
|
|
|
commit 669d67bf777def468970f2dcba1537edf3b2d329 upstream.
|
kernel: add codel and fq_codel to generic 3.3 patch set (based on patch by Dave Täht)
Codel is a new AQM algorithm and RED replacement designed by
Kathie Nichols and Van Jacobson, and published in ACM queue:
http://queue.acm.org/detail.cfm?id=2209336
Codel stands for "Controlled Delay", and needs no knobs in the
general case, twiddled, for optimum results. It aims for 5ms of
delay, at most, when in use.
Additionally,
fq_codel (by eric dumazet) builds on codel to provide fair queuing
superior to what could be had with SFQ, and drop behavior saner
than RED, BLUE, or choke.
These patches are backported from net-next and are known to work
on Linux 3.3.4 and later.
Includes updates to codel for better portability and speed
SVN-Revision: 31756
2012-05-16 15:23:03 +00:00
|
|
|
|
|
|
|
|
Fix the following build error:
|
|
|
|
|
|
|
|
|
|
net/sched/sch_fq_codel.c: In function 'fq_codel_dump_stats':
|
|
|
|
|
net/sched/sch_fq_codel.c:464:3: error: unknown field 'qdisc_stats' specified in initializer
|
|
|
|
|
net/sched/sch_fq_codel.c:464:3: warning: missing braces around initializer
|
|
|
|
|
net/sched/sch_fq_codel.c:464:3: warning: (near initialization for 'st.<anonymous>')
|
|
|
|
|
net/sched/sch_fq_codel.c:465:3: error: unknown field 'qdisc_stats' specified in initializer
|
|
|
|
|
net/sched/sch_fq_codel.c:465:3: warning: excess elements in struct initializer
|
|
|
|
|
net/sched/sch_fq_codel.c:465:3: warning: (near initialization for 'st')
|
|
|
|
|
net/sched/sch_fq_codel.c:466:3: error: unknown field 'qdisc_stats' specified in initializer
|
|
|
|
|
net/sched/sch_fq_codel.c:466:3: warning: excess elements in struct initializer
|
|
|
|
|
net/sched/sch_fq_codel.c:466:3: warning: (near initialization for 'st')
|
|
|
|
|
net/sched/sch_fq_codel.c:467:3: error: unknown field 'qdisc_stats' specified in initializer
|
|
|
|
|
net/sched/sch_fq_codel.c:467:3: warning: excess elements in struct initializer
|
|
|
|
|
net/sched/sch_fq_codel.c:467:3: warning: (near initialization for 'st')
|
|
|
|
|
make[1]: *** [net/sched/sch_fq_codel.o] Error 1
|
|
|
|
|
|
|
|
|
|
Signed-off-by: Sasha Levin <levinsasha928@gmail.com>
|
|
|
|
|
Signed-off-by: David S. Miller <davem@davemloft.net>
|
|
|
|
|
---
|
|
|
|
|
net/sched/sch_fq_codel.c | 9 +++++----
|
|
|
|
|
1 file changed, 5 insertions(+), 4 deletions(-)
|
|
|
|
|
|
|
|
|
|
--- a/net/sched/sch_fq_codel.c
|
|
|
|
|
+++ b/net/sched/sch_fq_codel.c
|
|
|
|
|
@@ -461,13 +461,14 @@ static int fq_codel_dump_stats(struct Qd
|
|
|
|
|
struct fq_codel_sched_data *q = qdisc_priv(sch);
|
|
|
|
|
struct tc_fq_codel_xstats st = {
|
|
|
|
|
.type = TCA_FQ_CODEL_XSTATS_QDISC,
|
|
|
|
|
- .qdisc_stats.maxpacket = q->cstats.maxpacket,
|
|
|
|
|
- .qdisc_stats.drop_overlimit = q->drop_overlimit,
|
|
|
|
|
- .qdisc_stats.ecn_mark = q->cstats.ecn_mark,
|
|
|
|
|
- .qdisc_stats.new_flow_count = q->new_flow_count,
|
|
|
|
|
};
|
|
|
|
|
struct list_head *pos;
|
|
|
|
|
|
|
|
|
|
+ st.qdisc_stats.maxpacket = q->cstats.maxpacket;
|
|
|
|
|
+ st.qdisc_stats.drop_overlimit = q->drop_overlimit;
|
|
|
|
|
+ st.qdisc_stats.ecn_mark = q->cstats.ecn_mark;
|
|
|
|
|
+ st.qdisc_stats.new_flow_count = q->new_flow_count;
|
|
|
|
|
+
|
|
|
|
|
list_for_each(pos, &q->new_flows)
|
|
|
|
|
st.qdisc_stats.new_flows_len++;
|
|
|
|
|
|
