diff options
| author | David Ward <david.ward@ll.mit.edu> | 2011-09-05 12:47:23 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-09-16 17:45:07 -0400 |
| commit | 728871bc05afc8ff310b17dba3e57a2472792b13 (patch) | |
| tree | e40dc2e09daa61760a09f16e6fb9569bba303645 | |
| parent | 19c1ea14c930db5e9c0cd7c3c6f4d01457dfcd69 (diff) | |
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>
| -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 78113daadd63..2ec377d9ab9f 100644 --- a/include/net/flow.h +++ b/include/net/flow.h | |||
| @@ -68,7 +68,7 @@ struct flowi4 { | |||
| 68 | #define fl4_ipsec_spi uli.spi | 68 | #define fl4_ipsec_spi uli.spi |
| 69 | #define fl4_mh_type uli.mht.type | 69 | #define fl4_mh_type uli.mht.type |
| 70 | #define fl4_gre_key uli.gre_key | 70 | #define fl4_gre_key uli.gre_key |
| 71 | }; | 71 | } __attribute__((__aligned__(BITS_PER_LONG/8))); |
| 72 | 72 | ||
| 73 | static inline void flowi4_init_output(struct flowi4 *fl4, int oif, | 73 | static inline void flowi4_init_output(struct flowi4 *fl4, int oif, |
| 74 | __u32 mark, __u8 tos, __u8 scope, | 74 | __u32 mark, __u8 tos, __u8 scope, |
| @@ -112,7 +112,7 @@ struct flowi6 { | |||
| 112 | #define fl6_ipsec_spi uli.spi | 112 | #define fl6_ipsec_spi uli.spi |
| 113 | #define fl6_mh_type uli.mht.type | 113 | #define fl6_mh_type uli.mht.type |
| 114 | #define fl6_gre_key uli.gre_key | 114 | #define fl6_gre_key uli.gre_key |
| 115 | }; | 115 | } __attribute__((__aligned__(BITS_PER_LONG/8))); |
| 116 | 116 | ||
| 117 | struct flowidn { | 117 | struct flowidn { |
| 118 | struct flowi_common __fl_common; | 118 | struct flowi_common __fl_common; |
| @@ -127,7 +127,7 @@ struct flowidn { | |||
| 127 | union flowi_uli uli; | 127 | union flowi_uli uli; |
| 128 | #define fld_sport uli.ports.sport | 128 | #define fld_sport uli.ports.sport |
| 129 | #define fld_dport uli.ports.dport | 129 | #define fld_dport uli.ports.dport |
| 130 | }; | 130 | } __attribute__((__aligned__(BITS_PER_LONG/8))); |
| 131 | 131 | ||
| 132 | struct flowi { | 132 | struct flowi { |
| 133 | union { | 133 | union { |
