aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorAlexey Dobriyan <adobriyan@gmail.com>2008-10-08 05:35:04 -0400
committerPatrick McHardy <kaber@trash.net>2008-10-08 05:35:04 -0400
commit63c9a26264be108b52de087724673f8664570e34 (patch)
treec18fe6b396ce660f982e441c5a305d40d2d3b3d4 /include
parent9b03f38d0487f3908696242286d934c9b38f9d2a (diff)
netfilter: netns nf_conntrack: per-netns unconfirmed list
What is confirmed connection in one netns can very well be unconfirmed in another one. Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com> Signed-off-by: Patrick McHardy <kaber@trash.net>
Diffstat (limited to 'include')
-rw-r--r--include/net/netfilter/nf_conntrack_core.h1
-rw-r--r--include/net/netns/conntrack.h2
2 files changed, 2 insertions, 1 deletions
diff --git a/include/net/netfilter/nf_conntrack_core.h b/include/net/netfilter/nf_conntrack_core.h
index 1c373564396a..b4b45c541da6 100644
--- a/include/net/netfilter/nf_conntrack_core.h
+++ b/include/net/netfilter/nf_conntrack_core.h
@@ -72,6 +72,5 @@ print_tuple(struct seq_file *s, const struct nf_conntrack_tuple *tuple,
72 const struct nf_conntrack_l4proto *proto); 72 const struct nf_conntrack_l4proto *proto);
73 73
74extern spinlock_t nf_conntrack_lock ; 74extern spinlock_t nf_conntrack_lock ;
75extern struct hlist_head unconfirmed;
76 75
77#endif /* _NF_CONNTRACK_CORE_H */ 76#endif /* _NF_CONNTRACK_CORE_H */
diff --git a/include/net/netns/conntrack.h b/include/net/netns/conntrack.h
index e453a33f3e93..6ddf58e142a9 100644
--- a/include/net/netns/conntrack.h
+++ b/include/net/netns/conntrack.h
@@ -1,6 +1,7 @@
1#ifndef __NETNS_CONNTRACK_H 1#ifndef __NETNS_CONNTRACK_H
2#define __NETNS_CONNTRACK_H 2#define __NETNS_CONNTRACK_H
3 3
4#include <linux/list.h>
4#include <asm/atomic.h> 5#include <asm/atomic.h>
5 6
6struct netns_ct { 7struct netns_ct {
@@ -8,6 +9,7 @@ struct netns_ct {
8 unsigned int expect_count; 9 unsigned int expect_count;
9 struct hlist_head *hash; 10 struct hlist_head *hash;
10 struct hlist_head *expect_hash; 11 struct hlist_head *expect_hash;
12 struct hlist_head unconfirmed;
11 int hash_vmalloc; 13 int hash_vmalloc;
12 int expect_vmalloc; 14 int expect_vmalloc;
13}; 15};