aboutsummaryrefslogtreecommitdiffstats
path: root/include/net/netns
diff options
context:
space:
mode:
authorGao feng <gaofeng@cn.fujitsu.com>2012-05-28 17:04:11 -0400
committerPablo Neira Ayuso <pablo@netfilter.org>2012-06-07 08:58:39 -0400
commit15f585bd76b6bd2974b23c9e69ff038a0826a0be (patch)
tree6719807ab454cd1121b32f7eb9421890b661ce4f /include/net/netns
parent524a53e5ad5f34f64ed34281e8b0eca19437db5b (diff)
netfilter: nf_ct_generic: add namespace support
This patch adds namespace support for the generic layer 4 protocol tracker. Acked-by: Eric W. Biederman <ebiederm@xmission.com> Signed-off-by: Gao feng <gaofeng@cn.fujitsu.com> Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Diffstat (limited to 'include/net/netns')
-rw-r--r--include/net/netns/conntrack.h6
1 files changed, 6 insertions, 0 deletions
diff --git a/include/net/netns/conntrack.h b/include/net/netns/conntrack.h
index b2dbcc5cd813..0ef8592d48bf 100644
--- a/include/net/netns/conntrack.h
+++ b/include/net/netns/conntrack.h
@@ -20,7 +20,13 @@ struct nf_proto_net {
20 unsigned int users; 20 unsigned int users;
21}; 21};
22 22
23struct nf_generic_net {
24 struct nf_proto_net pn;
25 unsigned int timeout;
26};
27
23struct nf_ip_net { 28struct nf_ip_net {
29 struct nf_generic_net generic;
24#if defined(CONFIG_SYSCTL) && defined(CONFIG_NF_CONNTRACK_PROC_COMPAT) 30#if defined(CONFIG_SYSCTL) && defined(CONFIG_NF_CONNTRACK_PROC_COMPAT)
25 struct ctl_table_header *ctl_table_header; 31 struct ctl_table_header *ctl_table_header;
26 struct ctl_table *ctl_table; 32 struct ctl_table *ctl_table;