]> www.pilppa.org Git - linux-2.6-omap-h63xx.git/commitdiff
pkt_sched: Always use q->requeue in dev_requeue_skb().
authorDavid S. Miller <davem@davemloft.net>
Tue, 23 Sep 2008 05:15:58 +0000 (22:15 -0700)
committerDavid S. Miller <davem@davemloft.net>
Tue, 23 Sep 2008 05:15:58 +0000 (22:15 -0700)
There is no reason to call into the complicated qdiscs
just to remember the last SKB where we found the device
blocked.

The SKB is outside of the qdiscs realm at this point.

Signed-off-by: David S. Miller <davem@davemloft.net>
net/sched/sch_generic.c

index 5961536be60ca7ff128f5024b54da6112405f207..1b508bd1c06c5ee1a55a17db44ae4857b57cb0e6 100644 (file)
@@ -44,10 +44,7 @@ static inline int qdisc_qlen(struct Qdisc *q)
 
 static inline int dev_requeue_skb(struct sk_buff *skb, struct Qdisc *q)
 {
-       if (unlikely(skb->next))
-               __skb_queue_head(&q->requeue, skb);
-       else
-               q->ops->requeue(skb, q);
+       __skb_queue_head(&q->requeue, skb);
 
        __netif_schedule(q);
        return 0;