From owner-cvs-src@FreeBSD.ORG Thu Jan 19 04:22:25 2006 Return-Path: X-Original-To: cvs-src@FreeBSD.org Delivered-To: cvs-src@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id EF87F16A420; Thu, 19 Jan 2006 04:22:25 +0000 (GMT) (envelope-from thompsa@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9599443D46; Thu, 19 Jan 2006 04:22:25 +0000 (GMT) (envelope-from thompsa@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k0J4MPLW022344; Thu, 19 Jan 2006 04:22:25 GMT (envelope-from thompsa@repoman.freebsd.org) Received: (from thompsa@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k0J4MPch022343; Thu, 19 Jan 2006 04:22:25 GMT (envelope-from thompsa) Message-Id: <200601190422.k0J4MPch022343@repoman.freebsd.org> From: Andrew Thompson Date: Thu, 19 Jan 2006 04:22:25 +0000 (UTC) To: src-committers@FreeBSD.org, cvs-src@FreeBSD.org, cvs-all@FreeBSD.org X-FreeBSD-CVS-Branch: RELENG_5 Cc: Subject: cvs commit: src/share/man/man4 if_bridge.4 src/sys/net bridgestp.c if_bridge.c if_bridgevar.h X-BeenThere: cvs-src@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: CVS commit messages for the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 19 Jan 2006 04:22:26 -0000 thompsa 2006-01-19 04:22:25 UTC FreeBSD src repository Modified files: (Branch: RELENG_5) share/man/man4 if_bridge.4 sys/net bridgestp.c if_bridge.c if_bridgevar.h Log: MFC: sync code to HEAD (excluding etherip support) - whitespace - add net.link.bridge.pfil_onlyip - use time_uptime - clear IFCAP_TXCSUM while bridging Revision Changes Path 1.7.2.2 +17 -1 src/share/man/man4/if_bridge.4 1.6.2.3 +1 -1 src/sys/net/bridgestp.c 1.23.2.7 +111 -74 src/sys/net/if_bridge.c 1.4.4.4 +2 -1 src/sys/net/if_bridgevar.h