From owner-p4-projects@FreeBSD.ORG  Fri Nov 14 18:00:27 2003
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 3962A16A4D0; Fri, 14 Nov 2003 18:00:27 -0800 (PST)
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 14F9C16A4CE
	for <perforce@freebsd.org>; Fri, 14 Nov 2003 18:00:27 -0800 (PST)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 751C543F85
	for <perforce@freebsd.org>; Fri, 14 Nov 2003 18:00:26 -0800 (PST)
	(envelope-from sam@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.9/8.12.9) with ESMTP id hAF20QXJ098098
	for <perforce@freebsd.org>; Fri, 14 Nov 2003 18:00:26 -0800 (PST)
	(envelope-from sam@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.9/8.12.9/Submit) id hAF20P66098095
	for perforce@freebsd.org; Fri, 14 Nov 2003 18:00:25 -0800 (PST)
	(envelope-from sam@freebsd.org)
Date: Fri, 14 Nov 2003 18:00:25 -0800 (PST)
Message-Id: <200311150200.hAF20P66098095@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>
Subject: PERFORCE change 42417 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.1
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, 15 Nov 2003 02:00:27 -0000

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

Change 42417 by sam@sam_ebb on 2003/11/14 18:00:04

	on a beacon miss try to reassociate before starting a scan

Affected files ...

.. //depot/projects/netperf/sys/dev/ath/if_ath.c#36 edit

Differences ...

==== //depot/projects/netperf/sys/dev/ath/if_ath.c#36 (text+ko) ====

@@ -490,8 +490,15 @@
 	DPRINTF(("ath_bmiss_proc: pending %u\n", pending));
 	KASSERT(ic->ic_opmode == IEEE80211_M_STA,
 		("unexpect operating mode %u", ic->ic_opmode));
-	if (ic->ic_state == IEEE80211_S_RUN)
-		ieee80211_new_state(ic, IEEE80211_S_SCAN, -1);
+	if (ic->ic_state == IEEE80211_S_RUN) {
+		/*
+		 * Rather than go directly to scan state, try to
+		 * reassociate first.  If that fails then the state
+		 * machine will drop us into scanning after timing
+		 * out waiting for a probe response.
+		 */
+		ieee80211_new_state(ic, IEEE80211_S_ASSOC, -1);
+	}
 }
 
 static u_int