From owner-cvs-all@FreeBSD.ORG  Fri Sep 29 21:38:14 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 [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id B085316A547;
	Fri, 29 Sep 2006 21:38:14 +0000 (UTC)
	(envelope-from andre@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 4326343D55;
	Fri, 29 Sep 2006 21:38:13 +0000 (GMT)
	(envelope-from andre@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 k8TLcDBc056184;
	Fri, 29 Sep 2006 21:38:13 GMT
	(envelope-from andre@repoman.freebsd.org)
Received: (from andre@localhost)
	by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k8TLcDqP056183;
	Fri, 29 Sep 2006 21:38:13 GMT (envelope-from andre)
Message-Id: <200609292138.k8TLcDqP056183@repoman.freebsd.org>
From: Andre Oppermann <andre@FreeBSD.org>
Date: Fri, 29 Sep 2006 21:38:13 +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/dev/em if_em.c
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: Fri, 29 Sep 2006 21:38:14 -0000

andre       2006-09-29 21:38:13 UTC

  FreeBSD src repository

  Modified files:
    sys/dev/em           if_em.c 
  Log:
  Back out rev. 1.152 as it was breaking vlan tag insertion when vlan tag
  stripping was disabled due to being in promisc mode.  This is a hardware
  bug.  Update comment to explicitly state the reason the manual vlan tag
  insertion in this case.  See rev. 1.53 for further information as well.
  
  Noticed by:     jhb
  
  Revision  Changes    Path
  1.154     +39 -0     src/sys/dev/em/if_em.c