diff options
author | David Ward <david.ward@ll.mit.edu> | 2011-09-05 16:47:23 +0000 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2011-09-16 17:45:07 -0400 |
commit | 728871bc05afc8ff310b17dba3e57a2472792b13 (patch) | |
tree | e40dc2e09daa61760a09f16e6fb9569bba303645 /include | |
parent | 19c1ea14c930db5e9c0cd7c3c6f4d01457dfcd69 (diff) | |
download | linux-3.10-728871bc05afc8ff310b17dba3e57a2472792b13.tar.gz linux-3.10-728871bc05afc8ff310b17dba3e57a2472792b13.tar.bz2 linux-3.10-728871bc05afc8ff310b17dba3e57a2472792b13.zip |
net: Align AF-specific flowi structs to long
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>
Diffstat (limited to 'include')
-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 78113daadd6..2ec377d9ab9 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 { |