From owner-p4-projects@FreeBSD.ORG  Mon Feb  2 02:10:33 2009
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 782A5106566C; Mon,  2 Feb 2009 02:10:32 +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 3A183106564A
	for <perforce@FreeBSD.org>; Mon,  2 Feb 2009 02:10:32 +0000 (UTC)
	(envelope-from weongyo@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 287518FC0C
	for <perforce@FreeBSD.org>; Mon,  2 Feb 2009 02:10:32 +0000 (UTC)
	(envelope-from weongyo@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 n122AWlT001317
	for <perforce@FreeBSD.org>; Mon, 2 Feb 2009 02:10:32 GMT
	(envelope-from weongyo@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n122AWLU001315
	for perforce@freebsd.org; Mon, 2 Feb 2009 02:10:32 GMT
	(envelope-from weongyo@FreeBSD.org)
Date: Mon, 2 Feb 2009 02:10:32 GMT
Message-Id: <200902020210.n122AWLU001315@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	weongyo@FreeBSD.org using -f
From: Weongyo Jeong <weongyo@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Cc: 
Subject: PERFORCE change 157016 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: Mon, 02 Feb 2009 02:10:33 -0000

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

Change 157016 by weongyo@weongyo_ws on 2009/02/02 02:09:32

	when the channel is changed it seems it should flush control pipe not
	just flushing data pipe.  Without this the device sometimes got stuck.

Affected files ...

.. //depot/projects/vap/sys/dev/usb/if_uath.c#8 edit

Differences ...

==== //depot/projects/vap/sys/dev/usb/if_uath.c#8 (text+ko) ====

@@ -2372,6 +2372,18 @@
 		    "could not set led state, error %d\n", error);
 		goto failed;
 	}
+	error = uath_flush(sc);
+	if (error) {
+		device_printf(sc->sc_dev,
+		    "could not flush data pipe, error %d\n", error);
+		goto failed;
+	}
+	error = uath_cmd_write(sc, WDCMSG_FLUSH, NULL, 0, 0);
+	if (error) {
+		device_printf(sc->sc_dev,
+		    "could not flush control pipe, error %d\n", error);
+		goto failed;
+	}
 failed:
 	return (error);
 }
@@ -2455,18 +2467,11 @@
 	    uath_codename(WDCMSG_TARGET_START), be32toh(val));
 	UATH_LOCK(sc);
 
-	error = uath_wme_init(sc);
-	if (error) {
-		device_printf(sc->sc_dev,
-		    "could not setup WME parameters, error %d\n", error);
-		goto fail;
-	}
-
 	/* set default channel */
-	error = uath_set_chan(sc, ic->ic_curchan);
+	error = uath_switch_channel(sc, ic->ic_curchan);
 	if (error) {
 		device_printf(sc->sc_dev,
-		    "could not set channel, error %d\n", error);
+		    "could not switch channel, error %d\n", error);
 		goto fail;
 	}