Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 07bd8df5 authored by Eric Dumazet's avatar Eric Dumazet Committed by David S. Miller
Browse files

sch_sfq: fix peek() implementation 



Since commit eeaeb068 (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: default avatarEric 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: default avatarDavid S. Miller <davem@davemloft.net>
parent 367bbf2a

net/sched/sch_sfq.c

+1 −13
Original line number Diff line number Diff line
@@ -413,18 +413,6 @@ sfq_enqueue(struct sk_buff *skb, struct Qdisc *sch) 
	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 *

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),

	.enqueue	=	sfq_enqueue,

	.dequeue	=	sfq_dequeue,

	.peek		=	sfq_peek,

	.peek		=	qdisc_peek_dequeued,

	.drop		=	sfq_drop,

	.init		=	sfq_init,

	.reset		=	sfq_reset,