aboutsummaryrefslogtreecommitdiffstats
path: root/net/sched
diff options
context:
space:
mode:
Diffstat (limited to 'net/sched')
-rw-r--r--net/sched/sch_sfq.c14
1 files changed, 1 insertions, 13 deletions
diff --git a/net/sched/sch_sfq.c b/net/sched/sch_sfq.c
index b1d00f8e09f8..b6ea6afa55b0 100644
--- a/net/sched/sch_sfq.c
+++ b/net/sched/sch_sfq.c
@@ -414,18 +414,6 @@ sfq_enqueue(struct sk_buff *skb, struct Qdisc *sch)
414} 414}
415 415
416static struct sk_buff * 416static struct sk_buff *
417sfq_peek(struct Qdisc *sch)
418{
419 struct sfq_sched_data *q = qdisc_priv(sch);
420
421 /* No active slots */
422 if (q->tail == NULL)
423 return NULL;
424
425 return q->slots[q->tail->next].skblist_next;
426}
427
428static struct sk_buff *
429sfq_dequeue(struct Qdisc *sch) 417sfq_dequeue(struct Qdisc *sch)
430{ 418{
431 struct sfq_sched_data *q = qdisc_priv(sch); 419 struct sfq_sched_data *q = qdisc_priv(sch);
@@ -706,7 +694,7 @@ static struct Qdisc_ops sfq_qdisc_ops __read_mostly = {
706 .priv_size = sizeof(struct sfq_sched_data), 694 .priv_size = sizeof(struct sfq_sched_data),
707 .enqueue = sfq_enqueue, 695 .enqueue = sfq_enqueue,
708 .dequeue = sfq_dequeue, 696 .dequeue = sfq_dequeue,
709 .peek = sfq_peek, 697 .peek = qdisc_peek_dequeued,
710 .drop = sfq_drop, 698 .drop = sfq_drop,
711 .init = sfq_init, 699 .init = sfq_init,
712 .reset = sfq_reset, 700 .reset = sfq_reset,