| From 728871bc05afc8ff310b17dba3e57a2472792b13 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: net: Align AF-specific flowi structs to long |
| |
| From: David Ward <david.ward@ll.mit.edu> |
| |
| commit 728871bc05afc8ff310b17dba3e57a2472792b13 upstream. |
| |
| AF-specific flowi structs are now passed to flow_key_compare, which must |
| also be aligned to a long. |
| |
| Signed-off-by: David Ward <david.ward@ll.mit.edu> |
| Signed-off-by: David S. Miller <davem@davemloft.net> |
| Cc: Kim Phillips <kim.phillips@freescale.com> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> |
| |
| --- |
| include/net/flow.h | 6 +++--- |
| 1 file changed, 3 insertions(+), 3 deletions(-) |
| |
| --- a/include/net/flow.h |
| +++ b/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 { |
