diff options
author | Stephen Rothwell <sfr@canb.auug.org.au> | 2008-12-01 14:22:55 +1100 |
---|---|---|
committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2008-12-01 14:26:56 +1100 |
commit | c1ea68f0237fc3e8ea5a6c084af9bda6b9a3722c (patch) | |
tree | 18f1c1a9ec816260ae4576496fa0b40559fb7dfd /include/linux/netfilter_bridge/ebtables.h | |
parent | 9a6cf71fa371180543df9f196e93986e37582c81 (diff) | |
parent | 25f13048bce61f33f6a102e0bf377fd3922ed364 (diff) |
Merge commit 'net/master'
Conflicts:
drivers/net/ixgbe/ixgbe_main.c
drivers/net/smc91x.c
Diffstat (limited to 'include/linux/netfilter_bridge/ebtables.h')
-rw-r--r-- | include/linux/netfilter_bridge/ebtables.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/linux/netfilter_bridge/ebtables.h b/include/linux/netfilter_bridge/ebtables.h index d45e29cd1cfb..e40ddb94b1af 100644 --- a/include/linux/netfilter_bridge/ebtables.h +++ b/include/linux/netfilter_bridge/ebtables.h @@ -300,7 +300,8 @@ struct ebt_table #define EBT_ALIGN(s) (((s) + (__alignof__(struct ebt_replace)-1)) & \ ~(__alignof__(struct ebt_replace)-1)) -extern int ebt_register_table(struct ebt_table *table); +extern struct ebt_table *ebt_register_table(struct net *net, + struct ebt_table *table); extern void ebt_unregister_table(struct ebt_table *table); extern unsigned int ebt_do_table(unsigned int hook, struct sk_buff *skb, const struct net_device *in, const struct net_device *out, |