From owner-p4-projects@FreeBSD.ORG  Wed Jul 23 08:59:47 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 076031065670; Wed, 23 Jul 2008 08:59:47 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 8F9BA106567D
	for <perforce@FreeBSD.org>; Wed, 23 Jul 2008 08:59:46 +0000 (UTC)
	(envelope-from weongyo@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 8F0BE8FC1D
	for <perforce@FreeBSD.org>; Wed, 23 Jul 2008 08:59:46 +0000 (UTC)
	(envelope-from weongyo@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m6N8xjFh056316
	for <perforce@FreeBSD.org>; Wed, 23 Jul 2008 08:59:45 GMT
	(envelope-from weongyo@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m6N8xjO4056314
	for perforce@freebsd.org; Wed, 23 Jul 2008 08:59:45 GMT
	(envelope-from weongyo@FreeBSD.org)
Date: Wed, 23 Jul 2008 08:59:45 GMT
Message-Id: <200807230859.m6N8xjO4056314@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	weongyo@FreeBSD.org using -f
From: Weongyo Jeong <weongyo@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Cc: 
Subject: PERFORCE change 145686 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
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: Wed, 23 Jul 2008 08:59:47 -0000

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

Change 145686 by weongyo@weongyo_ws on 2008/07/23 08:59:10

	handle a event properly to avoid blocking forever if ndis try to reset
	NIC.

Affected files ...

.. //depot/projects/ndisusb/sys/compat/ndis/kern_ndis.c#5 edit

Differences ...

==== //depot/projects/ndisusb/sys/compat/ndis/kern_ndis.c#5 (text+ko) ====

@@ -1101,6 +1101,8 @@
 
 	NDIS_UNLOCK(sc);
 
+	KeResetEvent(&sc->ndis_block->nmb_resetevent);
+
 	if (NDIS_SERIALIZED(sc->ndis_block))
 		KeAcquireSpinLock(&sc->ndis_block->nmb_lock, &irql);
 
@@ -1109,11 +1111,9 @@
 	if (NDIS_SERIALIZED(sc->ndis_block))
 		KeReleaseSpinLock(&sc->ndis_block->nmb_lock, irql);
 
-	if (rval == NDIS_STATUS_PENDING) {
-		KeResetEvent(&sc->ndis_block->nmb_resetevent);
+	if (rval == NDIS_STATUS_PENDING)
 		KeWaitForSingleObject(&sc->ndis_block->nmb_resetevent,
 		    0, 0, FALSE, NULL);
-	}
 
 	return(0);
 }