aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEthan Jackson <ethan@nicira.com>2011-04-06 16:59:22 -0700
committerEthan Jackson <ethan@nicira.com>2011-04-07 09:34:18 -0700
commitc042664ff51c217c407899b889c10215ba9b3952 (patch)
treecf0d9a69a3dbe726e81d6cf445576a846ada64c2
parent1b5f560cf6ca83e4728d294ab5a871ca0777200d (diff)
bridge: Run once before configuring CFM.
CFM configuration requires the ofproto_run function to have been executed at least once in order to guarantee that the relevant ports exist. Bug #5303.
-rw-r--r--vswitchd/bridge.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/vswitchd/bridge.c b/vswitchd/bridge.c
index 001f9f68..c6966a62 100644
--- a/vswitchd/bridge.c
+++ b/vswitchd/bridge.c
@@ -914,8 +914,13 @@ bridge_reconfigure(const struct ovsrec_open_vswitch *ovs_cfg)
iterate_and_prune_ifaces(br, set_iface_properties, NULL);
}
+ /* Some reconfiguration operations require the bridge to have been run at
+ * least once. */
LIST_FOR_EACH (br, node, &all_bridges) {
struct iface *iface;
+
+ bridge_run_one(br);
+
HMAP_FOR_EACH (iface, dp_ifidx_node, &br->ifaces) {
iface_update_cfm(iface);
}