From owner-cvs-all@FreeBSD.ORG  Tue Oct 14 22:34:42 2003
Return-Path: <owner-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 DE66A16A4BF; Tue, 14 Oct 2003 22:34:42 -0700 (PDT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP
	id 0C5A943FD7; Tue, 14 Oct 2003 22:34:42 -0700 (PDT)
	(envelope-from deischen@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.9/8.12.9) with ESMTP id h9F5YfXJ031993;
	Tue, 14 Oct 2003 22:34:41 -0700 (PDT)
	(envelope-from deischen@repoman.freebsd.org)
Received: (from deischen@localhost)
	by repoman.freebsd.org (8.12.9/8.12.9/Submit) id h9F5YfTc031992;
	Tue, 14 Oct 2003 22:34:41 -0700 (PDT)
	(envelope-from deischen)
Message-Id: <200310150534.h9F5YfTc031992@repoman.freebsd.org>
From: Daniel Eischen <deischen@FreeBSD.org>
Date: Tue, 14 Oct 2003 22:34:41 -0700 (PDT)
To: src-committers@FreeBSD.org, cvs-src@FreeBSD.org,
	cvs-all@FreeBSD.org
X-FreeBSD-CVS-Branch: HEAD
Subject: cvs commit: src/sys/dev/em if_em.c
X-BeenThere: cvs-all@freebsd.org
X-Mailman-Version: 2.1.1
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: Wed, 15 Oct 2003 05:34:43 -0000

deischen    2003/10/14 22:34:41 PDT

  FreeBSD src repository

  Modified files:
    sys/dev/em           if_em.c 
  Log:
  Add a wrapper for a function that takes and releases the adapter
  lock around a call to the original function.  Make the timeout
  function in callout_reset() use the wrapped function to avoid a
  lock assertion panic.
  
  Reviewed by:    sam
  Reported by:    cgiordano@ids.net
  
  Revision  Changes    Path
  1.32      +13 -3     src/sys/dev/em/if_em.c