From owner-p4-projects@FreeBSD.ORG  Sun Jan 10 11:51:17 2010
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 54290106568F; Sun, 10 Jan 2010 11:51:17 +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 18BF61065670
	for <perforce@FreeBSD.org>; Sun, 10 Jan 2010 11:51:17 +0000 (UTC)
	(envelope-from hselasky@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 05E068FC1F
	for <perforce@FreeBSD.org>; Sun, 10 Jan 2010 11:51:17 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o0ABpGmi044193
	for <perforce@FreeBSD.org>; Sun, 10 Jan 2010 11:51:16 GMT
	(envelope-from hselasky@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o0ABpG8x044191
	for perforce@freebsd.org; Sun, 10 Jan 2010 11:51:16 GMT
	(envelope-from hselasky@FreeBSD.org)
Date: Sun, 10 Jan 2010 11:51:16 GMT
Message-Id: <201001101151.o0ABpG8x044191@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	hselasky@FreeBSD.org using -f
From: Hans Petter Selasky <hselasky@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Precedence: bulk
Cc: 
Subject: PERFORCE change 172915 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: Sun, 10 Jan 2010 11:51:17 -0000

http://p4web.freebsd.org/chv.cgi?CH=172915

Change 172915 by hselasky@hselasky_laptop001 on 2010/01/10 11:50:27

	USB WLAN:
		- minor fix to RUM and ZYD.
		- don't stop TX patch on
		  errors.
		- patch by: HPS

Affected files ...

.. //depot/projects/usb/src/sys/dev/usb/wlan/if_rum.c#22 edit
.. //depot/projects/usb/src/sys/dev/usb/wlan/if_zyd.c#24 edit

Differences ...

==== //depot/projects/usb/src/sys/dev/usb/wlan/if_rum.c#22 (text+ko) ====

@@ -845,13 +845,18 @@
 			usbd_xfer_set_priv(xfer, NULL);
 		}
 
-		if (error == USB_ERR_STALLED) {
-			/* try to clear stall first */
+		if (error != USB_ERR_CANCELLED) {
+			if (error == USB_ERR_TIMEOUT)
+				device_printf(sc->sc_dev, "device timeout\n");
+
+			/*
+			 * Try to clear stall first, also if other
+			 * errors occur, hence clearing stall
+			 * introduces a 50 ms delay:
+			 */
 			usbd_xfer_set_stall(xfer);
 			goto tr_setup;
 		}
-		if (error == USB_ERR_TIMEOUT)
-			device_printf(sc->sc_dev, "device timeout\n");
 		break;
 	}
 }

==== //depot/projects/usb/src/sys/dev/usb/wlan/if_zyd.c#24 (text+ko) ====

@@ -2449,13 +2449,18 @@
 		if (data != NULL)
 			zyd_tx_free(data, error);
 
-		if (error == USB_ERR_STALLED) {
-			/* try to clear stall first */
+		if (error != USB_ERR_CANCELLED) {
+			if (error == USB_ERR_TIMEOUT)
+				device_printf(sc->sc_dev, "device timeout\n");
+
+			/*
+			 * Try to clear stall first, also if other
+			 * errors occur, hence clearing stall
+			 * introduces a 50 ms delay:
+			 */
 			usbd_xfer_set_stall(xfer);
 			goto tr_setup;
 		}
-		if (error == USB_ERR_TIMEOUT)
-			device_printf(sc->sc_dev, "device timeout\n");
 		break;
 	}
 }