mirror of
git://projects.qi-hardware.com/openwrt-xburst.git
synced 2024-11-14 21:26:16 +02:00
50 lines
2.2 KiB
Diff
50 lines
2.2 KiB
Diff
|
From 669d67bf777def468970f2dcba1537edf3b2d329 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Sasha Levin <levinsasha928@gmail.com>
|
||
|
|
Date: Mon, 14 May 2012 11:57:06 +0000
|
||
|
|
Subject: [PATCH 45/50] net: codel: fix build errors
|
||
|
|
|
||
|
|
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++;
|
||
|
|
|