From 02a74ab6340867de2177c876ade5591e86d72e09 Mon Sep 17 00:00:00 2001 From: Patrick McHardy Date: Mon, 17 Dec 2007 21:55:34 -0800 Subject: [PATCH] --- yaml --- r: 78519 b: refs/heads/master c: 0495cf957bfacbca123cb4c4e1c4cf0e265f522e h: refs/heads/master i: 78517: 83c940fa185bb2a0b39e58447e2c7ef2bb84a217 78515: fced8217271191be313ecb1168e21fb1bbd6fc72 78511: 1f9bccf67dd184c77862ec81b9137722543fd35f v: v3 --- [refs] | 2 +- trunk/include/linux/netfilter_arp/arp_tables.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index ccae9e453c2e..9f8c7cd32e2e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 03dafbbdf8a5e8a9e3e347a393930ed49506d00b +refs/heads/master: 0495cf957bfacbca123cb4c4e1c4cf0e265f522e diff --git a/trunk/include/linux/netfilter_arp/arp_tables.h b/trunk/include/linux/netfilter_arp/arp_tables.h index e44811b9be6c..7ade26b025a4 100644 --- a/trunk/include/linux/netfilter_arp/arp_tables.h +++ b/trunk/include/linux/netfilter_arp/arp_tables.h @@ -280,6 +280,6 @@ extern unsigned int arpt_do_table(struct sk_buff *skb, const struct net_device *out, struct arpt_table *table); -#define ARPT_ALIGN(s) (((s) + (__alignof__(struct arpt_entry)-1)) & ~(__alignof__(struct arpt_entry)-1)) +#define ARPT_ALIGN(s) XT_ALIGN(s) #endif /*__KERNEL__*/ #endif /* _ARPTABLES_H */