projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'gpio-v4.9-1' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux...
[cascardo/linux.git]
/
net
/
openvswitch
/
conntrack.c
diff --git
a/net/openvswitch/conntrack.c
b/net/openvswitch/conntrack.c
index
e054a74
..
31045ef
100644
(file)
--- 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)