From 986ab7f3e3f56d5cf16bb5f7ed59017eacf49147 Mon Sep 17 00:00:00 2001 From: David Ward Date: Sun, 15 Apr 2012 12:31:45 +0000 Subject: [PATCH] --- yaml --- r: 299537 b: refs/heads/master c: 244b65dbfede788f2fa3fe2463c44d0809e97c6b h: refs/heads/master i: 299535: a4aa117f1fda08858ccda7dd54922003f54d22f1 v: v3 --- [refs] | 2 +- trunk/net/sched/sch_gred.c | 7 ++----- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index cb73fa0165bb..b7a74a33e4bf 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a49bcabedc18319f673319d5e71b5751e3978179 +refs/heads/master: 244b65dbfede788f2fa3fe2463c44d0809e97c6b diff --git a/trunk/net/sched/sch_gred.c b/trunk/net/sched/sch_gred.c index 0b15236be7b6..8179494c269a 100644 --- a/trunk/net/sched/sch_gred.c +++ b/trunk/net/sched/sch_gred.c @@ -565,11 +565,8 @@ static int gred_dump(struct Qdisc *sch, struct sk_buff *skb) opt.packets = q->packetsin; opt.bytesin = q->bytesin; - if (gred_wred_mode(table)) { - q->vars.qidlestart = - table->tab[table->def]->vars.qidlestart; - q->vars.qavg = table->tab[table->def]->vars.qavg; - } + if (gred_wred_mode(table)) + gred_load_wred_set(table, q); opt.qave = red_calc_qavg(&q->parms, &q->vars, q->vars.qavg);