aboutsummaryrefslogtreecommitdiffstats
path: root/include/net/netns/conntrack.h
diff options
context:
space:
mode:
authorGao feng <gaofeng@cn.fujitsu.com>2012-05-28 21:04:11 +0000
committerPablo Neira Ayuso <pablo@netfilter.org>2012-06-07 14:58:39 +0200
commit15f585bd76b6bd2974b23c9e69ff038a0826a0be (patch)
tree6719807ab454cd1121b32f7eb9421890b661ce4f /include/net/netns/conntrack.h
parentnetfilter: nf_conntrack: prepare namespace support for l3 protocol trackers (diff)
downloadlinux-dev-15f585bd76b6bd2974b23c9e69ff038a0826a0be.tar.xz
linux-dev-15f585bd76b6bd2974b23c9e69ff038a0826a0be.zip
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/conntrack.h')
-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 {
unsigned int users;
};
+struct nf_generic_net {
+ struct nf_proto_net pn;
+ unsigned int timeout;
+};
+
struct nf_ip_net {
+ struct nf_generic_net generic;
#if defined(CONFIG_SYSCTL) && defined(CONFIG_NF_CONNTRACK_PROC_COMPAT)
struct ctl_table_header *ctl_table_header;
struct ctl_table *ctl_table;