---

yaml --- r: 322803 b: refs/heads/master c: 1fe37b1 h: refs/heads/master i: 322801: 8ac71d0 322799: b885f76 v: v3
git-mirror · Sep 13, 2012 · 5ec0454 · 5ec0454
1 parent aa0bc8a
commit 5ec0454
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c22e464022f935b0cbd8724b1d99d800d49518a9
+refs/heads/master: 1fe37b106b039d9358fd1211c39b1fa199e547a8
diff --git a/trunk/net/sched/sch_gred.c b/trunk/net/sched/sch_gred.c
@@ -534,6 +534,7 @@ static int gred_dump(struct Qdisc *sch, struct sk_buff *skb)
 	for (i = 0; i < MAX_DPs; i++) {
 		struct gred_sched_data *q = table->tab[i];
 		struct tc_gred_qopt opt;
+		unsigned long qavg;
 
 		memset(&opt, 0, sizeof(opt));
 
@@ -565,7 +566,9 @@ static int gred_dump(struct Qdisc *sch, struct sk_buff *skb)
 		if (gred_wred_mode(table))
 			gred_load_wred_set(table, q);
 
-		opt.qave = red_calc_qavg(&q->parms, &q->vars, q->vars.qavg);
+		qavg = red_calc_qavg(&q->parms, &q->vars,
+				     q->vars.qavg >> q->parms.Wlog);
+		opt.qave = qavg >> q->parms.Wlog;
 
 append_opt:
 		if (nla_append(skb, sizeof(opt), &opt) < 0)