From owner-p4-projects@FreeBSD.ORG  Sat Apr 26 09:14:55 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 2C0F2106567A; Sat, 26 Apr 2008 09:14: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 E280F106564A
	for <perforce@freebsd.org>; Sat, 26 Apr 2008 09:14:54 +0000 (UTC)
	(envelope-from pjd@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id BD7308FC18
	for <perforce@freebsd.org>; Sat, 26 Apr 2008 09:14:54 +0000 (UTC)
	(envelope-from pjd@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 m3Q9EsRY048269
	for <perforce@freebsd.org>; Sat, 26 Apr 2008 09:14:54 GMT
	(envelope-from pjd@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m3Q9Esrn048267
	for perforce@freebsd.org; Sat, 26 Apr 2008 09:14:54 GMT
	(envelope-from pjd@freebsd.org)
Date: Sat, 26 Apr 2008 09:14:54 GMT
Message-Id: <200804260914.m3Q9Esrn048267@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	pjd@freebsd.org using -f
From: Pawel Jakub Dawidek <pjd@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 140662 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: Sat, 26 Apr 2008 09:14:55 -0000

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

Change 140662 by pjd@pjd_anger on 2008/04/26 09:13:57

	We have to call callout_stop() with IWN lock held.

Affected files ...

.. //depot/projects/vap/sys/dev/iwn/if_iwn.c#12 edit

Differences ...

==== //depot/projects/vap/sys/dev/iwn/if_iwn.c#12 (text+kox) ====

@@ -973,7 +973,9 @@
 		ieee80211_state_name[vap->iv_state],
 		ieee80211_state_name[nstate]);
 
+	IWN_LOCK(sc);
 	callout_stop(&sc->sc_timer_to);
+	IWN_UNLOCK(sc);
 
 	/*
 	 * Some state transitions require issuing a configure request