PERFORCE change 172915 for review

[Hans Petter Selasky]

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

Change 172915 by hselasky at 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;
 	}
 }