diff options
author | Alexey Dobriyan <adobriyan@gmail.com> | 2008-10-08 05:35:02 -0400 |
---|---|---|
committer | Patrick McHardy <kaber@trash.net> | 2008-10-08 05:35:02 -0400 |
commit | dfdb8d791877052bbb527d9688d94a064721d8f7 (patch) | |
tree | 1aba6921536f1d3244c8967033edefd2bbcf4812 /net/netfilter/nf_conntrack_core.c | |
parent | e10aad9998e463df8e25ec749538faf3324dd31b (diff) |
netfilter: netns nf_conntrack: add netns boilerplate
One comment: #ifdefs around #include is necessary to overcome amazing compile
breakages in NOTRACK-in-netns patch (see below).
Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com>
Signed-off-by: Patrick McHardy <kaber@trash.net>
Diffstat (limited to 'net/netfilter/nf_conntrack_core.c')
-rw-r--r-- | net/netfilter/nf_conntrack_core.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/netfilter/nf_conntrack_core.c b/net/netfilter/nf_conntrack_core.c index 6aaf64b5ded..ee79e932589 100644 --- a/net/netfilter/nf_conntrack_core.c +++ b/net/netfilter/nf_conntrack_core.c | |||
@@ -1006,7 +1006,7 @@ EXPORT_SYMBOL_GPL(nf_conntrack_flush); | |||
1006 | 1006 | ||
1007 | /* Mishearing the voices in his head, our hero wonders how he's | 1007 | /* Mishearing the voices in his head, our hero wonders how he's |
1008 | supposed to kill the mall. */ | 1008 | supposed to kill the mall. */ |
1009 | void nf_conntrack_cleanup(void) | 1009 | void nf_conntrack_cleanup(struct net *net) |
1010 | { | 1010 | { |
1011 | rcu_assign_pointer(ip_ct_attach, NULL); | 1011 | rcu_assign_pointer(ip_ct_attach, NULL); |
1012 | 1012 | ||
@@ -1120,7 +1120,7 @@ EXPORT_SYMBOL_GPL(nf_conntrack_set_hashsize); | |||
1120 | module_param_call(hashsize, nf_conntrack_set_hashsize, param_get_uint, | 1120 | module_param_call(hashsize, nf_conntrack_set_hashsize, param_get_uint, |
1121 | &nf_conntrack_htable_size, 0600); | 1121 | &nf_conntrack_htable_size, 0600); |
1122 | 1122 | ||
1123 | int __init nf_conntrack_init(void) | 1123 | int nf_conntrack_init(struct net *net) |
1124 | { | 1124 | { |
1125 | int max_factor = 8; | 1125 | int max_factor = 8; |
1126 | int ret; | 1126 | int ret; |