git://git.onelab.eu
/
sliver-openvswitch.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'mainstream'
[sliver-openvswitch.git]
/
ofproto
/
ofproto-dpif-sflow.c
diff --git
a/ofproto/ofproto-dpif-sflow.c
b/ofproto/ofproto-dpif-sflow.c
index
b387b94
..
158887f
100644
(file)
--- a/
ofproto/ofproto-dpif-sflow.c
+++ b/
ofproto/ofproto-dpif-sflow.c
@@
-280,6
+280,7
@@
dpif_sflow_clear__(struct dpif_sflow *ds) OVS_REQUIRES(mutex)
{
if (ds->sflow_agent) {
sfl_agent_release(ds->sflow_agent);
{
if (ds->sflow_agent) {
sfl_agent_release(ds->sflow_agent);
+ free(ds->sflow_agent);
ds->sflow_agent = NULL;
}
collectors_destroy(ds->collectors);
ds->sflow_agent = NULL;
}
collectors_destroy(ds->collectors);
@@
-317,7
+318,7
@@
dpif_sflow_create(void)
struct dpif_sflow *ds;
if (ovsthread_once_start(&once)) {
struct dpif_sflow *ds;
if (ovsthread_once_start(&once)) {
- ovs_mutex_init
(&mutex, PTHREAD_MUTEX_RECURSIVE
);
+ ovs_mutex_init
_recursive(&mutex
);
ovsthread_once_done(&once);
}
ovsthread_once_done(&once);
}