From: Justin Pettit <jpettit@nicira.com>
Date: Wed, 9 Nov 2011 01:31:04 +0000 (-0800)
Subject: ofproto-dpif: Actually disable STP on port when disabling STP on port.
X-Git-Tag: v1.3.0~26
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=5f7bc817bb74992687075050ec6b6daf32e184b4;p=sliver-openvswitch.git

ofproto-dpif: Actually disable STP on port when disabling STP on port.

When disabling STP on a port that has it enabled on the bridge, STP was
not actually being disabled on the port.  This commit directly calls the
update function in this situation.

Reported-by: Paul Ingram <paul@nicira.com>
---

diff --git a/ofproto/ofproto-dpif.c b/ofproto/ofproto-dpif.c
index b53452d14..24d86764c 100644
--- a/ofproto/ofproto-dpif.c
+++ b/ofproto/ofproto-dpif.c
@@ -1070,6 +1070,7 @@ set_stp_port(struct ofport *ofport_,
         if (sp) {
             ofport->stp_port = NULL;
             stp_port_disable(sp);
+            update_stp_port_state(ofport);
         }
         return 0;
     } else if (sp && stp_port_no(sp) != s->port_num