lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

sch_sfq: fix peek() implementation

Browse Source 
Since commit eeaeb068f1 (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>
This commit is contained in:
Eric Dumazet
2011-05-25 04:40:11 +00:00
committed by David S. Miller
parent 367bbf2aa1
commit 07bd8df5df
1 changed files with 1 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
net/sched/sch_sfq.c
View File

@@ -413,18 +413,6 @@ sfq_enqueue(struct sk_buff *skb, struct Qdisc *sch)
return (qlen != slot->qlen) ? NET_XMIT_CN : NET_XMIT_SUCCESS; return (qlen != slot->qlen) ? NET_XMIT_CN : NET_XMIT_SUCCESS;
} }
static struct sk_buff *
sfq_peek(struct Qdisc *sch)
{
struct sfq_sched_data *q = qdisc_priv(sch);
/* No active slots */
if (q->tail == NULL)
return NULL;
return q->slots[q->tail->next].skblist_next;
}
static struct sk_buff * static struct sk_buff *
sfq_dequeue(struct Qdisc *sch) sfq_dequeue(struct Qdisc *sch)
{ {
@@ -706,7 +694,7 @@ static struct Qdisc_ops sfq_qdisc_ops __read_mostly = {
.priv_size = sizeof(struct sfq_sched_data), .priv_size = sizeof(struct sfq_sched_data),
.enqueue = sfq_enqueue, .enqueue = sfq_enqueue,
.dequeue = sfq_dequeue, .dequeue = sfq_dequeue,
.peek = sfq_peek, .peek = qdisc_peek_dequeued,
.drop = sfq_drop, .drop = sfq_drop,
.init = sfq_init, .init = sfq_init,
.reset = sfq_reset, .reset = sfq_reset,