From owner-p4-projects@FreeBSD.ORG  Wed Aug 11 18:25:49 2010
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 95A5F1065770; Wed, 11 Aug 2010 18:25:49 +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 23EE6106566B
	for <perforce@FreeBSD.org>; Wed, 11 Aug 2010 18:25:49 +0000 (UTC)
	(envelope-from hselasky@FreeBSD.org)
Received: from skunkworks.freebsd.org (skunkworks.freebsd.org
	[IPv6:2001:4f8:fff6::2d])
	by mx1.freebsd.org (Postfix) with ESMTP id 115518FC14
	for <perforce@FreeBSD.org>; Wed, 11 Aug 2010 18:25:49 +0000 (UTC)
Received: from skunkworks.freebsd.org (localhost [127.0.0.1])
	by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id o7BIPmFP083706
	for <perforce@FreeBSD.org>; Wed, 11 Aug 2010 18:25:48 GMT
	(envelope-from hselasky@FreeBSD.org)
Received: (from perforce@localhost)
	by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id o7BIPmJg083703
	for perforce@freebsd.org; Wed, 11 Aug 2010 18:25:48 GMT
	(envelope-from hselasky@FreeBSD.org)
Date: Wed, 11 Aug 2010 18:25:48 GMT
Message-Id: <201008111825.o7BIPmJg083703@skunkworks.freebsd.org>
X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to
	hselasky@FreeBSD.org using -f
From: Hans Petter Selasky <hselasky@skunkworks.freebsd.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Precedence: bulk
Cc: 
Subject: PERFORCE change 182098 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
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, 11 Aug 2010 18:25:50 -0000

http://p4web.freebsd.org/@@182098?ac=10

Change 182098 by hselasky@hselasky_laptop001 on 2010/08/08 19:22:10

	
	USB controller (XHCI):
		- make sure we don't claim done until the STATUS
		stage is complete for control transactions or the
		next packet for isochronous transfers.

Affected files ...

.. //depot/projects/usb/src/sys/dev/usb/controller/xhci.c#20 edit

Differences ...

==== //depot/projects/usb/src/sys/dev/usb/controller/xhci.c#20 (text+ko) ====

@@ -563,7 +563,8 @@
 		/* Check for short transfer */
 		if (len > 0) {
 			if (xfer->flags_int.short_frames_ok || 
-			    xfer->flags_int.isochronous_xfr) {
+			    xfer->flags_int.isochronous_xfr ||
+			    xfer->flags_int.control_xfr) {
 				/* follow alt next */
 				td = td->alt_next;
 			} else {
@@ -738,8 +739,10 @@
 			 */
 			if (td->remainder > 0) {
 				DPRINTF("TD has short pkt\n");
-				if (xfer->flags_int.short_frames_ok) {
-					/* follow alt next */
+				if (xfer->flags_int.short_frames_ok ||
+				    xfer->flags_int.isochronous_xfr ||
+				    xfer->flags_int.control_xfr) {
+					/* try to follow follow alt next */
 					if (td->alt_next != NULL) {
 						xfer->td_transfer_cache = td->alt_next;
 						break;