Merge branch 'gart/fixes' into amd-iommu/2.6.33

[karo-tx-linux.git] / net / core / flow.c

diff --git a/net/core/flow.c b/net/core/flow.c
index 9cfe84571ca55554284ac617478333f2d3ba26d4..96015871eceadeacc65d8b572fdcf0d757ecccca 100644 (file)
--- a/net/core/flow.c
+++ b/net/core/flow.c
@@ -23,15 +23,14 @@
 #include <linux/mutex.h>
 #include <net/flow.h>
 #include <asm/atomic.h>
-#include <asm/semaphore.h>
 #include <linux/security.h>
 
 struct flow_cache_entry {
        struct flow_cache_entry *next;
        u16                     family;
        u8                      dir;
-       struct flowi            key;
        u32                     genid;
+       struct flowi            key;
        void                    *object;
        atomic_t                *object_ref;
 };
@@ -166,7 +165,7 @@ static int flow_key_compare(struct flowi *key1, struct flowi *key2)
        return 0;
 }
 
-void *flow_cache_lookup(struct flowi *key, u16 family, u8 dir,
+void *flow_cache_lookup(struct net *net, struct flowi *key, u16 family, u8 dir,
                        flow_resolve_t resolver)
 {
        struct flow_cache_entry *fle, **head;
@@ -226,7 +225,7 @@ nocache:
                void *obj;
                atomic_t *obj_ref;
 
-               err = resolver(key, family, dir, &obj, &obj_ref);
+               err = resolver(net, key, family, dir, &obj, &obj_ref);
 
                if (fle && !err) {
                        fle->genid = atomic_read(&flow_cache_genid);
@@ -299,7 +298,7 @@ void flow_cache_flush(void)
        init_completion(&info.completion);
 
        local_bh_disable();
-       smp_call_function(flow_cache_flush_per_cpu, &info, 1, 0);
+       smp_call_function(flow_cache_flush_per_cpu, &info, 0);
        flow_cache_flush_tasklet((unsigned long)&info);
        local_bh_enable();
 
@@ -308,7 +307,7 @@ void flow_cache_flush(void)
        put_online_cpus();
 }
 
-static void __devinit flow_cache_cpu_prepare(int cpu)
+static void __init flow_cache_cpu_prepare(int cpu)
 {
        struct tasklet_struct *tasklet;
        unsigned long order;
@@ -346,7 +345,7 @@ static int __init flow_cache_init(void)
 
        flow_cachep = kmem_cache_create("flow_cache",
                                        sizeof(struct flow_cache_entry),
-                                       0, SLAB_HWCACHE_ALIGN|SLAB_PANIC,
+                                       0, SLAB_PANIC,
                                        NULL);
        flow_hash_shift = 10;
        flow_lwm = 2 * flow_hash_size;