From owner-cvs-all@FreeBSD.ORG  Mon Dec  4 14:45:03 2006
Return-Path: <owner-cvs-all@FreeBSD.ORG>
X-Original-To: cvs-all@FreeBSD.org
Delivered-To: cvs-all@FreeBSD.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id AE47216A412;
	Mon,  4 Dec 2006 14:45:03 +0000 (UTC)
	(envelope-from syrinx@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 4E2FE43C9D;
	Mon,  4 Dec 2006 14:44:30 +0000 (GMT)
	(envelope-from syrinx@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kB4Ej3pw036127;
	Mon, 4 Dec 2006 14:45:03 GMT
	(envelope-from syrinx@repoman.freebsd.org)
Received: (from syrinx@localhost)
	by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kB4Ej3bK036126;
	Mon, 4 Dec 2006 14:45:03 GMT (envelope-from syrinx)
Message-Id: <200612041445.kB4Ej3bK036126@repoman.freebsd.org>
From: Shteryana Shopova <syrinx@FreeBSD.org>
Date: Mon, 4 Dec 2006 14:45:03 +0000 (UTC)
To: src-committers@FreeBSD.org, cvs-src@FreeBSD.org, cvs-all@FreeBSD.org
X-FreeBSD-CVS-Branch: HEAD
Cc: 
Subject: cvs commit: src/sys/net bridgestp.c bridgestp.h if_bridge.c
 if_bridgevar.h
X-BeenThere: cvs-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: CVS commit messages for the entire tree <cvs-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-all>,
	<mailto:cvs-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/cvs-all>
List-Post: <mailto:cvs-all@freebsd.org>
List-Help: <mailto:cvs-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-all>,
	<mailto:cvs-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 04 Dec 2006 14:45:03 -0000

syrinx      2006-12-04 14:45:03 UTC

  FreeBSD src repository

  Modified files:
    sys/net              bridgestp.c bridgestp.h if_bridge.c 
                         if_bridgevar.h 
  Log:
  Add two new flags to if_bridge(4) indicating whether the edge flag
  of the bridge port and path cost have been administratively set or
  calculated automatically by RSTP.
  
  Make sure to transition from non-edge to edge when the port goes down
  and the edge flag was manually set before.
  This is needed to comply with the condition
          ((!portEnabled && AdminEdge) || ....)
  in the Bridge Detection State Machine (IEE802.1D-2004, p. 171).
  
  Reviewed by:    thompsa
  Approved by:    bz (mentor)
  
  Revision  Changes    Path
  1.32      +9 -2      src/sys/net/bridgestp.c
  1.11      +1 -0      src/sys/net/bridgestp.h
  1.91      +4 -0      src/sys/net/if_bridge.c
  1.19      +4 -1      src/sys/net/if_bridgevar.h