From 3334df2b2b27ab5da427fcccd7fa7c92c0ced943 Mon Sep 17 00:00:00 2001
From: David Ward <david.ward@ll.mit.edu>
Date: Mon, 5 Sep 2011 16:47:23 +0000
Subject: [PATCH] --- yaml --- r: 263946 b: refs/heads/master c:
 728871bc05afc8ff310b17dba3e57a2472792b13 h: refs/heads/master v: v3

---
 [refs]                   | 2 +-
 trunk/include/net/flow.h | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 4c2038888f2d..6804b529a9f0 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 19c1ea14c930db5e9c0cd7c3c6f4d01457dfcd69
+refs/heads/master: 728871bc05afc8ff310b17dba3e57a2472792b13
diff --git a/trunk/include/net/flow.h b/trunk/include/net/flow.h
index 78113daadd63..2ec377d9ab9f 100644
--- a/trunk/include/net/flow.h
+++ b/trunk/include/net/flow.h
@@ -68,7 +68,7 @@ struct flowi4 {
 #define fl4_ipsec_spi		uli.spi
 #define fl4_mh_type		uli.mht.type
 #define fl4_gre_key		uli.gre_key
-};
+} __attribute__((__aligned__(BITS_PER_LONG/8)));
 
 static inline void flowi4_init_output(struct flowi4 *fl4, int oif,
 				      __u32 mark, __u8 tos, __u8 scope,
@@ -112,7 +112,7 @@ struct flowi6 {
 #define fl6_ipsec_spi		uli.spi
 #define fl6_mh_type		uli.mht.type
 #define fl6_gre_key		uli.gre_key
-};
+} __attribute__((__aligned__(BITS_PER_LONG/8)));
 
 struct flowidn {
 	struct flowi_common	__fl_common;
@@ -127,7 +127,7 @@ struct flowidn {
 	union flowi_uli		uli;
 #define fld_sport		uli.ports.sport
 #define fld_dport		uli.ports.dport
-};
+} __attribute__((__aligned__(BITS_PER_LONG/8)));
 
 struct flowi {
 	union {