]> git.baikalelectronics.ru Git - kernel.git/commit
net_sched: prio: use qdisc_dequeue_peeked
authorFlorian Westphal <fw@strlen.de>
Tue, 9 Aug 2011 02:04:43 +0000 (02:04 +0000)
committerDavid S. Miller <davem@davemloft.net>
Wed, 10 Aug 2011 04:52:11 +0000 (21:52 -0700)
commitd7e847b42e419f165b1aa96336e8e3f41ebfd2ab
treefe66b34573509d0f4880d4f03ae5cde26ff69cb3
parent04b8845212002c4fc36a564c8a65b802f28279d7
net_sched: prio: use qdisc_dequeue_peeked

commit cfe13e407c19f8a70f1e2d96eb1d96c44697ed41
(sch_sfq: fix peek() implementation) changed sfq to use generic
peek helper.

This makes HFSC complain about a non-work-conserving child qdisc, if
prio with sfq child is used within hfsc:

hfsc peeks into prio qdisc, which will then peek into sfq.
returned skb is stashed in sch->gso_skb.

Next, hfsc tries to dequeue from prio, but prio will call sfq dequeue
directly, which may return NULL instead of previously peeked-at skb.

Have prio call qdisc_dequeue_peeked, so sfq->dequeue() is
not called in this case.

Cc: Eric Dumazet <eric.dumazet@gmail.com>
Signed-off-by: Florian Westphal <fw@strlen.de>
Signed-off-by: David S. Miller <davem@davemloft.net>
net/sched/sch_prio.c