src/patches/linux-3.2-codel/0005-net-codel-fix-build-errors.patch

   1 From: Sasha Levin <levinsasha928@gmail.com>
   2 Date: Mon, 14 May 2012 11:57:06 +0000
   3 Subject: [PATCH 5/7] net: codel: fix build errors
   4
   5 commit 669d67bf777def468970f2dcba1537edf3b2d329 upstream.
   6
   7 Fix the following build error:
   8
   9 net/sched/sch_fq_codel.c: In function 'fq_codel_dump_stats':
  10 net/sched/sch_fq_codel.c:464:3: error: unknown field 'qdisc_stats' specified in initializer
  11 net/sched/sch_fq_codel.c:464:3: warning: missing braces around initializer
  12 net/sched/sch_fq_codel.c:464:3: warning: (near initialization for 'st.<anonymous>')
  13 net/sched/sch_fq_codel.c:465:3: error: unknown field 'qdisc_stats' specified in initializer
  14 net/sched/sch_fq_codel.c:465:3: warning: excess elements in struct initializer
  15 net/sched/sch_fq_codel.c:465:3: warning: (near initialization for 'st')
  16 net/sched/sch_fq_codel.c:466:3: error: unknown field 'qdisc_stats' specified in initializer
  17 net/sched/sch_fq_codel.c:466:3: warning: excess elements in struct initializer
  18 net/sched/sch_fq_codel.c:466:3: warning: (near initialization for 'st')
  19 net/sched/sch_fq_codel.c:467:3: error: unknown field 'qdisc_stats' specified in initializer
  20 net/sched/sch_fq_codel.c:467:3: warning: excess elements in struct initializer
  21 net/sched/sch_fq_codel.c:467:3: warning: (near initialization for 'st')
  22 make[1]: *** [net/sched/sch_fq_codel.o] Error 1
  23
  24 Signed-off-by: Sasha Levin <levinsasha928@gmail.com>
  25 Signed-off-by: David S. Miller <davem@davemloft.net>
  26 ---
  27  net/sched/sch_fq_codel.c |    9 +++++----
  28  1 file changed, 5 insertions(+), 4 deletions(-)
  29
  30 diff --git a/net/sched/sch_fq_codel.c b/net/sched/sch_fq_codel.c
  31 index a7b3754..337ff20 100644
  32 --- a/net/sched/sch_fq_codel.c
  33 +++ b/net/sched/sch_fq_codel.c
  34 @@ -461,13 +461,14 @@ static int fq_codel_dump_stats(struct Qdisc *sch, struct gnet_dump *d)
  35         struct fq_codel_sched_data *q = qdisc_priv(sch);
  36         struct tc_fq_codel_xstats st = {
  37                 .type                           = TCA_FQ_CODEL_XSTATS_QDISC,
  38 -               .qdisc_stats.maxpacket          = q->cstats.maxpacket,
  39 -               .qdisc_stats.drop_overlimit     = q->drop_overlimit,
  40 -               .qdisc_stats.ecn_mark           = q->cstats.ecn_mark,
  41 -               .qdisc_stats.new_flow_count     = q->new_flow_count,
  42         };
  43         struct list_head *pos;
  44
  45 +       st.qdisc_stats.maxpacket = q->cstats.maxpacket;
  46 +       st.qdisc_stats.drop_overlimit = q->drop_overlimit;
  47 +       st.qdisc_stats.ecn_mark = q->cstats.ecn_mark;
  48 +       st.qdisc_stats.new_flow_count = q->new_flow_count;
  49 +
  50         list_for_each(pos, &q->new_flows)
  51                 st.qdisc_stats.new_flows_len++;
  52
  53 --
  54 1.7.10
  55