PERFORCE change 155044 for review

[Weongyo Jeong]

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

Change 155044 by weongyo at 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;
 };