aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorPatrick McHardy <kaber@trash.net>2008-01-15 02:48:57 -0500
committerDavid S. Miller <davem@davemloft.net>2008-01-28 18:02:41 -0500
commitb334aadc3c5cd4dae2a44f3dac09b3ef718ccde1 (patch)
tree5d0c6da0e7f5b0ff9f6a1f8eab7e45be96694f5e /include
parent4f536522dae9d5326ad1872cd254ee84681cf563 (diff)
[NETFILTER]: nf_conntrack: clean up a few header files
- Remove declarations of non-existing variables and functions - Move helper init/cleanup function declarations to nf_conntrack_helper.h - Remove unneeded __nf_conntrack_attach declaration and make it static Signed-off-by: Patrick McHardy <kaber@trash.net> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include')
-rw-r--r--include/net/netfilter/nf_conntrack.h7
-rw-r--r--include/net/netfilter/nf_conntrack_core.h12
-rw-r--r--include/net/netfilter/nf_conntrack_helper.h4
3 files changed, 4 insertions, 19 deletions
diff --git a/include/net/netfilter/nf_conntrack.h b/include/net/netfilter/nf_conntrack.h
index 4ac5ab187c2a..857d89951790 100644
--- a/include/net/netfilter/nf_conntrack.h
+++ b/include/net/netfilter/nf_conntrack.h
@@ -223,8 +223,6 @@ extern void nf_conntrack_tcp_update(struct sk_buff *skb,
223/* Fake conntrack entry for untracked connections */ 223/* Fake conntrack entry for untracked connections */
224extern struct nf_conn nf_conntrack_untracked; 224extern struct nf_conn nf_conntrack_untracked;
225 225
226extern int nf_ct_no_defrag;
227
228/* Iterate over all conntracks: if iter returns true, it's deleted. */ 226/* Iterate over all conntracks: if iter returns true, it's deleted. */
229extern void 227extern void
230nf_ct_iterate_cleanup(int (*iter)(struct nf_conn *i, void *data), void *data); 228nf_ct_iterate_cleanup(int (*iter)(struct nf_conn *i, void *data), void *data);
@@ -264,10 +262,5 @@ do { \
264 local_bh_enable(); \ 262 local_bh_enable(); \
265} while (0) 263} while (0)
266 264
267extern int
268nf_conntrack_register_cache(u_int32_t features, const char *name, size_t size);
269extern void
270nf_conntrack_unregister_cache(u_int32_t features);
271
272#endif /* __KERNEL__ */ 265#endif /* __KERNEL__ */
273#endif /* _NF_CONNTRACK_H */ 266#endif /* _NF_CONNTRACK_H */
diff --git a/include/net/netfilter/nf_conntrack_core.h b/include/net/netfilter/nf_conntrack_core.h
index a532e7b5ed6a..7ad0828f05cf 100644
--- a/include/net/netfilter/nf_conntrack_core.h
+++ b/include/net/netfilter/nf_conntrack_core.h
@@ -30,16 +30,6 @@ extern void nf_conntrack_cleanup(void);
30extern int nf_conntrack_proto_init(void); 30extern int nf_conntrack_proto_init(void);
31extern void nf_conntrack_proto_fini(void); 31extern void nf_conntrack_proto_fini(void);
32 32
33extern int nf_conntrack_helper_init(void);
34extern void nf_conntrack_helper_fini(void);
35
36struct nf_conntrack_l3proto;
37extern struct nf_conntrack_l3proto *nf_ct_find_l3proto(u_int16_t pf);
38/* Like above, but you already have conntrack read lock. */
39extern struct nf_conntrack_l3proto *__nf_ct_find_l3proto(u_int16_t l3proto);
40
41struct nf_conntrack_l4proto;
42
43extern int 33extern int
44nf_ct_get_tuple(const struct sk_buff *skb, 34nf_ct_get_tuple(const struct sk_buff *skb,
45 unsigned int nhoff, 35 unsigned int nhoff,
@@ -76,8 +66,6 @@ static inline int nf_conntrack_confirm(struct sk_buff *skb)
76 return ret; 66 return ret;
77} 67}
78 68
79extern void __nf_conntrack_attach(struct sk_buff *nskb, struct sk_buff *skb);
80
81int 69int
82print_tuple(struct seq_file *s, const struct nf_conntrack_tuple *tuple, 70print_tuple(struct seq_file *s, const struct nf_conntrack_tuple *tuple,
83 struct nf_conntrack_l3proto *l3proto, 71 struct nf_conntrack_l3proto *l3proto,
diff --git a/include/net/netfilter/nf_conntrack_helper.h b/include/net/netfilter/nf_conntrack_helper.h
index d7b2d5483a71..2f3af00643cf 100644
--- a/include/net/netfilter/nf_conntrack_helper.h
+++ b/include/net/netfilter/nf_conntrack_helper.h
@@ -58,4 +58,8 @@ static inline struct nf_conn_help *nfct_help(const struct nf_conn *ct)
58{ 58{
59 return nf_ct_ext_find(ct, NF_CT_EXT_HELPER); 59 return nf_ct_ext_find(ct, NF_CT_EXT_HELPER);
60} 60}
61
62extern int nf_conntrack_helper_init(void);
63extern void nf_conntrack_helper_fini(void);
64
61#endif /*_NF_CONNTRACK_HELPER_H*/ 65#endif /*_NF_CONNTRACK_HELPER_H*/