Merge branch 'for-linus' into for-next

[karo-tx-linux.git] / include / linux / netfilter_ipv4 / ip_tables.h

diff --git a/include/linux/netfilter_ipv4/ip_tables.h b/include/linux/netfilter_ipv4/ip_tables.h
index 901e84db847d35e5ccbe49d2d524c921dc9bdef9..4073510da485fbad83ba5236d7ba5794b599653a 100644 (file)
--- a/include/linux/netfilter_ipv4/ip_tables.h
+++ b/include/linux/netfilter_ipv4/ip_tables.h
@@ -65,8 +65,7 @@ struct ipt_error {
 extern void *ipt_alloc_initial_table(const struct xt_table *);
 extern unsigned int ipt_do_table(struct sk_buff *skb,
                                 unsigned int hook,
-                                const struct net_device *in,
-                                const struct net_device *out,
+                                const struct nf_hook_state *state,
                                 struct xt_table *table);
 
 #ifdef CONFIG_COMPAT