diff options
| author | David Ward <david.ward@ll.mit.edu> | 2011-09-05 16:47:23 +0000 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-11-11 09:37:17 -0800 |
| commit | 867ca3109d0289d0a62bb3c7fc3d365e9d478fae (patch) | |
| tree | 9a163483db34db0e8c55f09280bf68b429a35621 /include/net | |
| parent | ef52f3936f9f5d770ea177e5c769e68af1701a90 (diff) | |
| download | kernel_samsung_smdk4412-867ca3109d0289d0a62bb3c7fc3d365e9d478fae.zip kernel_samsung_smdk4412-867ca3109d0289d0a62bb3c7fc3d365e9d478fae.tar.gz kernel_samsung_smdk4412-867ca3109d0289d0a62bb3c7fc3d365e9d478fae.tar.bz2 | |
net: Align AF-specific flowi structs to long
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>
Diffstat (limited to 'include/net')
| -rw-r--r-- | include/net/flow.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/net/flow.h b/include/net/flow.h index c6d5fe5..a333853 100644 --- 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 { |