From owner-p4-projects@FreeBSD.ORG  Sun Feb  1 12:07:36 2004
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id B558916A4D0; Sun,  1 Feb 2004 12:07:36 -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 8F9BB16A4CE
	for <perforce@freebsd.org>; Sun,  1 Feb 2004 12:07:36 -0800 (PST)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id C522F43D2F
	for <perforce@freebsd.org>; Sun,  1 Feb 2004 12:07:35 -0800 (PST)
	(envelope-from sam@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i11K7Z0B080689
	for <perforce@freebsd.org>; Sun, 1 Feb 2004 12:07:35 -0800 (PST)
	(envelope-from sam@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i11K7ZZ8080686
	for perforce@freebsd.org; Sun, 1 Feb 2004 12:07:35 -0800 (PST)
	(envelope-from sam@freebsd.org)
Date: Sun, 1 Feb 2004 12:07:35 -0800 (PST)
Message-Id: <200402012007.i11K7ZZ8080686@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 46320 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: Sun, 01 Feb 2004 20:07:37 -0000

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

Change 46320 by sam@sam_ebb on 2004/02/01 12:07:27

	when switching modes reset any desired channel that becomes
	invalidated; otherwise it'll stick and scanning will fail

Affected files ...

.. //depot/projects/netperf+sockets/sys/net80211/ieee80211.c#10 edit

Differences ...

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

@@ -761,6 +761,12 @@
 		    ("Bad IBSS channel %u",
 		     ieee80211_chan2ieee(ic, ic->ic_ibss_chan)));
 	}
+	/*
+	 * If the desired channel is set but no longer valid then reset it.
+	 */
+	if (ic->ic_des_chan != IEEE80211_CHAN_ANYC &&
+	    isclr(ic->ic_chan_active, ieee80211_chan2ieee(ic, ic->ic_des_chan)))
+		ic->ic_des_chan = IEEE80211_CHAN_ANYC;
 
 	/*
 	 * Do 11b/11g mixed-mode state setup.