From owner-cvs-all@FreeBSD.ORG  Mon Apr 10 18:29:31 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 8398F16A400;
	Mon, 10 Apr 2006 18:29:31 +0000 (UTC)
	(envelope-from mlaier@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 3D65543D45;
	Mon, 10 Apr 2006 18:29:31 +0000 (GMT)
	(envelope-from mlaier@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k3AITVqH019093;
	Mon, 10 Apr 2006 18:29:31 GMT
	(envelope-from mlaier@repoman.freebsd.org)
Received: (from mlaier@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k3AITVcS019092;
	Mon, 10 Apr 2006 18:29:31 GMT (envelope-from mlaier)
Message-Id: <200604101829.k3AITVcS019092@repoman.freebsd.org>
From: Max Laier <mlaier@FreeBSD.org>
Date: Mon, 10 Apr 2006 18:29:31 +0000 (UTC)
To: src-committers@FreeBSD.org, cvs-src@FreeBSD.org, cvs-all@FreeBSD.org
X-FreeBSD-CVS-Branch: RELENG_6_1
Cc: 
Subject: cvs commit: src/sys/dev/ipw if_ipw.c if_ipwvar.h
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: Mon, 10 Apr 2006 18:29:31 -0000

mlaier      2006-04-10 18:29:31 UTC

  FreeBSD src repository

  Modified files:        (Branch: RELENG_6_1)
    sys/dev/ipw          if_ipw.c if_ipwvar.h 
  Log:
  MFR6:
    Stopgap fix to avoid "mutex ipw0 recursed" panics in msleep for recursive
    ioctl paths.  Instead of using a recursive mutex we use conditional
    locking and keep track of the recursion on the stack.
  
    Reported and tested by:       Ulrich Spoerlein
  
  Approved by:    re (scottl)
  
  Revision     Changes    Path
  1.7.2.4.2.1  +8 -1      src/sys/dev/ipw/if_ipw.c
  1.3.6.1      +9 -2      src/sys/dev/ipw/if_ipwvar.h