From: Ethan Jackson <ethan@nicira.com>
Date: Wed, 29 Aug 2012 23:00:31 +0000 (-0700)
Subject: vswitchd: Respect other_config:stp-enable port setting.
X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=079b5942276a04b2b18f1ec5bd2e07170e3ab9bd;p=openvswitch

vswitchd: Respect other_config:stp-enable port setting.

Commit a699f614 (lib: Utilize smaps in the idl.) broke the
other_config:stp-enable port setting in two ways.  First, it
changed the default if the setting was missing to disabled.
Second, if the setting was present, it did the opposite of what the
user configured.

Bug #13122.
Reported-by: Paul Ingram <paul@nicira.com>
Signed-off-by: Ethan Jackson <ethan@nicira.com>
---

diff --git a/vswitchd/bridge.c b/vswitchd/bridge.c
index 02257397..53bb7b90 100644
--- a/vswitchd/bridge.c
+++ b/vswitchd/bridge.c
@@ -885,7 +885,7 @@ port_configure_stp(const struct ofproto *ofproto, struct port *port,
     const char *config_str;
     struct iface *iface;
 
-    if (smap_get_bool(&port->cfg->other_config, "stp-enable", false)) {
+    if (!smap_get_bool(&port->cfg->other_config, "stp-enable", true)) {
         port_s->enable = false;
         return;
     } else {