From owner-cvs-all@FreeBSD.ORG  Mon Nov 27 00:35:53 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 B0E0F16A492;
	Mon, 27 Nov 2006 00:35:53 +0000 (UTC)
	(envelope-from thompsa@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41])
	by mx1.FreeBSD.org (Postfix) with ESMTP id BAE5F43D5E;
	Mon, 27 Nov 2006 00:34:44 +0000 (GMT)
	(envelope-from thompsa@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 kAR0Zfgc087229;
	Mon, 27 Nov 2006 00:35:41 GMT
	(envelope-from thompsa@repoman.freebsd.org)
Received: (from thompsa@localhost)
	by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kAR0Zf6f087228;
	Mon, 27 Nov 2006 00:35:41 GMT (envelope-from thompsa)
Message-Id: <200611270035.kAR0Zf6f087228@repoman.freebsd.org>
From: Andrew Thompson <thompsa@FreeBSD.org>
Date: Mon, 27 Nov 2006 00:35:41 +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/sbin/ifconfig ifbridge.c 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, 27 Nov 2006 00:35:53 -0000

thompsa     2006-11-27 00:35:41 UTC

  FreeBSD src repository

  Modified files:
    sbin/ifconfig        ifbridge.c 
    sys/net              bridgestp.c bridgestp.h if_bridge.c 
                         if_bridgevar.h 
  Log:
  Sync with the OpenBSD port of RSTP
   - use flags rather than sperate ioctls for edge, p2p
   - implement p2p and autop2p flags
   - define large pathcost constant as ULL
   - show bridgeid and rootid in ifconfig
  
  Obtained from:  Reyk Floeter <reyk@openbsd.org>
  
  Revision  Changes    Path
  1.6       +53 -39    src/sbin/ifconfig/ifbridge.c
  1.31      +33 -3     src/sys/net/bridgestp.c
  1.8       +3 -0      src/sys/net/bridgestp.h
  1.89      +26 -51    src/sys/net/if_bridge.c
  1.18      +16 -12    src/sys/net/if_bridgevar.h