i2c: Clean up <linux/i2c.h>

[linux-2.6-omap-h63xx.git] / net / sched / sch_generic.c

diff --git a/net/sched/sch_generic.c b/net/sched/sch_generic.c
index 3db4cf1bd263b032a2ea03b1e39f44fcc6eaa20c..93cd30ce65011d2b84541277c15664ed6287fc3d 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);
        }
@@ -336,6 +326,7 @@ struct Qdisc_ops noop_qdisc_ops __read_mostly = {
 
 static struct netdev_queue noop_netdev_queue = {
        .qdisc          =       &noop_qdisc,
+       .qdisc_sleeping =       &noop_qdisc,
 };
 
 struct Qdisc noop_qdisc = {
@@ -362,6 +353,7 @@ static struct Qdisc_ops noqueue_qdisc_ops __read_mostly = {
 static struct Qdisc noqueue_qdisc;
 static struct netdev_queue noqueue_netdev_queue = {
        .qdisc          =       &noqueue_qdisc,
+       .qdisc_sleeping =       &noqueue_qdisc,
 };
 
 static struct Qdisc noqueue_qdisc = {