[Bridge] Patch for RSTP Bridge Detection State Machine

[Matthew_Plummer at selinc.com]

In rstplib/edge.c the IEEE 802.1D Standard requires verifying sendRSTP and
proposing when transitioning to an edge port.

rstplib/edge.c
@@ -61,7 +61,7 @@ STP_edge_enter_state (STATE_MACH_T *s)
      break;
    case RESOLVED:
      if (! port->wasInitBpdu) {
-          port->operEdge = port->adminEdge;
+          port->operEdge = True;
      }
      break;
  }
@@ -91,7 +91,7 @@ STP_edge_check_conditions (STATE_MACH_T *s)
        return STP_hop_2_state (s, RESOLVED);
      }

-      if (! port->lnkWhile)  {
+      if ((!port->lnkWhile) && (port->proposing) && (port->sendRSTP))  {
#ifdef STP_DBG
        if (s->debug)
          stp_trace ("port %s 'edge' resolved by timer", port->port_name);
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.linuxfoundation.org/pipermail/bridge/attachments/20120305/4ea5c910/attachment.html>