From owner-cvs-src@FreeBSD.ORG  Wed Jun 29 19:23:32 2005
Return-Path: <owner-cvs-src@FreeBSD.ORG>
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 6E20316A41C;
	Wed, 29 Jun 2005 19:23:32 +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 4783243D49;
	Wed, 29 Jun 2005 19:23:32 +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 j5TJNWqr033149;
	Wed, 29 Jun 2005 19:23:32 GMT
	(envelope-from thompsa@repoman.freebsd.org)
Received: (from thompsa@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j5TJNW33033148;
	Wed, 29 Jun 2005 19:23:32 GMT (envelope-from thompsa)
Message-Id: <200506291923.j5TJNW33033148@repoman.freebsd.org>
From: Andrew Thompson <thompsa@FreeBSD.org>
Date: Wed, 29 Jun 2005 19:23:32 +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 if_bridge.c
X-BeenThere: cvs-src@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: CVS commit messages for the src tree <cvs-src.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-src>,
	<mailto:cvs-src-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/cvs-src>
List-Post: <mailto:cvs-src@freebsd.org>
List-Help: <mailto:cvs-src-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-src>,
	<mailto:cvs-src-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 29 Jun 2005 19:23:32 -0000

thompsa     2005-06-29 19:23:32 UTC

  FreeBSD src repository

  Modified files:
    sys/net              if_bridge.c 
  Log:
  Sync if_bridge to NetBSD r1.31
  
  Rename conflicting variables when handling SNAP Ethernet frames.
  
  Obtained from:  NetBSD
  Approved by:    mlaier (mentor)
  Approved by:    re (blanket)
  
  Revision  Changes    Path
  1.9       +9 -9      src/sys/net/if_bridge.c