Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

[cascardo/linux.git] / net / sched / sch_fifo.c

diff --git a/net/sched/sch_fifo.c b/net/sched/sch_fifo.c
index baeed6a..1e37247 100644 (file)
--- a/net/sched/sch_fifo.c
+++ b/net/sched/sch_fifo.c
@@ -31,7 +31,7 @@ static int bfifo_enqueue(struct sk_buff *skb, struct Qdisc *sch,
 static int pfifo_enqueue(struct sk_buff *skb, struct Qdisc *sch,
                         struct sk_buff **to_free)
 {
-       if (likely(skb_queue_len(&sch->q) < sch->limit))
+       if (likely(sch->q.qlen < sch->limit))
                return qdisc_enqueue_tail(skb, sch);
 
        return qdisc_drop(skb, sch, to_free);
@@ -42,7 +42,7 @@ static int pfifo_tail_enqueue(struct sk_buff *skb, struct Qdisc *sch,
 {
        unsigned int prev_backlog;
 
-       if (likely(skb_queue_len(&sch->q) < sch->limit))
+       if (likely(sch->q.qlen < sch->limit))
                return qdisc_enqueue_tail(skb, sch);
 
        prev_backlog = sch->qstats.backlog;