diff options
| author | David S. Miller | 2006-01-20 01:58:37 +0100 |
|---|---|---|
| committer | David S. Miller | 2006-01-20 01:58:37 +0100 |
| commit | 4f2d7680cb1ac5c5a70f3ba2447d5aa5c0a1643a (patch) | |
| tree | 248d57059e14782130b08084617b252ded7dfeb6 | |
| parent | Merge master.kernel.org:/pub/scm/linux/kernel/git/sridhar/lksctp-2.6 (diff) | |
| download | kernel-qcow2-linux-4f2d7680cb1ac5c5a70f3ba2447d5aa5c0a1643a.tar.gz kernel-qcow2-linux-4f2d7680cb1ac5c5a70f3ba2447d5aa5c0a1643a.tar.xz kernel-qcow2-linux-4f2d7680cb1ac5c5a70f3ba2447d5aa5c0a1643a.zip | |
[NETFILTER] x_tables: Make XT_ALIGN align as strictly as necessary.
Or else we break on ppc32 and other 32-bit platforms.
Based upon a patch from Harald Welte.
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | include/linux/netfilter/x_tables.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/netfilter/x_tables.h b/include/linux/netfilter/x_tables.h index 472f04834809..59ff6c430cf6 100644 --- a/include/linux/netfilter/x_tables.h +++ b/include/linux/netfilter/x_tables.h @@ -19,7 +19,7 @@ struct xt_get_revision /* For standard target */ #define XT_RETURN (-NF_REPEAT - 1) -#define XT_ALIGN(s) (((s) + (__alignof__(void *)-1)) & ~(__alignof__(void *)-1)) +#define XT_ALIGN(s) (((s) + (__alignof__(u_int64_t)-1)) & ~(__alignof__(u_int64_t)-1)) /* Standard return verdict, or do jump. */ #define XT_STANDARD_TARGET "" |