diff options
| author | Ben Pfaff <blp@nicira.com> | 2011-03-29 10:08:16 -0700 |
|---|---|---|
| committer | Ben Pfaff <blp@nicira.com> | 2011-03-29 10:12:22 -0700 |
| commit | 595cf43e0127565e54c0f033f0f907a007ac2cae (patch) | |
| tree | ce6f277fbf8bbc57896a0cbc3a9a131dbf505f18 /vswitchd | |
| parent | b3d5b900a8c81020351151bab57fdc000a90827d (diff) | |
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.)
Diffstat (limited to 'vswitchd')
| -rw-r--r-- | vswitchd/bridge.c | 5 |
1 files changed, 0 insertions, 5 deletions
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); } |