From owner-cvs-src@FreeBSD.ORG Wed Jun 13 20:54:19 2007 Return-Path: X-Original-To: cvs-src@FreeBSD.org Delivered-To: cvs-src@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 5131716A468; Wed, 13 Jun 2007 20:54:19 +0000 (UTC) (envelope-from thompsa@FreeBSD.org) Received: from heff.fud.org.nz (203-109-251-39.static.bliink.ihug.co.nz [203.109.251.39]) by mx1.freebsd.org (Postfix) with ESMTP id E3FCA13C46C; Wed, 13 Jun 2007 20:54:18 +0000 (UTC) (envelope-from thompsa@FreeBSD.org) Received: by heff.fud.org.nz (Postfix, from userid 1001) id 8634F1CC58; Thu, 14 Jun 2007 08:54:17 +1200 (NZST) Date: Thu, 14 Jun 2007 08:54:17 +1200 From: Andrew Thompson To: "Bruce M. Simpson" Message-ID: <20070613205417.GA11671@heff.fud.org.nz> References: <200706131858.l5DIw4Yr009448@repoman.freebsd.org> <4670464C.8060304@FreeBSD.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <4670464C.8060304@FreeBSD.org> User-Agent: Mutt/1.5.13 (2006-08-11) Cc: cvs-src@FreeBSD.org, src-committers@FreeBSD.org, cvs-all@FreeBSD.org Subject: Re: cvs commit: src/sys/net if_bridge.c if_bridgevar.h src/sbin/ifconfig ifbridge.c 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: Wed, 13 Jun 2007 20:54:19 -0000 On Wed, Jun 13, 2007 at 08:32:28PM +0100, Bruce M. Simpson wrote: > Andrew Thompson wrote: > > Log: > > Add the vlan tag to the bridge route table. This allows a vlan trunk to > > be > > bridged, previously legitimate traffic was not passed as the bridge > > could not > > tell that it was on a different Ethernet segment. > > > > Very cool. Thanks for doing this. Your vtag changes made this very easy. > > > > All non-tagged traffic is treated as vlan1 as per IEEE 802.1Q-2003 > > > Grrr. Made me look. ;-) > > I had confused this with the definition of untagged frame/priority > frame. The ethernet input path now does the right thing with VLAN ID 0, > so it should play fine with this change. I have priority frames mapped to vlan1 in bridge_rtupdate, as far as I can tell this is correct. 2325: bridge_rtupdate(...) 2334: /* 802.1p frames map to vlan 1 */ 2335: if (vlan == 0) 2336: vlan = 1; Andrew