From owner-p4-projects@FreeBSD.ORG  Thu Feb 12 23:34:55 2009
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id ABD371065674; Thu, 12 Feb 2009 23:34:55 +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 6A618106566B
	for <perforce@FreeBSD.org>; Thu, 12 Feb 2009 23:34:55 +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 57AEB8FC0A
	for <perforce@FreeBSD.org>; Thu, 12 Feb 2009 23:34:55 +0000 (UTC)
	(envelope-from hselasky@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 n1CNYtxh036919
	for <perforce@FreeBSD.org>; Thu, 12 Feb 2009 23:34:55 GMT
	(envelope-from hselasky@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n1CNYthM036917
	for perforce@freebsd.org; Thu, 12 Feb 2009 23:34:55 GMT
	(envelope-from hselasky@FreeBSD.org)
Date: Thu, 12 Feb 2009 23:34:55 GMT
Message-Id: <200902122334.n1CNYthM036917@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>
Cc: 
Subject: PERFORCE change 157618 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: Thu, 12 Feb 2009 23:34:56 -0000

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

Change 157618 by hselasky@hselasky_laptop001 on 2009/02/12 23:34:24

	
	USB WLAN: Re-introduce fix for failing control transfers after
	firmware load. Repeat the transfer until a) detach or b) success.

Affected files ...

.. //depot/projects/usb/src/sys/dev/usb2/wlan/if_rum2.c#41 edit
.. //depot/projects/usb/src/sys/dev/usb2/wlan/if_ural2.c#40 edit

Differences ...

==== //depot/projects/usb/src/sys/dev/usb2/wlan/if_rum2.c#41 (text+ko) ====

@@ -588,14 +588,15 @@
     struct usb2_device_request *req, void *data)
 {
 	usb2_error_t err;
-
+retry:
 	err = usb2_do_request_proc(sc->sc_udev, &sc->sc_tq, 
-	   req, data, 0, NULL, 1000 /* ms */);
+	   req, data, 0, NULL, 250 /* ms */);
 
 	if (err) {
 		DPRINTFN(1, "Control request failed, "
 		    "%s! (ignored)\n", usb2_errstr(err));
-		rum_pause(sc, hz / 100);
+		if ((sc->sc_ifp != NULL) && (!rum_pause(sc, hz / 100)))
+			goto retry;
 	}
 	return (err);
 }

==== //depot/projects/usb/src/sys/dev/usb2/wlan/if_ural2.c#40 (text+ko) ====

@@ -579,13 +579,15 @@
     struct usb2_device_request *req, void *data)
 {
 	usb2_error_t err;
-
+retry:
 	err = usb2_do_request_proc(sc->sc_udev, &sc->sc_tq, 
-	   req, data, 0, NULL, 1000 /* ms */);
+	   req, data, 0, NULL, 250 /* ms */);
 
 	if (err) {
-		DPRINTFN(1, "Control request failed! (ignored)\n");
-		ural_pause(sc, hz / 100);
+		DPRINTFN(1, "Control request failed, "
+		    "%s! (ignored)\n", usb2_errstr(err));
+		if ((sc->sc_ifp != NULL) && (!ural_pause(sc, hz / 100)))
+			goto retry;
 	}
 }