From owner-cvs-all@FreeBSD.ORG Mon Nov 15 21:40:09 2004 Return-Path: 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 57A0516A4CE; Mon, 15 Nov 2004 21:40:09 +0000 (GMT) Received: from transport.cksoft.de (transport.cksoft.de [62.111.66.27]) by mx1.FreeBSD.org (Postfix) with ESMTP id DFA8B43D49; Mon, 15 Nov 2004 21:40:08 +0000 (GMT) (envelope-from bzeeb-lists@lists.zabbadoz.net) Received: from transport.cksoft.de (localhost [127.0.0.1]) by transport.cksoft.de (Postfix) with ESMTP id 431141FF931; Mon, 15 Nov 2004 22:40:07 +0100 (CET) Received: by transport.cksoft.de (Postfix, from userid 66) id 56CDB1FF92F; Mon, 15 Nov 2004 22:40:05 +0100 (CET) Received: by mail.int.zabbadoz.net (Postfix, from userid 1060) id 99E91155DD; Mon, 15 Nov 2004 21:37:32 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.int.zabbadoz.net (Postfix) with ESMTP id 8EE8E154FC; Mon, 15 Nov 2004 21:37:33 +0000 (UTC) Date: Mon, 15 Nov 2004 21:37:33 +0000 (UTC) From: "Bjoern A. Zeeb" X-X-Sender: bz@e0-0.zab2.int.zabbadoz.net To: John-Mark Gurney In-Reply-To: <200411151937.iAFJbLak002480@repoman.freebsd.org> Message-ID: References: <200411151937.iAFJbLak002480@repoman.freebsd.org> MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII X-Virus-Scanned: by AMaViS cksoft-s20020300-20031204bz on transport.cksoft.de cc: cvs-src@FreeBSD.org cc: src-committers@FreeBSD.org cc: cvs-all@FreeBSD.org Subject: Re: cvs commit: src/sys/pci if_sk.c if_skreg.h X-BeenThere: cvs-all@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: CVS commit messages for the entire tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 15 Nov 2004 21:40:09 -0000 On Mon, 15 Nov 2004, John-Mark Gurney wrote: > jmg 2004-11-15 19:37:21 UTC > > FreeBSD src repository > > Modified files: > sys/pci if_sk.c if_skreg.h > Log: > fix the missing lock in sk_jfree (verified w/ an assert) > also fix up handling and proding of the tx, _OACTIVE is now handled > better... > > Submitted by: Peter Edwards (sk_jfree) > Obtained from: OpenBSD and/or NetBSD (tx prod) This seems to be different from the version in http://lists.freebsd.org/pipermail/freebsd-current/2004-November/042195.html I had reports of people running into the panic in sk_jfree with the patch from this link. Thanks. *hmm* > @@ -1104,6 +1106,7 @@ sk_jfree(buf, args) > > /* Extract the softc struct pointer. */ > sc_if = (struct sk_if_softc *)args; > + SK_IF_LOCK(sc_if); > > if (sc_if == NULL) > panic("sk_jfree: didn't get softc pointer!"); mind moving the SK_IF_LOCK down behind the NULL/panic check ? -- Bjoern A. Zeeb bzeeb at Zabbadoz dot NeT