aboutsummaryrefslogtreecommitdiffstats
path: root/include/net/netfilter/ipv6/nf_defrag_ipv6.h
diff options
context:
space:
mode:
authorKOVACS Krisztian <hidden@balabit.hu>2011-01-12 20:25:08 +0100
committerPablo Neira Ayuso <pablo@netfilter.org>2011-01-12 20:25:08 +0100
commit2fc72c7b84002ffb3c66918e2a7b0ee607d8b5aa (patch)
treedf97dadb97bf3c9b46b7c557d8ac14b9ab1c17b3 /include/net/netfilter/ipv6/nf_defrag_ipv6.h
parentnetfilter: ebtables: make broute table work again (diff)
downloadlinux-dev-2fc72c7b84002ffb3c66918e2a7b0ee607d8b5aa.tar.xz
linux-dev-2fc72c7b84002ffb3c66918e2a7b0ee607d8b5aa.zip
netfilter: fix compilation when conntrack is disabled but tproxy is enabled
The IPv6 tproxy patches split IPv6 defragmentation off of conntrack, but failed to update the #ifdef stanzas guarding the defragmentation related fields and code in skbuff and conntrack related code in nf_defrag_ipv6.c. This patch adds the required #ifdefs so that IPv6 tproxy can truly be used without connection tracking. Original report: http://marc.info/?l=linux-netdev&m=129010118516341&w=2 Reported-by: Randy Dunlap <randy.dunlap@oracle.com> Acked-by: Randy Dunlap <randy.dunlap@oracle.com> Signed-off-by: KOVACS Krisztian <hidden@balabit.hu> Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Diffstat (limited to '')
-rw-r--r--include/net/netfilter/ipv6/nf_defrag_ipv6.h10
1 files changed, 10 insertions, 0 deletions
diff --git a/include/net/netfilter/ipv6/nf_defrag_ipv6.h b/include/net/netfilter/ipv6/nf_defrag_ipv6.h
index 94dd54d76b48..fd79c9a1779d 100644
--- a/include/net/netfilter/ipv6/nf_defrag_ipv6.h
+++ b/include/net/netfilter/ipv6/nf_defrag_ipv6.h
@@ -3,4 +3,14 @@
extern void nf_defrag_ipv6_enable(void);
+extern int nf_ct_frag6_init(void);
+extern void nf_ct_frag6_cleanup(void);
+extern struct sk_buff *nf_ct_frag6_gather(struct sk_buff *skb, u32 user);
+extern void nf_ct_frag6_output(unsigned int hooknum, struct sk_buff *skb,
+ struct net_device *in,
+ struct net_device *out,
+ int (*okfn)(struct sk_buff *));
+
+struct inet_frags_ctl;
+
#endif /* _NF_DEFRAG_IPV6_H */