From: Ethan Jackson <ethan@nicira.com>
Date: Wed, 6 Apr 2011 23:59:22 +0000 (-0700)
Subject: bridge: Run once before configuring CFM.
X-Git-Tag: v1.2.0~479
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=392730c42bbd5abe30e7c2d1fcffb136a29334e0;p=sliver-openvswitch.git

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.
---

diff --git a/vswitchd/bridge.c b/vswitchd/bridge.c
index 07daacdb6..21b0247c4 100644
--- a/vswitchd/bridge.c
+++ b/vswitchd/bridge.c
@@ -855,8 +855,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);
         }