From owner-p4-projects@FreeBSD.ORG  Mon Jan 14 03:26:40 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 5204D16A41B; Mon, 14 Jan 2008 03:26:40 +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 17EE416A419
	for <perforce@FreeBSD.org>; Mon, 14 Jan 2008 03:26:40 +0000 (UTC)
	(envelope-from sephe@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 13C6A13C43E
	for <perforce@FreeBSD.org>; Mon, 14 Jan 2008 03:26:40 +0000 (UTC)
	(envelope-from sephe@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 m0E3Qdke003141
	for <perforce@FreeBSD.org>; Mon, 14 Jan 2008 03:26:39 GMT
	(envelope-from sephe@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0E3Qd9N003138
	for perforce@freebsd.org; Mon, 14 Jan 2008 03:26:39 GMT
	(envelope-from sephe@FreeBSD.org)
Date: Mon, 14 Jan 2008 03:26:39 GMT
Message-Id: <200801140326.m0E3Qd9N003138@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	sephe@FreeBSD.org using -f
From: Sepherosa Ziehau <sephe@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Cc: 
Subject: PERFORCE change 133214 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, 14 Jan 2008 03:26:40 -0000

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

Change 133214 by sephe@sephe_zealot:sam_wifi on 2008/01/14 03:25:54

	Always stop watchdog callout in rt2661_stop()

Affected files ...

.. //depot/projects/wifi/sys/dev/ral/rt2661.c#20 edit

Differences ...

==== //depot/projects/wifi/sys/dev/ral/rt2661.c#20 (text) ====

@@ -401,9 +401,8 @@
 	struct rt2661_softc *sc = xsc;
 	struct ieee80211com *ic = &sc->sc_ic;
 	struct ifnet *ifp = ic->ic_ifp;
-	
+
 	rt2661_stop(sc);
-	callout_stop(&sc->watchdog_ch);
 	callout_stop(&sc->rssadapt_ch);
 
 	bpfdetach(ifp);
@@ -2670,6 +2669,7 @@
 
 	RAL_LOCK(sc);
 	rt2661_stop_locked(sc);
+	callout_stop(&sc->watchdog_ch);
 	RAL_UNLOCK(sc);
 }