diff options
| author | Patrick McHardy <kaber@trash.net> | 2007-03-14 19:38:25 -0400 |
|---|---|---|
| committer | David S. Miller <davem@sunset.davemloft.net> | 2007-04-26 01:25:40 -0400 |
| commit | ac5357ebac43e191003c2cd0722377dccfa01a84 (patch) | |
| tree | a5a09bed344af07a68a95c2c4606a6c7eedc4748 /include | |
| parent | b19caa0ca071dce76b0e81e957e7eb7c03d72cf5 (diff) | |
[NETFILTER]: nf_conntrack: remove ugly hack in l4proto registration
Remove ugly special-casing of nf_conntrack_l4proto_generic, all it
wants is its sysctl tables registered, so do that explicitly in an
init function and move the remaining protocol initialization and
cleanup code to nf_conntrack_proto.c as well.
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_core.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/include/net/netfilter/nf_conntrack_core.h b/include/net/netfilter/nf_conntrack_core.h index 85634e1865c3..9fb906688ffa 100644 --- a/include/net/netfilter/nf_conntrack_core.h +++ b/include/net/netfilter/nf_conntrack_core.h | |||
| @@ -27,6 +27,9 @@ extern unsigned int nf_conntrack_in(int pf, | |||
| 27 | extern int nf_conntrack_init(void); | 27 | extern int nf_conntrack_init(void); |
| 28 | extern void nf_conntrack_cleanup(void); | 28 | extern void nf_conntrack_cleanup(void); |
| 29 | 29 | ||
| 30 | extern int nf_conntrack_proto_init(void); | ||
| 31 | extern void nf_conntrack_proto_fini(void); | ||
| 32 | |||
| 30 | struct nf_conntrack_l3proto; | 33 | struct nf_conntrack_l3proto; |
| 31 | extern struct nf_conntrack_l3proto *nf_ct_find_l3proto(u_int16_t pf); | 34 | extern struct nf_conntrack_l3proto *nf_ct_find_l3proto(u_int16_t pf); |
| 32 | /* Like above, but you already have conntrack read lock. */ | 35 | /* Like above, but you already have conntrack read lock. */ |