From af48ce5081e9fe91a2287f5b2c3c1031b91bbed0 Mon Sep 17 00:00:00 2001 From: Eric Dumazet Date: Wed, 15 Dec 2010 08:18:36 +0000 Subject: [PATCH] --- yaml --- r: 225209 b: refs/heads/master c: c4266263249f22479eb1abb1a1709c38240b1597 h: refs/heads/master i: 225207: 82d9c3e495a4a94f480b96a0a35234b2c9c9a9ae v: v3 --- [refs] | 2 +- trunk/net/sched/sch_sfq.c | 7 ++++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 9d66a5d5a11f..0d2155476b82 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f955e1415f381c7fa6ebe8630cd1fe5a694e8f4a +refs/heads/master: c4266263249f22479eb1abb1a1709c38240b1597 diff --git a/trunk/net/sched/sch_sfq.c b/trunk/net/sched/sch_sfq.c index 3cf478d012dd..cb331dea7fe0 100644 --- a/trunk/net/sched/sch_sfq.c +++ b/trunk/net/sched/sch_sfq.c @@ -548,8 +548,13 @@ static int sfq_dump_class_stats(struct Qdisc *sch, unsigned long cl, { struct sfq_sched_data *q = qdisc_priv(sch); sfq_index idx = q->ht[cl-1]; - struct gnet_stats_queue qs = { .qlen = q->qs[idx].qlen }; + struct sk_buff_head *list = &q->qs[idx]; + struct gnet_stats_queue qs = { .qlen = list->qlen }; struct tc_sfq_xstats xstats = { .allot = q->allot[idx] }; + struct sk_buff *skb; + + skb_queue_walk(list, skb) + qs.backlog += qdisc_pkt_len(skb); if (gnet_stats_copy_queue(d, &qs) < 0) return -1;