]> git.kernelconcepts.de Git - karo-tx-linux.git/commit
sch_sfq: fix peek() implementation
authorEric Dumazet <eric.dumazet@gmail.com>
Wed, 25 May 2011 04:40:11 +0000 (04:40 +0000)
committerGreg Kroah-Hartman <gregkh@suse.de>
Fri, 3 Jun 2011 01:34:01 +0000 (10:34 +0900)
commit53280ba65f9fad14cf52bfb3c5ffae09a8c2ea51
tree786f0afe4eb45769b63a560cb5dc8c116705138e
parent696789e6e980e3f11860a34a57b4724d041f02ab
sch_sfq: fix peek() implementation

[ Upstream commit 07bd8df5df4369487812bf85a237322ff3569b77 ]

Since commit eeaeb068f139 (sch_sfq: allow big packets and be fair),
sfq_peek() can return a different skb that would be normally dequeued by
sfq_dequeue() [ if current slot->allot is negative ]

Use generic qdisc_peek_dequeued() instead of custom implementation, to
get consistent result.

Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com>
CC: Jarek Poplawski <jarkao2@gmail.com>
CC: Patrick McHardy <kaber@trash.net>
CC: Jesper Dangaard Brouer <hawk@diku.dk>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
net/sched/sch_sfq.c