diff --git a/[refs] b/[refs] index ce499c06ede0..5f96f7b0745d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: fca09fb732b2cc310110b2fcbf3449df043a96d0 +refs/heads/master: dd5a1843d566911dbb077c4022c4936697495af6 diff --git a/trunk/net/core/flow.c b/trunk/net/core/flow.c index 9cfe84571ca5..a77531c139b7 100644 --- a/trunk/net/core/flow.c +++ b/trunk/net/core/flow.c @@ -30,8 +30,8 @@ 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; }; @@ -346,7 +346,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;