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

Commit 6fbfc968 authored by David S. Miller's avatar David S. Miller
Browse files

[NETFILTER]: Unbreak x-tables on x86. 



x86 defines __alignof__(long long) as 8 yet it gives 4
for a struct containing a long long, ho hum... so my
simplified form doesn't work everywhere.

So use Harald Welte's original patch, which should work
on all platforms.

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 3ee68c4a

include/linux/netfilter/x_tables.h

+15 −1
Original line number Diff line number Diff line
@@ -19,7 +19,21 @@ struct xt_get_revision 
/* For standard target */

#define XT_RETURN (-NF_REPEAT - 1)



#define XT_ALIGN(s) (((s) + (__alignof__(u_int64_t)-1)) & ~(__alignof__(u_int64_t)-1))

/* this is a dummy structure to find out the alignment requirement for a struct

 * containing all the fundamental data types that are used in ipt_entry,

 * ip6t_entry and arpt_entry.  This sucks, and it is a hack.  It will be my

 * personal pleasure to remove it -HW

 */

struct _xt_align

{

	u_int8_t u8;

	u_int16_t u16;

	u_int32_t u32;

	u_int64_t u64;

};



#define XT_ALIGN(s) (((s) + (__alignof__(struct _xt_align)-1)) 	\

			& ~(__alignof__(struct _xt_align)-1))



/* Standard return verdict, or do jump. */

#define XT_STANDARD_TARGET ""