From owner-p4-projects@FreeBSD.ORG  Sat Dec 20 07:31:33 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 14AFF1065675; Sat, 20 Dec 2008 07:31:33 +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 CD30C106564A
	for <perforce@FreeBSD.org>; Sat, 20 Dec 2008 07:31:32 +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 BAEFC8FC0C
	for <perforce@FreeBSD.org>; Sat, 20 Dec 2008 07:31:32 +0000 (UTC)
	(envelope-from weongyo@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id mBK7VW8l068186
	for <perforce@FreeBSD.org>; Sat, 20 Dec 2008 07:31:32 GMT
	(envelope-from weongyo@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mBK7VWR8068184
	for perforce@freebsd.org; Sat, 20 Dec 2008 07:31:32 GMT
	(envelope-from weongyo@FreeBSD.org)
Date: Sat, 20 Dec 2008 07:31:32 GMT
Message-Id: <200812200731.mBK7VWR8068184@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 155044 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: Sat, 20 Dec 2008 07:31:33 -0000

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

Change 155044 by weongyo@weongyo_ws on 2008/12/20 07:30:38

	no more need to distinguish whether the xfer should be freed or not.

Affected files ...

.. //depot/projects/ndisusb/sys/compat/ndis/subr_usbd.c#33 edit
.. //depot/projects/ndisusb/sys/dev/if_ndis/if_ndisvar.h#8 edit

Differences ...

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

@@ -97,7 +97,7 @@
 static void		 usbd_xfereof(usbd_xfer_handle, usbd_private_handle,
 			    usbd_status);
 static void		 usbd_xferadd(usbd_xfer_handle, usbd_private_handle,
-			    usbd_status, uint8_t);
+			    usbd_status);
 static void		 usbd_xfertask(device_object *, void *);
 static void		 dummy(void);
 
@@ -881,11 +881,10 @@
 }
 
 static void
-usbd_xferadd(xfer, priv, status, freexfer)
+usbd_xferadd(xfer, priv, status)
 	usbd_xfer_handle xfer;
 	usbd_private_handle priv;
 	usbd_status status;
-	uint8_t freexfer;
 {
 	irp *ip = priv;
 	device_t dev = IRP_NDIS_DEV(ip);
@@ -901,7 +900,6 @@
 	nx->nx_xfer = xfer;
 	nx->nx_priv = priv;
 	nx->nx_status = status;
-	nx->nx_freexfer = freexfer;
 
 	KeAcquireSpinLock(&sc->ndisusb_xferlock, &irql);
 	InsertTailList((&sc->ndisusb_xferlist), (&nx->nx_xferlist));
@@ -918,7 +916,7 @@
 	usbd_status status;
 {
 
-	usbd_xferadd(xfer, priv, status, 1);
+	usbd_xferadd(xfer, priv, status);
 }
 
 static void
@@ -1013,8 +1011,7 @@
 next:
 		l = l->nle_flink;
 		RemoveEntryList(&nx->nx_xferlist);
-		if (nx->nx_freexfer)
-			usbd_free_xfer(nx->nx_xfer);
+		usbd_free_xfer(nx->nx_xfer);
 		free(nx, M_USBDEV);
 		if (error)
 			continue;

==== //depot/projects/ndisusb/sys/dev/if_ndis/if_ndisvar.h#8 (text+ko) ====

@@ -121,7 +121,6 @@
 	usbd_xfer_handle	nx_xfer;
 	usbd_private_handle	nx_priv;
 	usbd_status		nx_status;
-	uint8_t			nx_freexfer;
 	list_entry		nx_xferlist;
 };