From: Ben Pfaff <blp@nicira.com>
Date: Tue, 29 Mar 2011 17:08:16 +0000 (-0700)
Subject: bridge: Always wait for MAC learning table and ports.
X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=595cf43e0127565e54c0f033f0f907a007ac2cae;p=openvswitch

bridge: Always wait for MAC learning table and ports.

The test ofproto_has_primary_controller() is meaningless, since OFPP_NORMAL
can cause the MAC learning table and port bonding to be in use even when
there is a controller.

I see that this bug has been here since early 2009, when the OFPP_NORMAL
feature was introduced in the bridge.  (Obviously it's not a severe
problem.)
---

diff --git a/vswitchd/bridge.c b/vswitchd/bridge.c
index 9660aef9..bf89778c 100644
--- a/vswitchd/bridge.c
+++ b/vswitchd/bridge.c
@@ -1464,12 +1464,7 @@ bridge_wait(void)
         struct port *port;
 
         ofproto_wait(br->ofproto);
-        if (ofproto_has_primary_controller(br->ofproto)) {
-            continue;
-        }
-
         mac_learning_wait(br->ml);
-
         HMAP_FOR_EACH (port, hmap_node, &br->ports) {
             port_wait(port);
         }