diff options
author | Gao feng <gaofeng@cn.fujitsu.com> | 2012-05-28 21:04:23 +0000 |
---|---|---|
committer | Pablo Neira Ayuso <pablo@netfilter.org> | 2012-06-07 14:58:41 +0200 |
commit | 8264deb81853462da5cbcfb19b54c4fd9f3d88ba (patch) | |
tree | f64cce8fd096060434e46c07dce79df2a663cf50 /net/netfilter/nf_conntrack_proto_dccp.c | |
parent | e76d0af5e45f4152e3fdcc103b753a8aff93fcb5 (diff) | |
download | linux-stable-8264deb81853462da5cbcfb19b54c4fd9f3d88ba.tar.gz linux-stable-8264deb81853462da5cbcfb19b54c4fd9f3d88ba.tar.bz2 linux-stable-8264deb81853462da5cbcfb19b54c4fd9f3d88ba.zip |
netfilter: nf_conntrack: add namespace support for cttimeout
This patch adds namespace support for cttimeout.
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 'net/netfilter/nf_conntrack_proto_dccp.c')
-rw-r--r-- | net/netfilter/nf_conntrack_proto_dccp.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/net/netfilter/nf_conntrack_proto_dccp.c b/net/netfilter/nf_conntrack_proto_dccp.c index 8d798a613e3f..c33f76af913f 100644 --- a/net/netfilter/nf_conntrack_proto_dccp.c +++ b/net/netfilter/nf_conntrack_proto_dccp.c @@ -712,9 +712,10 @@ static int dccp_nlattr_size(void) #include <linux/netfilter/nfnetlink.h> #include <linux/netfilter/nfnetlink_cttimeout.h> -static int dccp_timeout_nlattr_to_obj(struct nlattr *tb[], void *data) +static int dccp_timeout_nlattr_to_obj(struct nlattr *tb[], + struct net *net, void *data) { - struct dccp_net *dn = dccp_pernet(&init_net); + struct dccp_net *dn = dccp_pernet(net); unsigned int *timeouts = data; int i; |