diff options
| -rw-r--r-- | AUTHORS | 1 | ||||
| -rw-r--r-- | vswitchd/bridge.c | 8 |
2 files changed, 7 insertions, 2 deletions
@@ -81,6 +81,7 @@ Gregor Schaffrath grsch@net.t-labs.tu-berlin.de Hassan Khan hassan.khan@seecs.edu.pk Hector Oron hector.oron@gmail.com Henrik Amren henrik@nicira.com +Hiroshi Tanaka htanaka@nicira.com Jad Naous jnaous@gmail.com Jan Medved jmedved@juniper.net Janis Hamme janis.hamme@student.kit.edu diff --git a/vswitchd/bridge.c b/vswitchd/bridge.c index b504b85b..5e2ad697 100644 --- a/vswitchd/bridge.c +++ b/vswitchd/bridge.c @@ -432,8 +432,12 @@ bridge_reconfigure(const struct ovsrec_open_vswitch *ovs_cfg) * has at least one iface, every "struct iface" has a valid ofp_port and * netdev. */ HMAP_FOR_EACH_SAFE (br, next, node, &all_bridges) { - if (!br->ofproto && !bridge_add_ofprotos(br)) { - bridge_destroy(br); + if (!br->ofproto) { + if (bridge_add_ofprotos(br)) { + bridge_del_ofproto_ports(br); + } else { + bridge_destroy(br); + } } } HMAP_FOR_EACH (br, node, &all_bridges) { |