Merge branch 'for-linus' of git://git.infradead.org/ubi-2.6

[powerpc.git] / net / sched / sch_teql.c

diff --git a/net/sched/sch_teql.c b/net/sched/sch_teql.c
index 79b8ef3..d24914d 100644 (file)
--- a/net/sched/sch_teql.c
+++ b/net/sched/sch_teql.c
@@ -14,7 +14,6 @@
 #include <linux/bitops.h>
 #include <linux/types.h>
 #include <linux/kernel.h>
-#include <linux/sched.h>
 #include <linux/string.h>
 #include <linux/mm.h>
 #include <linux/socket.h>
@@ -178,7 +177,7 @@ teql_destroy(struct Qdisc* sch)
                                teql_neigh_release(xchg(&dat->ncache, NULL));
                                break;
                        }
-                               
+
                } while ((prev = q) != master->slaves);
        }
 }
@@ -292,7 +291,7 @@ restart:
 
        do {
                struct net_device *slave = q->dev;
-               
+
                if (slave->qdisc_sleeping != q)
                        continue;
                if (netif_queue_stopped(slave) || ! netif_running(slave)) {
@@ -302,20 +301,17 @@ restart:
 
                switch (teql_resolve(skb, skb_res, slave)) {
                case 0:
-                       if (spin_trylock(&slave->xmit_lock)) {
-                               slave->xmit_lock_owner = smp_processor_id();
+                       if (netif_tx_trylock(slave)) {
                                if (!netif_queue_stopped(slave) &&
                                    slave->hard_start_xmit(skb, slave) == 0) {
-                                       slave->xmit_lock_owner = -1;
-                                       spin_unlock(&slave->xmit_lock);
+                                       netif_tx_unlock(slave);
                                        master->slaves = NEXT_SLAVE(q);
                                        netif_wake_queue(dev);
                                        master->stats.tx_packets++;
                                        master->stats.tx_bytes += len;
                                        return 0;
                                }
-                               slave->xmit_lock_owner = -1;
-                               spin_unlock(&slave->xmit_lock);
+                               netif_tx_unlock(slave);
                        }
                        if (netif_queue_stopped(dev))
                                busy = 1;
@@ -327,7 +323,7 @@ restart:
                        nores = 1;
                        break;
                }
-               __skb_pull(skb, skb->nh.raw - skb->data);
+               __skb_pull(skb, skb_network_offset(skb));
        } while ((q = NEXT_SLAVE(q)) != start);
 
        if (nores && skb_res == NULL) {
@@ -428,7 +424,7 @@ static __init void teql_master_setup(struct net_device *dev)
 
        master->dev     = dev;
        ops->priv_size  = sizeof(struct teql_sched_data);
-       
+
        ops->enqueue    =       teql_enqueue;
        ops->dequeue    =       teql_dequeue;
        ops->requeue    =       teql_requeue;
@@ -492,7 +488,7 @@ static int __init teql_init(void)
        return i ? 0 : err;
 }
 
-static void __exit teql_exit(void) 
+static void __exit teql_exit(void)
 {
        struct teql_master *master, *nxt;