From 745672b94e5ee60d7808d59706f0c883c1b830c0 Mon Sep 17 00:00:00 2001
From: Jarek Poplawski <jarkao2@gmail.com>
Date: Thu, 17 Sep 2009 10:26:07 -0700
Subject: [PATCH] --- yaml --- r: 162925 b: refs/heads/master c:
 a19d2158439d6fba8160d7d2446f233f525f09e7 h: refs/heads/master i:   162923:
 6c08351176d2f85dc8634f61981f4d792777021e v: v3

---
 [refs]                       | 2 +-
 trunk/net/sched/sch_drr.c    | 4 +++-
 trunk/net/sched/sch_mq.c     | 1 +
 trunk/net/sched/sch_multiq.c | 1 +
 trunk/net/sched/sch_prio.c   | 1 +
 5 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 069626e12576..57abf46a0997 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0522fea6505f7b03a82787acdc6ad3066d9b4de3
+refs/heads/master: a19d2158439d6fba8160d7d2446f233f525f09e7
diff --git a/trunk/net/sched/sch_drr.c b/trunk/net/sched/sch_drr.c
index 12b2fb04b29b..5a888af7e5da 100644
--- a/trunk/net/sched/sch_drr.c
+++ b/trunk/net/sched/sch_drr.c
@@ -274,8 +274,10 @@ static int drr_dump_class_stats(struct Qdisc *sch, unsigned long arg,
 	struct tc_drr_stats xstats;
 
 	memset(&xstats, 0, sizeof(xstats));
-	if (cl->qdisc->q.qlen)
+	if (cl->qdisc->q.qlen) {
 		xstats.deficit = cl->deficit;
+		cl->qdisc->qstats.qlen = cl->qdisc->q.qlen;
+	}
 
 	if (gnet_stats_copy_basic(d, &cl->bstats) < 0 ||
 	    gnet_stats_copy_rate_est(d, &cl->rate_est) < 0 ||
diff --git a/trunk/net/sched/sch_mq.c b/trunk/net/sched/sch_mq.c
index 600c50143cc7..d1dea3d5dc92 100644
--- a/trunk/net/sched/sch_mq.c
+++ b/trunk/net/sched/sch_mq.c
@@ -193,6 +193,7 @@ static int mq_dump_class_stats(struct Qdisc *sch, unsigned long cl,
 	struct netdev_queue *dev_queue = mq_queue_get(sch, cl);
 
 	sch = dev_queue->qdisc_sleeping;
+	sch->qstats.qlen = sch->q.qlen;
 	if (gnet_stats_copy_basic(d, &sch->bstats) < 0 ||
 	    gnet_stats_copy_queue(d, &sch->qstats) < 0)
 		return -1;
diff --git a/trunk/net/sched/sch_multiq.c b/trunk/net/sched/sch_multiq.c
index 069f81c97277..7db2c88ce585 100644
--- a/trunk/net/sched/sch_multiq.c
+++ b/trunk/net/sched/sch_multiq.c
@@ -359,6 +359,7 @@ static int multiq_dump_class_stats(struct Qdisc *sch, unsigned long cl,
 	struct Qdisc *cl_q;
 
 	cl_q = q->queues[cl - 1];
+	cl_q->qstats.qlen = cl_q->q.qlen;
 	if (gnet_stats_copy_basic(d, &cl_q->bstats) < 0 ||
 	    gnet_stats_copy_queue(d, &cl_q->qstats) < 0)
 		return -1;
diff --git a/trunk/net/sched/sch_prio.c b/trunk/net/sched/sch_prio.c
index 0f73c412d04b..93285cecb246 100644
--- a/trunk/net/sched/sch_prio.c
+++ b/trunk/net/sched/sch_prio.c
@@ -322,6 +322,7 @@ static int prio_dump_class_stats(struct Qdisc *sch, unsigned long cl,
 	struct Qdisc *cl_q;
 
 	cl_q = q->queues[cl - 1];
+	cl_q->qstats.qlen = cl_q->q.qlen;
 	if (gnet_stats_copy_basic(d, &cl_q->bstats) < 0 ||
 	    gnet_stats_copy_queue(d, &cl_q->qstats) < 0)
 		return -1;