diff options
author | Florian Westphal <fw@strlen.de> | 2011-08-09 04:04:43 +0200 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2011-08-10 06:52:11 +0200 |
commit | 3557619f0f6f7496ed453d4825e24958ab1884e0 (patch) | |
tree | fe66b34573509d0f4880d4f03ae5cde26ff69cb3 /net/irda/Makefile | |
parent | Bridge: Always send NETDEV_CHANGEADDR up on br MAC change. (diff) | |
download | linux-3557619f0f6f7496ed453d4825e24958ab1884e0.tar.xz linux-3557619f0f6f7496ed453d4825e24958ab1884e0.zip |
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>
Diffstat (limited to 'net/irda/Makefile')
0 files changed, 0 insertions, 0 deletions