From owner-freebsd-current Thu Oct 25 9:16:48 2001 Delivered-To: freebsd-current@freebsd.org Received: from mout1.freenet.de (mout1.freenet.de [194.97.50.132]) by hub.freebsd.org (Postfix) with ESMTP id A8F2137B401; Thu, 25 Oct 2001 09:16:42 -0700 (PDT) Received: from [194.97.50.138] (helo=mx0.freenet.de) by mout1.freenet.de with esmtp (Exim 3.33 #1) id 15wnBN-0000PJ-00; Thu, 25 Oct 2001 18:16:37 +0200 Received: from ae145.pppool.de ([213.6.225.69] helo=Magelan.Leidinger.net) by mx0.freenet.de with esmtp (Exim 3.33 #3) id 15wnBM-0003al-00; Thu, 25 Oct 2001 18:16:36 +0200 Received: from Leidinger.net (netchild@localhost [127.0.0.1]) by Magelan.Leidinger.net (8.11.6/8.11.6) with ESMTP id f9PGIa601176; Thu, 25 Oct 2001 18:18:37 +0200 (CEST) (envelope-from netchild@Leidinger.net) Message-Id: <200110251618.f9PGIa601176@Magelan.Leidinger.net> Date: Thu, 25 Oct 2001 18:18:35 +0200 (CEST) From: Alexander Leidinger Subject: Fix (Re: panic: mutex i4b_isic_rx already initialized) To: current@FreeBSD.ORG Cc: hm@freebsd.org In-Reply-To: <200110211519.f9LFJUN01534@Magelan.Leidinger.net> MIME-Version: 1.0 Content-Type: MULTIPART/mixed; BOUNDARY="0-1804289383-1004026718=:1173" Content-Transfer-Encoding: BINARY Sender: owner-freebsd-current@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG --0-1804289383-1004026718=:1173 Content-Type: TEXT/plain; charset=us-ascii On 21 Okt, An: current@FreeBSD.ORG wrote: > Hi, > > current as of Oct. 21 (~12am CET), I just booted with a new kernel+world > and tried to dial out. At least the attached patch (against -current as of today morning) makes me able to dial out and send out this mail. Bye, Alexander. -- Actually, Microsoft is sort of a mixture between the Borg and the Ferengi. http://www.Leidinger.net Alexander @ Leidinger.net GPG fingerprint = C518 BC70 E67F 143F BE91 3365 79E2 9C60 B006 3FE7 --0-1804289383-1004026718=:1173 Content-Type: TEXT/plain; name="i4b.diff" Content-Disposition: attachment; filename="i4b.diff" Index: sys/i4b/layer1/isic/i4b_bchan.c =================================================================== RCS file: /big/FreeBSD-CVS/src/sys/i4b/layer1/isic/i4b_bchan.c,v retrieving revision 1.7 diff -u -r1.7 i4b_bchan.c --- sys/i4b/layer1/isic/i4b_bchan.c 24 Jan 2001 08:41:52 -0000 1.7 +++ sys/i4b/layer1/isic/i4b_bchan.c 25 Oct 2001 16:08:50 -0000 @@ -90,7 +90,8 @@ chan->rx_queue.ifq_maxlen = IFQ_MAXLEN; #if defined (__FreeBSD__) && __FreeBSD__ > 4 - mtx_init(&chan->rx_queue.ifq_mtx, "i4b_isic_rx", MTX_DEF); + if (!mtx_initialized(&chan->rx_queue.ifq_mtx)) + mtx_init(&chan->rx_queue.ifq_mtx, "i4b_isic_rx", MTX_DEF); #endif i4b_Bcleanifq(&chan->rx_queue); /* clean rx queue */ @@ -108,7 +109,8 @@ chan->tx_queue.ifq_maxlen = IFQ_MAXLEN; #if defined (__FreeBSD__) && __FreeBSD__ > 4 - mtx_init(&chan->tx_queue.ifq_mtx, "i4b_isic_tx", MTX_DEF); + if (!mtx_initialized(&chan->tx_queue.ifq_mtx)) + mtx_init(&chan->tx_queue.ifq_mtx, "i4b_isic_tx", MTX_DEF); #endif i4b_Bcleanifq(&chan->tx_queue); /* clean tx queue */ --0-1804289383-1004026718=:1173-- To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-current" in the body of the message