sch_sfq: fix peek() implementation
authorEric Dumazet <eric.dumazet@gmail.com>
Wed, 25 May 2011 04:40:11 +0000 (04:40 +0000)
committerSteve Conklin <sconklin@canonical.com>
Fri, 15 Jul 2011 17:20:58 +0000 (12:20 -0500)
commit6efb3f513b8ca999e64a1c693df1a01be3294758
tree33f9650b905b6c865d62023a75588b8276cf9a19
parent671c8db9af8d51479b76f8e072c427d8196e74d1
sch_sfq: fix peek() implementation

BugLink: http://bugs.launchpad.net/bugs/793702

[ 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>
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
net/sched/sch_sfq.c