From owner-p4-projects@FreeBSD.ORG  Tue May 20 23:15:31 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 22639106566C; Tue, 20 May 2008 23:15:31 +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 D91B3106567C
	for <perforce@freebsd.org>; Tue, 20 May 2008 23:15:30 +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 D03358FC22
	for <perforce@freebsd.org>; Tue, 20 May 2008 23:15:30 +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 m4KNFUeT089776
	for <perforce@freebsd.org>; Tue, 20 May 2008 23:15:30 GMT
	(envelope-from sam@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m4KNFUZF089774
	for perforce@freebsd.org; Tue, 20 May 2008 23:15:30 GMT
	(envelope-from sam@freebsd.org)
Date: Tue, 20 May 2008 23:15:30 GMT
Message-Id: <200805202315.m4KNFUZF089774@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 141938 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: Tue, 20 May 2008 23:15:31 -0000

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

Change 141938 by sam@sam_ebb on 2008/05/20 23:15:16

	Ignore sw beacon miss events when scanning.  This is kind of a hack
	but it is insufficient to manipulate the vap's timer on scan start/end
	as there may be multiple sta vap's present when a scan is done.

Affected files ...

.. //depot/projects/vap/sys/net80211/ieee80211_proto.c#31 edit

Differences ...

==== //depot/projects/vap/sys/net80211/ieee80211_proto.c#31 (text+ko) ====

@@ -1323,8 +1323,23 @@
 ieee80211_swbmiss(void *arg)
 {
 	struct ieee80211vap *vap = arg;
+	struct ieee80211com *ic = vap->iv_ic;
+
+	/* XXX sleep state? */
+	KASSERT(vap->iv_state == IEEE80211_S_RUN,
+	    ("wrong state %d", vap->iv_state));
 
-	if (vap->iv_swbmiss_count == 0) {
+	if (ic->ic_flags & IEEE80211_F_SCAN) {
+		/*
+		 * If scanning just ignore and reset state.  It's awkward
+		 * to reset the swbmiss timer on scan start/end so instead
+		 * we do this.  If get a bmiss after coming out of scan
+		 * because we haven't had time to receive a beacon then
+		 * we should probe the AP before posting a real bmiss
+		 * (unless iv_bmiss_max has been artifiically lowered).
+		 */
+		vap->iv_swbmiss_count = 0;
+	} else if (vap->iv_swbmiss_count == 0) {
 		if (vap->iv_bmiss != NULL)
 			vap->iv_bmiss(vap);
 		if (vap->iv_bmiss_count == 0)	/* don't re-arm timer */