From 718bcce0b85e457169a4d1ab45e8afe3146d2dd4 Mon Sep 17 00:00:00 2001 From: Ethan Jackson Date: Sun, 19 Feb 2012 00:34:28 -0800 Subject: [PATCH] ofproto-dpif: Cleanup STP on ports when disabled on their bridge. When STP is enabled on a bridge, the STP module puts its ports in an STP_LISTENING state until STP converges. This causes all traffic destined for these ports to be dropped. If STP is disabled on the bridge, but not explicitly disabled on its ports, the bridge fails to remove the STP state from these ports. Therefore, if a port is in an STP_LISTENING state, it will remain in that state and continue to drop all traffic indefinitely. This patch fixes the issue. Signed-off-by: Ethan Jackson Bug #9157. --- ofproto/ofproto-dpif.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/ofproto/ofproto-dpif.c b/ofproto/ofproto-dpif.c index ae3c12eba..ab6e901e0 100644 --- a/ofproto/ofproto-dpif.c +++ b/ofproto/ofproto-dpif.c @@ -191,6 +191,8 @@ static struct ofbundle ofpp_none_bundle = { static void stp_run(struct ofproto_dpif *ofproto); static void stp_wait(struct ofproto_dpif *ofproto); +static int set_stp_port(struct ofport *, + const struct ofproto_port_stp_settings *); static bool ofbundle_includes_vlan(const struct ofbundle *, uint16_t vlan); @@ -1136,6 +1138,12 @@ set_stp(struct ofproto *ofproto_, const struct ofproto_stp_settings *s) stp_set_max_age(ofproto->stp, s->max_age); stp_set_forward_delay(ofproto->stp, s->fwd_delay); } else { + struct ofport *ofport; + + HMAP_FOR_EACH (ofport, hmap_node, &ofproto->up.ports) { + set_stp_port(ofport, NULL); + } + stp_destroy(ofproto->stp); ofproto->stp = NULL; } -- 2.43.0