From owner-p4-projects@FreeBSD.ORG  Fri Apr 25 19:21:56 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 501441065672; Fri, 25 Apr 2008 19:21:56 +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 129FF106564A
	for <perforce@freebsd.org>; Fri, 25 Apr 2008 19:21:56 +0000 (UTC)
	(envelope-from sam@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id F08138FC18
	for <perforce@freebsd.org>; Fri, 25 Apr 2008 19:21:55 +0000 (UTC)
	(envelope-from sam@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m3PJLt0D081926
	for <perforce@freebsd.org>; Fri, 25 Apr 2008 19:21:55 GMT
	(envelope-from sam@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m3PJLtrr081924
	for perforce@freebsd.org; Fri, 25 Apr 2008 19:21:55 GMT
	(envelope-from sam@freebsd.org)
Date: Fri, 25 Apr 2008 19:21:55 GMT
Message-Id: <200804251921.m3PJLtrr081924@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	sam@freebsd.org using -f
From: Sam Leffler <sam@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 140629 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: Fri, 25 Apr 2008 19:21:56 -0000

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

Change 140629 by sam@sam_ebb on 2008/04/25 19:21:03

	loopback fix

Affected files ...

.. //depot/projects/vap/sys/dev/usb/if_rum.c#18 integrate

Differences ...

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

@@ -1,4 +1,4 @@
-/*	$FreeBSD: src/sys/dev/usb/if_rum.c,v 1.18 2008/04/20 20:35:38 sam Exp $	*/
+/*	$FreeBSD: src/sys/dev/usb/if_rum.c,v 1.19 2008/04/25 19:13:38 sam Exp $	*/
 
 /*-
  * Copyright (c) 2005-2007 Damien Bergamini <damien.bergamini@free.fr>
@@ -18,7 +18,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/usb/if_rum.c,v 1.18 2008/04/20 20:35:38 sam Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/usb/if_rum.c,v 1.19 2008/04/25 19:13:38 sam Exp $");
 
 /*-
  * Ralink Technology RT2501USB/RT2601USB chipset driver
@@ -816,13 +816,14 @@
 	struct ieee80211com *ic = vap->iv_ic;
 	struct rum_softc *sc = ic->ic_ifp->if_softc;
 
+	usb_rem_task(sc->sc_udev, &sc->sc_task);
+	usb_rem_task(sc->sc_udev, &sc->sc_scantask);
 	callout_stop(&rvp->amrr_ch);
 
 	/* do it in a process context */
 	sc->sc_state = nstate;
 	sc->sc_arg = arg;
 
-	usb_rem_task(sc->sc_udev, &sc->sc_task);
 	if (nstate == IEEE80211_S_INIT) {
 		rvp->newstate(vap, nstate, arg);
 		return 0;