Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 728871bc authored by David Ward's avatar David Ward Committed by David S. Miller
Browse files

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: default avatarDavid Ward <david.ward@ll.mit.edu>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 19c1ea14

include/net/flow.h

+3 −3
Original line number Original line Diff line number Diff line
@@ -68,7 +68,7 @@ struct flowi4 { 
#define fl4_ipsec_spi		uli.spi

#define fl4_ipsec_spi		uli.spi

#define fl4_mh_type		uli.mht.type

#define fl4_mh_type		uli.mht.type

#define fl4_gre_key		uli.gre_key

#define fl4_gre_key		uli.gre_key

};

} __attribute__((__aligned__(BITS_PER_LONG/8)));





static inline void flowi4_init_output(struct flowi4 *fl4, int oif,

static inline void flowi4_init_output(struct flowi4 *fl4, int oif,

				      __u32 mark, __u8 tos, __u8 scope,

				      __u32 mark, __u8 tos, __u8 scope,
@@ -112,7 +112,7 @@ struct flowi6 { 
#define fl6_ipsec_spi		uli.spi

#define fl6_ipsec_spi		uli.spi

#define fl6_mh_type		uli.mht.type

#define fl6_mh_type		uli.mht.type

#define fl6_gre_key		uli.gre_key

#define fl6_gre_key		uli.gre_key

};

} __attribute__((__aligned__(BITS_PER_LONG/8)));





struct flowidn {

struct flowidn {

	struct flowi_common	__fl_common;

	struct flowi_common	__fl_common;
@@ -127,7 +127,7 @@ struct flowidn { 
	union flowi_uli		uli;

	union flowi_uli		uli;

#define fld_sport		uli.ports.sport

#define fld_sport		uli.ports.sport

#define fld_dport		uli.ports.dport

#define fld_dport		uli.ports.dport

};

} __attribute__((__aligned__(BITS_PER_LONG/8)));





struct flowi {

struct flowi {

	union {

	union {