From owner-p4-projects@FreeBSD.ORG  Sun May 11 22:37:44 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 3C5A01065675; Sun, 11 May 2008 22:37:44 +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 F27CD1065674
	for <perforce@freebsd.org>; Sun, 11 May 2008 22:37:43 +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 E37F68FC13
	for <perforce@freebsd.org>; Sun, 11 May 2008 22:37:43 +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 m4BMbgIV025289
	for <perforce@freebsd.org>; Sun, 11 May 2008 22:37:42 GMT
	(envelope-from sam@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m4BMbg1i025287
	for perforce@freebsd.org; Sun, 11 May 2008 22:37:42 GMT
	(envelope-from sam@freebsd.org)
Date: Sun, 11 May 2008 22:37:42 GMT
Message-Id: <200805112237.m4BMbg1i025287@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 141482 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: Sun, 11 May 2008 22:37:44 -0000

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

Change 141482 by sam@sam_ebb on 2008/05/11 22:36:41

	don't use iv_bss unless we're in RUN state; fixes a crash when
	scanning is restarted after failing to find a suitable ap
	Reported by:	flz

Affected files ...

.. //depot/projects/vap/sys/dev/ral/rt2560.c#37 edit
.. //depot/projects/vap/sys/dev/ral/rt2661.c#35 edit

Differences ...

==== //depot/projects/vap/sys/dev/ral/rt2560.c#37 (text) ====

@@ -2291,6 +2291,9 @@
 	uint16_t logcwmin, preload;
 	uint32_t tmp;
 
+	KASSERT(vap->iv_state == IEEE80211_S_RUN,
+	    ("in %d state", vap->iv_state));
+
 	/* first, disable TSF synchronization */
 	RAL_WRITE(sc, RT2560_CSR14, 0);
 
@@ -2564,9 +2567,10 @@
 	struct rt2560_softc *sc = ifp->if_softc;
 	struct ieee80211vap *vap = ic->ic_scan->ss_vap;
 
-	rt2560_enable_tsf_sync(sc);
-	/* XXX keep local copy */
-	rt2560_set_bssid(sc, vap->iv_bss->ni_bssid);
+	if (vap->iv_state == IEEE80211_S_RUN) {
+		rt2560_enable_tsf_sync(sc);
+		rt2560_set_bssid(sc, vap->iv_bss->ni_bssid);
+	}
 }
 
 static int

==== //depot/projects/vap/sys/dev/ral/rt2661.c#35 (text) ====

@@ -2784,6 +2784,9 @@
 	struct ieee80211vap *vap = TAILQ_FIRST(&ic->ic_vaps);
 	uint32_t tmp;
 
+	KASSERT(vap->iv_state == IEEE80211_S_RUN,
+	    ("in %d state", vap->iv_state));
+
 	if (vap->iv_opmode != IEEE80211_M_STA) {
 		/*
 		 * Change default 16ms TBTT adjustment to 8ms.
@@ -2873,9 +2876,11 @@
 	struct rt2661_softc *sc = ifp->if_softc;
 	struct ieee80211vap *vap = TAILQ_FIRST(&ic->ic_vaps);
 
-	rt2661_enable_tsf_sync(sc);
-	/* XXX keep local copy */
-	rt2661_set_bssid(sc, vap->iv_bss->ni_bssid);
+	if (vap->iv_state == IEEE80211_S_RUN) {
+		rt2661_enable_tsf_sync(sc);
+		/* XXX keep local copy */
+		rt2661_set_bssid(sc, vap->iv_bss->ni_bssid);
+	}
 }
 
 static void