From owner-cvs-src@FreeBSD.ORG  Wed May 21 21:34:06 2008
Return-Path: <owner-cvs-src@FreeBSD.ORG>
Delivered-To: cvs-src@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 527EF10656B2;
	Wed, 21 May 2008 21:34:06 +0000 (UTC) (envelope-from jfv@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 2B0968FC1D;
	Wed, 21 May 2008 21:34:06 +0000 (UTC) (envelope-from jfv@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m4LLY6pm031845;
	Wed, 21 May 2008 21:34:06 GMT (envelope-from jfv@repoman.freebsd.org)
Received: (from jfv@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m4LLY65a031844;
	Wed, 21 May 2008 21:34:06 GMT (envelope-from jfv)
Message-Id: <200805212134.m4LLY65a031844@repoman.freebsd.org>
From: Jack F Vogel <jfv@FreeBSD.org>
Date: Wed, 21 May 2008 21:34:05 +0000 (UTC)
To: src-committers@FreeBSD.org, cvs-src@FreeBSD.org, cvs-all@FreeBSD.org
X-FreeBSD-CVS-Branch: RELENG_7
Cc: 
Subject: cvs commit: src/sys/dev/em if_em.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, 21 May 2008 21:34:06 -0000

jfv         2008-05-21 21:34:05 UTC

  FreeBSD src repository

  Modified files:        (Branch: RELENG_7)
    sys/dev/em           if_em.c 
  Log:
  Primary a delta to pick up the missing UNLOCK in the watchdog
  code, this can cause a panic due to a recusion on the TX Lock.
  Also sync up other changes in HEAD, all trivial, added PCI ID
  and #ifdef's to make the driver compile on 6.3.
  
  Revision   Changes    Path
  1.184.2.3  +26 -2     src/sys/dev/em/if_em.c