diff options
| author | Patrick McHardy <kaber@trash.net> | 2006-11-30 01:37:42 (GMT) |
|---|---|---|
| committer | David S. Miller <davem@sunset.davemloft.net> | 2006-12-03 05:31:46 (GMT) |
| commit | e488eafcc50be296f0d1e1fd67c6b5d865183011 (patch) | |
| tree | 792549530bf6d6e36cf48c9192194bccad158e2d /net/sched/sch_hfsc.c | |
| parent | 256d61b87b2c2ac6fc333c1654d1abea61979006 (diff) | |
| download | linux-fsl-qoriq-e488eafcc50be296f0d1e1fd67c6b5d865183011.tar.xz | |
[NET_SCHED]: Fix endless loops (part 5): netem/tbf/hfsc ->requeue failures
When peeking at the next packet in a child qdisc by calling dequeue/requeue,
the upper qdisc qlen counter may get out of sync in case the requeue fails.
The qdisc and the child qdisc both have their counter decremented, but since
no packet is given to the upper qdisc it won't decrement its counter itself.
requeue should not fail, so this is mostly for "correctness".
Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/sched/sch_hfsc.c')
| -rw-r--r-- | net/sched/sch_hfsc.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/net/sched/sch_hfsc.c b/net/sched/sch_hfsc.c index 2d43744..6eefa69 100644 --- a/net/sched/sch_hfsc.c +++ b/net/sched/sch_hfsc.c @@ -946,6 +946,7 @@ qdisc_peek_len(struct Qdisc *sch) if (unlikely(sch->ops->requeue(skb, sch) != NET_XMIT_SUCCESS)) { if (net_ratelimit()) printk("qdisc_peek_len: failed to requeue\n"); + qdisc_tree_decrease_qlen(sch, 1); return 0; } return len; |