Re: [PATCH] net_sched: prio: use qdisc_dequeue_peeked

From: Florian Westphal <fw@strlen.de>
Date: Tue,  9 Aug 2011 14:04:43 +0200

commit 07bd8df5df4369487812bf85a237322ff3569b77
(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 <redacted>
Signed-off-by: Florian Westphal <fw@strlen.de>

Applied and queued up for -stable, thanks!