From owner-cvs-src@FreeBSD.ORG  Thu Mar  1 17:32:29 2007
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 [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 18C5216A404;
	Thu,  1 Mar 2007 17:32:29 +0000 (UTC)
	(envelope-from csjp@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41])
	by mx1.freebsd.org (Postfix) with ESMTP id E2BF713C4B3;
	Thu,  1 Mar 2007 17:32:28 +0000 (UTC)
	(envelope-from csjp@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 l21HWSUD038669;
	Thu, 1 Mar 2007 17:32:28 GMT (envelope-from csjp@repoman.freebsd.org)
Received: (from csjp@localhost)
	by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l21HWSmW038666;
	Thu, 1 Mar 2007 17:32:28 GMT (envelope-from csjp)
Message-Id: <200703011732.l21HWSmW038666@repoman.freebsd.org>
From: "Christian S.J. Peron" <csjp@FreeBSD.org>
Date: Thu, 1 Mar 2007 17:32:28 +0000 (UTC)
To: src-committers@FreeBSD.org, cvs-src@FreeBSD.org, cvs-all@FreeBSD.org
X-FreeBSD-CVS-Branch: RELENG_6
Cc: 
Subject: cvs commit: src/sys/dev/em if_em.c src/sys/net ethernet.h
 if_ethersubr.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: Thu, 01 Mar 2007 17:32:29 -0000

csjp        2007-03-01 17:32:28 UTC

  FreeBSD src repository

  Modified files:        (Branch: RELENG_6)
    sys/dev/em           if_em.c 
    sys/net              ethernet.h if_ethersubr.c 
  Log:
  MFC ether_vlan_mtap and modifications to em(4) which remove the
  promisc mode hack while vlan hardware tag processing is enabled.
  
  For all the details view the commitlog for the following files:
  
  sys/net/ethernet.h revision 1.26
  sys/net/if_ethersubr.c revision 1.220
  sys/dev/em/if_em.c revision 1.165
  
  Revision    Changes    Path
  1.65.2.22   +2 -63     src/sys/dev/em/if_em.c
  1.24.2.2    +14 -2     src/sys/net/ethernet.h
  1.193.2.13  +47 -1     src/sys/net/if_ethersubr.c