summaryrefslogtreecommitdiff
path: root/include/linux
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2012-02-23 00:20:14 -0500
committerDavid S. Miller <davem@davemloft.net>2012-02-23 00:20:14 -0500
commit4a2258ddddefeef3291c0fc66437c73d84261a1e (patch)
tree292008df656adc6c8412a79da6bedaff54458eab /include/linux
parentee932bf9acb2e2c6a309e808000f24856330e3f9 (diff)
parentaf14cca162ddcdea017b648c21b9b091e4bf1fa4 (diff)
Merge branch 'nf' of git://1984.lsi.us.es/net
Diffstat (limited to 'include/linux')
-rw-r--r--include/linux/netfilter_bridge/ebtables.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/include/linux/netfilter_bridge/ebtables.h b/include/linux/netfilter_bridge/ebtables.h
index 8797ed16feb2..4dd5bd6994a8 100644
--- a/include/linux/netfilter_bridge/ebtables.h
+++ b/include/linux/netfilter_bridge/ebtables.h
@@ -285,8 +285,8 @@ struct ebt_table {
struct module *me;
};
-#define EBT_ALIGN(s) (((s) + (__alignof__(struct ebt_replace)-1)) & \
- ~(__alignof__(struct ebt_replace)-1))
+#define EBT_ALIGN(s) (((s) + (__alignof__(struct _xt_align)-1)) & \
+ ~(__alignof__(struct _xt_align)-1))
extern struct ebt_table *ebt_register_table(struct net *net,
const struct ebt_table *table);
extern void ebt_unregister_table(struct net *net, struct ebt_table *table);