From cec10b843952997f3f16546ee47f5c50a9bced2c Mon Sep 17 00:00:00 2001
From: Eric Dumazet <dada1@cosmosbay.com>
Date: Thu, 7 Feb 2008 23:30:42 -0800
Subject: [PATCH] --- yaml --- r: 84863 b: refs/heads/master c:
 dd5a1843d566911dbb077c4022c4936697495af6 h: refs/heads/master i:   84861:
 c2419d67eb0e296fdf628a357b989e7628e89e87   84859:
 32b31129e3d600076965f67859b610980e60f07c   84855:
 1c2ae7e1c7f4aa3ab815c5eca776bd92ba622947   84847:
 0245fafceda3d63d0db66587d8c07b84907a31e5   84831:
 64c7683057933e395fcf2f9bfe87b8ea3fb0670b   84799:
 7660d4e5b528b7deee6e767a957c2a710107522c   84735:
 73d5043265e774ea0d4dfc92b7e1b4e6780f991d v: v3

---
 [refs]                | 2 +-
 trunk/net/core/flow.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

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;