summaryrefslogtreecommitdiffstats
path: root/net/openvswitch
diff options
context:
space:
mode:
authorJoe Stringer <joe@ovn.org>2016-09-02 03:01:47 +0200
committerDavid S. Miller <davem@davemloft.net>2016-09-04 20:38:10 +0200
commit76644232e6122808947aa329bb995ea68ad01442 (patch)
tree18aee1b91e38fd7420b2153e4928bf5d5632180e /net/openvswitch
parentMerge branch 'liquidio-CN23XX-part-2' (diff)
downloadlinux-76644232e6122808947aa329bb995ea68ad01442.tar.xz
linux-76644232e6122808947aa329bb995ea68ad01442.zip
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')
-rw-r--r--net/openvswitch/conntrack.c2
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)
if (ct_info->helper)
module_put(ct_info->helper->me);
if (ct_info->ct)
- nf_ct_put(ct_info->ct);
+ nf_ct_tmpl_free(ct_info->ct);
}
void ovs_ct_init(struct net *net)