From 83c940fa185bb2a0b39e58447e2c7ef2bb84a217 Mon Sep 17 00:00:00 2001 From: Patrick McHardy Date: Mon, 17 Dec 2007 21:53:40 -0800 Subject: [PATCH] --- yaml --- r: 78517 b: refs/heads/master c: 06e1374a7ed45f1788353a2944a20133adc55649 h: refs/heads/master i: 78515: fced8217271191be313ecb1168e21fb1bbd6fc72 v: v3 --- [refs] | 2 +- trunk/include/linux/netfilter_ipv6/ip6_tables.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 5be8cd0cac39..8ba9c037d579 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6d6a55f42d93eeba7add62c3ad6a5409c6fd24ae +refs/heads/master: 06e1374a7ed45f1788353a2944a20133adc55649 diff --git a/trunk/include/linux/netfilter_ipv6/ip6_tables.h b/trunk/include/linux/netfilter_ipv6/ip6_tables.h index c1124826bf29..110801d699ee 100644 --- a/trunk/include/linux/netfilter_ipv6/ip6_tables.h +++ b/trunk/include/linux/netfilter_ipv6/ip6_tables.h @@ -324,7 +324,7 @@ extern int ip6_masked_addrcmp(const struct in6_addr *addr1, const struct in6_addr *mask, const struct in6_addr *addr2); -#define IP6T_ALIGN(s) (((s) + (__alignof__(struct ip6t_entry)-1)) & ~(__alignof__(struct ip6t_entry)-1)) +#define IP6T_ALIGN(s) XT_ALIGN(s) #ifdef CONFIG_COMPAT #include