Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

[karo-tx-linux.git] / net / sched / sch_generic.c

diff --git a/net/sched/sch_generic.c b/net/sched/sch_generic.c
index 3db4cf1bd263b032a2ea03b1e39f44fcc6eaa20c..7b5572d6beb59b561e92ad6d030d801f5fd0c72f 100644 (file)
--- a/net/sched/sch_generic.c
+++ b/net/sched/sch_generic.c
@@ -44,12 +44,10 @@ 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))
-               q->gso_skb = skb;
-       else
-               __skb_queue_head(&q->requeue, skb);
-
+       q->gso_skb = skb;
+       q->qstats.requeues++;
        __netif_schedule(q);
+
        return 0;
 }
 
@@ -57,24 +55,16 @@ static inline struct sk_buff *dequeue_skb(struct Qdisc *q)
 {
        struct sk_buff *skb = q->gso_skb;
 
-       if (!skb)
-               skb = skb_peek(&q->requeue);
-
        if (unlikely(skb)) {
                struct net_device *dev = qdisc_dev(q);
                struct netdev_queue *txq;
 
                /* check the reason of requeuing without tx lock first */
                txq = netdev_get_tx_queue(dev, skb_get_queue_mapping(skb));
-               if (!netif_tx_queue_stopped(txq) &&
-                   !netif_tx_queue_frozen(txq)) {
-                       if (q->gso_skb)
-                               q->gso_skb = NULL;
-                       else
-                               __skb_unlink(skb, &q->requeue);
-               } else {
+               if (!netif_tx_queue_stopped(txq) && !netif_tx_queue_frozen(txq))
+                       q->gso_skb = NULL;
+               else
                        skb = NULL;
-               }
        } else {
                skb = q->dequeue(q);
        }