projects
/
openvswitch
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
sflow: Always add poller and sampler together.
[openvswitch]
/
vswitchd
/
ovs-brcompatd.c
diff --git
a/vswitchd/ovs-brcompatd.c
b/vswitchd/ovs-brcompatd.c
index b5037056e41ac28cc452b1ff27c8e763fb937f8e..29503015b774e1324a625979e490bc3ae47329f5 100644
(file)
--- a/
vswitchd/ovs-brcompatd.c
+++ b/
vswitchd/ovs-brcompatd.c
@@
-661,8
+661,8
@@
del_bridge(struct ovsdb_idl *idl,
if (br->sflow) {
ovsrec_sflow_delete(br->sflow);
}
if (br->sflow) {
ovsrec_sflow_delete(br->sflow);
}
-
if (br->controller
) {
- ovsrec_controller_delete(br->controller);
+
for (i = 0; i < br->n_controller; i++
) {
+ ovsrec_controller_delete(br->controller
[i]
);
}
/* Remove 'br' from the vswitch's list of bridges. */
}
/* Remove 'br' from the vswitch's list of bridges. */