From: Florian Westphal <fw@strlen.de>
Date: Tue, 9 Aug 2011 02:04:43 +0000 (+0000)
Subject: net_sched: prio: use qdisc_dequeue_peeked
X-Git-Tag: v3.1-rc2~19^2~21
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3557619f0f6f7496ed453d4825e24958ab1884e0;p=pandora-kernel.git

net_sched: prio: use qdisc_dequeue_peeked

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 <eric.dumazet@gmail.com>
Signed-off-by: Florian Westphal <fw@strlen.de>
Signed-off-by: David S. Miller <davem@davemloft.net>
---

Reading git-diff-tree failed