From owner-p4-projects@FreeBSD.ORG  Fri Aug  1 14:19:28 2003
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id D8BE037B408; Fri,  1 Aug 2003 14:19:27 -0700 (PDT)
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 6E97C37B414
	for <perforce@freebsd.org>; Fri,  1 Aug 2003 14:19:27 -0700 (PDT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id F11B543F3F
	for <perforce@freebsd.org>; Fri,  1 Aug 2003 14:19:26 -0700 (PDT)
	(envelope-from sam@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h71LJQ0U024970
	for <perforce@freebsd.org>; Fri, 1 Aug 2003 14:19:26 -0700 (PDT)
	(envelope-from sam@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h71LJQnj024967
	for perforce@freebsd.org; Fri, 1 Aug 2003 14:19:26 -0700 (PDT)
Date: Fri, 1 Aug 2003 14:19:26 -0700 (PDT)
Message-Id: <200308012119.h71LJQnj024967@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	sam@freebsd.org using -f
From: Sam Leffler <sam@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Subject: PERFORCE change 35361 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.1
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 01 Aug 2003 21:19:28 -0000

http://perforce.freebsd.org/chv.cgi?CH=35361

Change 35361 by sam@sam_ebb on 2003/08/01 14:19:06

	release+acquire the driver lock around if_input to avoid
	deadlock on re-entry (to be fixed with the other drivers
	in a separate pass)

Affected files ...

.. //depot/projects/netperf/sys/pci/if_sis.c#3 edit

Differences ...

==== //depot/projects/netperf/sys/pci/if_sis.c#3 (text+ko) ====

@@ -1650,7 +1650,9 @@
 		ifp->if_ipackets++;
 		m->m_pkthdr.rcvif = ifp;
 
+		SIS_UNLOCK(sc);
 		(*ifp->if_input)(ifp, m);
+		SIS_LOCK(sc);
 	}
 
 	sc->sis_cdata.sis_rx_prod = i;