From 5ec04547d728cebf8e9cdadf7757a609987446ed Mon Sep 17 00:00:00 2001 From: David Ward Date: Thu, 13 Sep 2012 05:22:34 +0000 Subject: [PATCH] --- yaml --- r: 322803 b: refs/heads/master c: 1fe37b106b039d9358fd1211c39b1fa199e547a8 h: refs/heads/master i: 322801: 8ac71d004a5c53ffdbb945029377a683e8f5b9ad 322799: b885f76c6b4cca46f84a275f754944b4d76b90c8 v: v3 --- [refs] | 2 +- trunk/net/sched/sch_gred.c | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 0b7a32db3c22..5bdab3c89757 100644 --- 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 index e19d4ebfea1c..b2570b59d85e 100644 --- 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)