From owner-p4-projects@FreeBSD.ORG  Fri Jan 16 09:30:26 2004
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id E4DCF16A4D0; Fri, 16 Jan 2004 09:30:25 -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 A390B16A4CE
	for <perforce@freebsd.org>; Fri, 16 Jan 2004 09:30:25 -0800 (PST)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id CC4B143D54
	for <perforce@freebsd.org>; Fri, 16 Jan 2004 09:30:24 -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 i0GHUO0B088969
	for <perforce@freebsd.org>; Fri, 16 Jan 2004 09:30:24 -0800 (PST)
	(envelope-from sam@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i0GHUOIk088964
	for perforce@freebsd.org; Fri, 16 Jan 2004 09:30:24 -0800 (PST)
	(envelope-from sam@freebsd.org)
Date: Fri, 16 Jan 2004 09:30:24 -0800 (PST)
Message-Id: <200401161730.i0GHUOIk088964@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 45447 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: Fri, 16 Jan 2004 17:30:26 -0000

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

Change 45447 by sam@sam_ebb on 2004/01/16 09:29:45

	when changing modes reset the rate set so drivers have
	view consistent with ic_ibss_chan; this eliminates the
	need for the hack in the ath driver where it recovers
	when the rate set is empty and also fixes a problem where
	you switch modes while operating in hostap mode

Affected files ...

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

Differences ...

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

@@ -735,6 +735,15 @@
 		ic->ic_flags &= ~IEEE80211_F_SHSLOT;
 	}
 
+	/*
+	 * Setup an initial rate set according to the
+	 * current/default channel selected above.  This
+	 * will be changed when scanning but must exist
+	 * now so driver have a consistent state of ic_ibss_chan.
+	 */
+	if (ic->ic_bss)		/* NB: can be called before lateattach */
+		ic->ic_bss->ni_rates = ic->ic_sup_rates[mode];
+
 	ic->ic_curmode = mode;
 	return 0;
 #undef N