diff options
| author | David S. Miller <davem@davemloft.net> | 2011-01-12 18:58:40 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-01-12 18:58:40 -0800 |
| commit | 464143c911df98d4913932534485113a0a14aa74 (patch) | |
| tree | 4df3953e3cbba8931b6305aa6d16981f1a93de6c /include/net | |
| parent | bb1231052e265e960d902ab32e67c5ccdabc9434 (diff) | |
| parent | 2fc72c7b84002ffb3c66918e2a7b0ee607d8b5aa (diff) | |
| download | linux-464143c911df98d4913932534485113a0a14aa74.tar.gz linux-464143c911df98d4913932534485113a0a14aa74.tar.bz2 linux-464143c911df98d4913932534485113a0a14aa74.zip | |
Merge branch 'master' of git://1984.lsi.us.es/net-2.6
Diffstat (limited to 'include/net')
| -rw-r--r-- | include/net/netfilter/ipv6/nf_conntrack_ipv6.h | 10 | ||||
| -rw-r--r-- | include/net/netfilter/ipv6/nf_defrag_ipv6.h | 10 |
2 files changed, 10 insertions, 10 deletions
diff --git a/include/net/netfilter/ipv6/nf_conntrack_ipv6.h b/include/net/netfilter/ipv6/nf_conntrack_ipv6.h index 1ee717eb5b09..a4c993685795 100644 --- a/include/net/netfilter/ipv6/nf_conntrack_ipv6.h +++ b/include/net/netfilter/ipv6/nf_conntrack_ipv6.h @@ -7,16 +7,6 @@ extern struct nf_conntrack_l4proto nf_conntrack_l4proto_tcp6; extern struct nf_conntrack_l4proto nf_conntrack_l4proto_udp6; extern struct nf_conntrack_l4proto nf_conntrack_l4proto_icmpv6; -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; - #include <linux/sysctl.h> extern struct ctl_table nf_ct_ipv6_sysctl_table[]; 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 */ |