daemon: Throttle max respawning rate.

[openvswitch] / vswitchd / ovs-brcompatd.c

diff --git a/vswitchd/ovs-brcompatd.c b/vswitchd/ovs-brcompatd.c
index 45ded7b8f76a6e71e383865b008a599e169dba71..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->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. */
@@ -817,7 +817,7 @@ handle_port_cmd(struct ovsdb_idl *idl,
                         ovsdb_idl_txn_add_comment(txn,
                                                   "ovs-brcompatd: del-if %s",
                                                   port_name);
-                        del_port(br, port_name);
+                        del_port(br, port);
                     }
                 }