From owner-p4-projects@FreeBSD.ORG  Wed Feb 11 15:29:04 2009
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 98A3B106566C; Wed, 11 Feb 2009 15:29:04 +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 58692106564A
	for <perforce@FreeBSD.org>; Wed, 11 Feb 2009 15:29:04 +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 465B68FC17
	for <perforce@FreeBSD.org>; Wed, 11 Feb 2009 15:29:04 +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 n1BFT4cV044674
	for <perforce@FreeBSD.org>; Wed, 11 Feb 2009 15:29:04 GMT
	(envelope-from hselasky@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n1BFT4Qi044672
	for perforce@freebsd.org; Wed, 11 Feb 2009 15:29:04 GMT
	(envelope-from hselasky@FreeBSD.org)
Date: Wed, 11 Feb 2009 15:29:04 GMT
Message-Id: <200902111529.n1BFT4Qi044672@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 157546 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: Wed, 11 Feb 2009 15:29:06 -0000

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

Change 157546 by hselasky@hselasky_laptop001 on 2009/02/11 15:28:15

	
	USB WLAN: Revert looping on the control
	request in case of error. It did not
	solve the problem it turns out.

Affected files ...

.. //depot/projects/usb/src/sys/dev/usb2/wlan/if_rum2.c#37 edit
.. //depot/projects/usb/src/sys/dev/usb2/wlan/if_ural2.c#36 edit

Differences ...

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

@@ -584,21 +584,12 @@
 {
 	usb2_error_t err;
 
-	/*
-	 * Occasionally the RUM chip will just generate control
-	 * request timeouts. Probably a USB driver bug in the
-	 * firmware! Try to workaround the problem.
-	 */
- retry:
 	err = usb2_do_request_proc(sc->sc_udev, &sc->sc_tq, 
 	   req, data, 0, NULL, 250 /* ms */);
 
 	if (err) {
-		if (!usb2_proc_is_gone(&sc->sc_tq)) {
-			DPRINTFN(1, "Control request failed! (ignored)\n");
-			rum_pause(sc, hz / 100);
-			goto retry;
-		}
+		DPRINTFN(1, "Control request failed! (ignored)\n");
+		rum_pause(sc, hz / 100);
 	}
 	return;
 }

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

@@ -570,16 +570,12 @@
 {
 	usb2_error_t err;
 
- retry:
 	err = usb2_do_request_proc(sc->sc_udev, &sc->sc_tq, 
 	   req, data, 0, NULL, 250 /* ms */);
 
 	if (err) {
-		if (!usb2_proc_is_gone(&sc->sc_tq)) {
-			DPRINTFN(1, "Control request failed! (ignored)\n");
-			ural_pause(sc, hz / 100);
-			goto retry;
-		}
+		DPRINTFN(1, "Control request failed! (ignored)\n");
+		ural_pause(sc, hz / 100);
 	}
 }