From owner-cvs-src@FreeBSD.ORG  Thu Apr 22 00:08:39 2004
Return-Path: <owner-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 C7FE716A4CE; Thu, 22 Apr 2004 00:08:39 -0700 (PDT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP
	id C295543D58; Thu, 22 Apr 2004 00:08:39 -0700 (PDT)
	(envelope-from wpaul@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i3M78dGe016505;
	Thu, 22 Apr 2004 00:08:39 -0700 (PDT)
	(envelope-from wpaul@repoman.freebsd.org)
Received: (from wpaul@localhost)
	by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i3M78d1Q016504;
	Thu, 22 Apr 2004 00:08:39 -0700 (PDT)
	(envelope-from wpaul)
Message-Id: <200404220708.i3M78d1Q016504@repoman.freebsd.org>
From: Bill Paul <wpaul@FreeBSD.org>
Date: Thu, 22 Apr 2004 00:08:39 -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/compat/ndis kern_ndis.c src/sys/dev/if_ndis
 if_ndis.c
X-BeenThere: cvs-src@freebsd.org
X-Mailman-Version: 2.1.1
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, 22 Apr 2004 07:08:39 -0000

wpaul       2004/04/22 00:08:39 PDT

  FreeBSD src repository

  Modified files:
    sys/compat/ndis      kern_ndis.c 
    sys/dev/if_ndis      if_ndis.c 
  Log:
  Ok, _really_ fix the Intel 2100B Centrino deadlock problems this time.
  (I hope.)
  
  My original instinct to make ndis_return_packet() asynchronous was correct.
  Making ndis_rxeof() submit packets to the stack asynchronously fixes
  one recursive spinlock acquisition, but it's also possible for it to
  happen via the ndis_txeof() path too. So:
  
  - In if_ndis.c, revert ndis_rxeof() to its old behavior (and don't bother
    putting ndis_rxeof_serial() back since we don't need it anymore).
  
  - In kern_ndis.c, make ndis_return_packet() submit the call to the
    MiniportReturnPacket() function to the "ndis swi" thread so that
    it always happens in another context no matter who calls it.
  
  Revision  Changes    Path
  1.53      +27 -12    src/sys/compat/ndis/kern_ndis.c
  1.55      +3 -29     src/sys/dev/if_ndis/if_ndis.c