From owner-p4-projects@FreeBSD.ORG  Sat Dec 13 10:45:26 2003
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 0667516A4D0; Sat, 13 Dec 2003 10:45:26 -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 D561E16A4CE
	for <perforce@freebsd.org>; Sat, 13 Dec 2003 10:45:25 -0800 (PST)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 27AFF43D1F
	for <perforce@freebsd.org>; Sat, 13 Dec 2003 10:45:25 -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 hBDIjOXJ057719
	for <perforce@freebsd.org>; Sat, 13 Dec 2003 10:45:24 -0800 (PST)
	(envelope-from sam@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.9/8.12.9/Submit) id hBDIjOHk057716
	for perforce@freebsd.org; Sat, 13 Dec 2003 10:45:24 -0800 (PST)
	(envelope-from sam@freebsd.org)
Date: Sat, 13 Dec 2003 10:45:24 -0800 (PST)
Message-Id: <200312131845.hBDIjOHk057716@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 43905 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, 13 Dec 2003 18:45:26 -0000

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

Change 43905 by sam@sam_ebb on 2003/12/13 10:45:22

	skip scanning when operating in adhoc mode with a fixed channel

Affected files ...

.. //depot/projects/netperf/sys/net80211/ieee80211_proto.c#10 edit

Differences ...

==== //depot/projects/netperf/sys/net80211/ieee80211_proto.c#10 (text+ko) ====

@@ -383,7 +383,9 @@
 		ni->ni_rstamp = 0;
 		switch (ostate) {
 		case IEEE80211_S_INIT:
-			if (ic->ic_opmode == IEEE80211_M_HOSTAP &&
+			if ((ic->ic_opmode == IEEE80211_M_HOSTAP ||
+			     ic->ic_opmode == IEEE80211_M_IBSS ||
+			     ic->ic_opmode == IEEE80211_M_AHDEMO) &&
 			    ic->ic_des_chan != IEEE80211_CHAN_ANYC) {
 				/*
 				 * AP operation and we already have a channel;