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 ec0a0839ce512620231997be5f5c233b4bea423a..7b5572d6beb59b561e92ad6d030d801f5fd0c72f 100644 (file)
--- a/net/sched/sch_generic.c
+++ b/net/sched/sch_generic.c
@@ -44,23 +44,30 @@ 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
-               q->ops->requeue(skb, q);
-
+       q->gso_skb = skb;
+       q->qstats.requeues++;
        __netif_schedule(q);
+
        return 0;
 }
 
 static inline struct sk_buff *dequeue_skb(struct Qdisc *q)
 {
-       struct sk_buff *skb;
+       struct sk_buff *skb = q->gso_skb;
 
-       if ((skb = q->gso_skb))
-               q->gso_skb = NULL;
-       else
+       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))
+                       q->gso_skb = NULL;
+               else
+                       skb = NULL;
+       } else {
                skb = q->dequeue(q);
+       }
 
        return skb;
 }
@@ -327,6 +334,7 @@ struct Qdisc noop_qdisc = {
        .flags          =       TCQ_F_BUILTIN,
        .ops            =       &noop_qdisc_ops,
        .list           =       LIST_HEAD_INIT(noop_qdisc.list),
+       .requeue.lock   =       __SPIN_LOCK_UNLOCKED(noop_qdisc.q.lock),
        .q.lock         =       __SPIN_LOCK_UNLOCKED(noop_qdisc.q.lock),
        .dev_queue      =       &noop_netdev_queue,
 };
@@ -352,6 +360,7 @@ static struct Qdisc noqueue_qdisc = {
        .flags          =       TCQ_F_BUILTIN,
        .ops            =       &noqueue_qdisc_ops,
        .list           =       LIST_HEAD_INIT(noqueue_qdisc.list),
+       .requeue.lock   =       __SPIN_LOCK_UNLOCKED(noqueue_qdisc.q.lock),
        .q.lock         =       __SPIN_LOCK_UNLOCKED(noqueue_qdisc.q.lock),
        .dev_queue      =       &noqueue_netdev_queue,
 };
@@ -472,6 +481,7 @@ struct Qdisc *qdisc_alloc(struct netdev_queue *dev_queue,
        sch->padded = (char *) sch - (char *) p;
 
        INIT_LIST_HEAD(&sch->list);
+       skb_queue_head_init(&sch->requeue);
        skb_queue_head_init(&sch->q);
        sch->ops = ops;
        sch->enqueue = ops->enqueue;
@@ -540,6 +550,7 @@ void qdisc_destroy(struct Qdisc *qdisc)
        dev_put(qdisc_dev(qdisc));
 
        kfree_skb(qdisc->gso_skb);
+       __skb_queue_purge(&qdisc->requeue);
 
        kfree((char *) qdisc - qdisc->padded);
 }