* [PATCH net-next] openvswitch: Free tmpl with tmpl_free.
@ 2016-09-02 1:01 Joe Stringer
2016-09-04 18:38 ` David Miller
0 siblings, 1 reply; 2+ messages in thread
From: Joe Stringer @ 2016-09-02 1:01 UTC (permalink / raw)
To: netdev; +Cc: jesse
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>
---
net/openvswitch/conntrack.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
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)
--
2.9.3
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH net-next] openvswitch: Free tmpl with tmpl_free.
2016-09-02 1:01 [PATCH net-next] openvswitch: Free tmpl with tmpl_free Joe Stringer
@ 2016-09-04 18:38 ` David Miller
0 siblings, 0 replies; 2+ messages in thread
From: David Miller @ 2016-09-04 18:38 UTC (permalink / raw)
To: joe; +Cc: netdev, jesse
From: Joe Stringer <joe@ovn.org>
Date: Thu, 1 Sep 2016 18:01:47 -0700
> 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>
Applied, thanks.
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2016-09-04 18:38 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-09-02 1:01 [PATCH net-next] openvswitch: Free tmpl with tmpl_free Joe Stringer
2016-09-04 18:38 ` David Miller
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).