diff options
author | Joe Stringer <joe@ovn.org> | 2016-09-01 21:01:47 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2016-09-04 14:38:10 -0400 |
commit | 76644232e6122808947aa329bb995ea68ad01442 (patch) | |
tree | 18aee1b91e38fd7420b2153e4928bf5d5632180e /net/openvswitch/conntrack.c | |
parent | e8a3925f691698bb7d8b0016f6506a5255b98437 (diff) |
openvswitch: Free tmpl with tmpl_free.
When an error occurs during conntrack template creation as part of
actions validation, we need to free the template. Previously we've been
using nf_ct_put() to do this, but nf_ct_tmpl_free() is more appropriate.
Signed-off-by: Joe Stringer <joe@ovn.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/openvswitch/conntrack.c')
-rw-r--r-- | net/openvswitch/conntrack.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/openvswitch/conntrack.c b/net/openvswitch/conntrack.c index e054a748ff25..31045ef44a82 100644 --- a/net/openvswitch/conntrack.c +++ b/net/openvswitch/conntrack.c | |||
@@ -1367,7 +1367,7 @@ static void __ovs_ct_free_action(struct ovs_conntrack_info *ct_info) | |||
1367 | if (ct_info->helper) | 1367 | if (ct_info->helper) |
1368 | module_put(ct_info->helper->me); | 1368 | module_put(ct_info->helper->me); |
1369 | if (ct_info->ct) | 1369 | if (ct_info->ct) |
1370 | nf_ct_put(ct_info->ct); | 1370 | nf_ct_tmpl_free(ct_info->ct); |
1371 | } | 1371 | } |
1372 | 1372 | ||
1373 | void ovs_ct_init(struct net *net) | 1373 | void ovs_ct_init(struct net *net) |