diff options
| author | David Ward <david.ward@ll.mit.edu> | 2012-04-15 12:31:45 +0000 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-04-27 09:51:20 -0700 |
| commit | 11e8e6af6ec119f354354f69cc9aade7c6a0bb42 (patch) | |
| tree | fcc5670e1fd9a7ae5e6f1522f72a8c201237e3a3 /net/sched | |
| parent | 33e5a8b74671581e307aabc59c415190df0c121b (diff) | |
| download | kernel_samsung_smdk4412-11e8e6af6ec119f354354f69cc9aade7c6a0bb42.zip kernel_samsung_smdk4412-11e8e6af6ec119f354354f69cc9aade7c6a0bb42.tar.gz kernel_samsung_smdk4412-11e8e6af6ec119f354354f69cc9aade7c6a0bb42.tar.bz2 | |
net_sched: gred: Fix oops in gred_dump() in WRED mode
[ Upstream commit 244b65dbfede788f2fa3fe2463c44d0809e97c6b ]
A parameter set exists for WRED mode, called wred_set, to hold the same
values for qavg and qidlestart across all VQs. The WRED mode values had
been previously held in the VQ for the default DP. After these values
were moved to wred_set, the VQ for the default DP was no longer created
automatically (so that it could be omitted on purpose, to have packets
in the default DP enqueued directly to the device without using RED).
However, gred_dump() was overlooked during that change; in WRED mode it
still reads qavg/qidlestart from the VQ for the default DP, which might
not even exist. As a result, this command sequence will cause an oops:
tc qdisc add dev $DEV handle $HANDLE parent $PARENT gred setup \
DPs 3 default 2 grio
tc qdisc change dev $DEV handle $HANDLE gred DP 0 prio 8 $RED_OPTIONS
tc qdisc change dev $DEV handle $HANDLE gred DP 1 prio 8 $RED_OPTIONS
This fixes gred_dump() in WRED mode to use the values held in wred_set.
Signed-off-by: David Ward <david.ward@ll.mit.edu>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'net/sched')
| -rw-r--r-- | net/sched/sch_gred.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/net/sched/sch_gred.c b/net/sched/sch_gred.c index 6cd8ddf..e1afe0c 100644 --- a/net/sched/sch_gred.c +++ b/net/sched/sch_gred.c @@ -544,11 +544,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->parms.qidlestart = - table->tab[table->def]->parms.qidlestart; - q->parms.qavg = table->tab[table->def]->parms.qavg; - } + if (gred_wred_mode(table)) + gred_load_wred_set(table, q); opt.qave = red_calc_qavg(&q->parms, q->parms.qavg); |