From 90afde99afc6081cc3999f7a29cd1bd113fcc69e Mon Sep 17 00:00:00 2001 From: Eric Dumazet Date: Wed, 25 May 2011 04:40:11 +0000 Subject: [PATCH] --- yaml --- r: 251657 b: refs/heads/master c: 07bd8df5df4369487812bf85a237322ff3569b77 h: refs/heads/master i: 251655: 16b8c0b64e8c9f617ac29f2f363172fdb36f8b49 v: v3 --- [refs] | 2 +- trunk/net/sched/sch_sfq.c | 14 +------------- 2 files changed, 2 insertions(+), 14 deletions(-) diff --git a/[refs] b/[refs] index 0c4f222ea631..73d60a5fa779 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 367bbf2aa1654c12ab5d6dbf4428b043b425be29 +refs/heads/master: 07bd8df5df4369487812bf85a237322ff3569b77 diff --git a/trunk/net/sched/sch_sfq.c b/trunk/net/sched/sch_sfq.c index b1d00f8e09f8..b6ea6afa55b0 100644 --- a/trunk/net/sched/sch_sfq.c +++ b/trunk/net/sched/sch_sfq.c @@ -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,