From owner-p4-projects@FreeBSD.ORG  Mon May 16 21:59:40 2005
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 62DBB16A4D3; Mon, 16 May 2005 21:59:40 +0000 (GMT)
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 3671D16A4CE
	for <perforce@freebsd.org>; Mon, 16 May 2005 21:59:40 +0000 (GMT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 16BF843D9E
	for <perforce@freebsd.org>; Mon, 16 May 2005 21:59:40 +0000 (GMT)
	(envelope-from sam@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j4GLxZXe051246
	for <perforce@freebsd.org>; Mon, 16 May 2005 21:59:35 GMT
	(envelope-from sam@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j4GLxZfP051243
	for perforce@freebsd.org; Mon, 16 May 2005 21:59:35 GMT
	(envelope-from sam@freebsd.org)
Date: Mon, 16 May 2005 21:59:35 GMT
Message-Id: <200505162159.j4GLxZfP051243@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 77084 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: Mon, 16 May 2005 21:59:41 -0000

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

Change 77084 by sam@sam_laptop on 2005/05/16 21:59:27

	don't do bg scanning when in turbo mode on a dynamic turbo
	channel (bad idea); fixup a comment while in the vicinity

Affected files ...

.. //depot/projects/vap/sys/net80211/ieee80211_input.c#11 edit

Differences ...

==== //depot/projects/vap/sys/net80211/ieee80211_input.c#11 (text+ko) ====

@@ -2321,12 +2321,20 @@
 				ieee80211_parse_dothparams(vap, scan.doth, wh);
 			if ((ic->ic_flags & IEEE80211_F_SCAN) == 0) {
 				/*
-				 * If no data frames have come through
-				 * recently and it's been a while since the
-				 * last background scan, kick off a new
-				 * background scan.
+				 * Check if it's the right time to do a
+				 * background scan.  Background scanning must
+				 * be enabled and we must not be operating in
+				 * turbo phase of dynamic turbo mode.  Then,
+				 * it's been a while since the last background
+				 * scan and if no data frames have come through
+				 * recently, kick off a scan.  Note that this
+				 * is the mechanism by which a background scan
+				 * is started _and_ continued each time we
+				 * return on-channel to receive a beacon from
+				 * our ap.
 				 */
 				if ((vap->iv_flags & IEEE80211_F_BGSCAN) &&
+				    !IEEE80211_IS_CHAN_DTURBO(ic->ic_curchan) &&
 				    ticks - ic->ic_lastscan >= vap->iv_bgscanintvl &&
 				    ticks - ic->ic_lastdata >= vap->iv_bgscanidle)
 					ieee80211_bg_scan(vap);