Revert "openvswitch: Fix template leak in error cases."
authorFlavio Leitner <fbl@redhat.com>
Fri, 28 Sep 2018 17:55:34 +0000 (14:55 -0300)
committerDavid S. Miller <davem@davemloft.net>
Tue, 2 Oct 2018 06:20:13 +0000 (23:20 -0700)
commit7f6d6558ae44bc193eb28df3617c364d3bb6df39
treefcac3e43c9e2cb403ab9b9c1ec722430ae764178
parent92d7c74b6f72a8a7d04970d5dcfb99673daaf91d
Revert "openvswitch: Fix template leak in error cases."

This reverts commit 90c7afc96cbbd77f44094b5b651261968e97de67.

When the commit was merged, the code used nf_ct_put() to free
the entry, but later on commit 76644232e612 ("openvswitch: Free
tmpl with tmpl_free.") replaced that with nf_ct_tmpl_free which
is a more appropriate. Now the original problem is removed.

Then 44d6e2f27328 ("net: Replace NF_CT_ASSERT() with WARN_ON().")
replaced a debug assert with a WARN_ON() which is trigged now.

Signed-off-by: Flavio Leitner <fbl@redhat.com>
Acked-by: Joe Stringer <joe@ovn.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
net/openvswitch/conntrack.c