diff options
| author | Gao feng | 2012-05-28 23:04:23 +0200 |
|---|---|---|
| committer | Pablo Neira Ayuso | 2012-06-07 14:58:41 +0200 |
| commit | 8264deb81853462da5cbcfb19b54c4fd9f3d88ba (patch) | |
| tree | f64cce8fd096060434e46c07dce79df2a663cf50 /include/net/netfilter | |
| parent | netfilter: nf_conntrack: remove now unused sysctl for nf_conntrack_l[3|4]proto (diff) | |
| download | kernel-qcow2-linux-8264deb81853462da5cbcfb19b54c4fd9f3d88ba.tar.gz kernel-qcow2-linux-8264deb81853462da5cbcfb19b54c4fd9f3d88ba.tar.xz kernel-qcow2-linux-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 'include/net/netfilter')
| -rw-r--r-- | include/net/netfilter/nf_conntrack_l4proto.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/net/netfilter/nf_conntrack_l4proto.h b/include/net/netfilter/nf_conntrack_l4proto.h index cfa2f89b031d..81c52b5205f2 100644 --- a/include/net/netfilter/nf_conntrack_l4proto.h +++ b/include/net/netfilter/nf_conntrack_l4proto.h @@ -87,7 +87,8 @@ struct nf_conntrack_l4proto { #if IS_ENABLED(CONFIG_NF_CT_NETLINK_TIMEOUT) struct { size_t obj_size; - int (*nlattr_to_obj)(struct nlattr *tb[], void *data); + int (*nlattr_to_obj)(struct nlattr *tb[], + struct net *net, void *data); int (*obj_to_nlattr)(struct sk_buff *skb, const void *data); unsigned int nlattr_max; |