diff options
author | Patrick McHardy <kaber@trash.net> | 2010-02-03 08:13:03 -0500 |
---|---|---|
committer | Patrick McHardy <kaber@trash.net> | 2010-02-03 08:40:17 -0500 |
commit | b2a15a604d379af323645e330638e2cfcc696aff (patch) | |
tree | 75a863636fae6f5e3fcf3dacbdee3ccf1f8b7c8d /net/netfilter/nf_conntrack_netlink.c | |
parent | 0cebe4b4163b6373c9d24c1a192939777bc27e55 (diff) |
netfilter: nf_conntrack: support conntrack templates
Support initializing selected parameters of new conntrack entries from a
"conntrack template", which is a specially marked conntrack entry attached
to the skb.
Currently the helper and the event delivery masks can be initialized this
way.
Signed-off-by: Patrick McHardy <kaber@trash.net>
Diffstat (limited to 'net/netfilter/nf_conntrack_netlink.c')
-rw-r--r-- | net/netfilter/nf_conntrack_netlink.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/netfilter/nf_conntrack_netlink.c b/net/netfilter/nf_conntrack_netlink.c index f5c0b09e12f..09044f9f4b2 100644 --- a/net/netfilter/nf_conntrack_netlink.c +++ b/net/netfilter/nf_conntrack_netlink.c | |||
@@ -1249,7 +1249,7 @@ ctnetlink_create_conntrack(struct net *net, | |||
1249 | } | 1249 | } |
1250 | } else { | 1250 | } else { |
1251 | /* try an implicit helper assignation */ | 1251 | /* try an implicit helper assignation */ |
1252 | err = __nf_ct_try_assign_helper(ct, GFP_ATOMIC); | 1252 | err = __nf_ct_try_assign_helper(ct, NULL, GFP_ATOMIC); |
1253 | if (err < 0) | 1253 | if (err < 0) |
1254 | goto err2; | 1254 | goto err2; |
1255 | } | 1255 | } |