From owner-p4-projects@FreeBSD.ORG  Sat Feb 14 13:19:17 2004
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 0A75A16A4D0; Sat, 14 Feb 2004 13:19:17 -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 D88F616A4CE
	for <perforce@freebsd.org>; Sat, 14 Feb 2004 13:19:16 -0800 (PST)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id D4B3943D1D
	for <perforce@freebsd.org>; Sat, 14 Feb 2004 13:19:16 -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 i1ELJGGe022925
	for <perforce@freebsd.org>; Sat, 14 Feb 2004 13:19:16 -0800 (PST)
	(envelope-from sam@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i1ELJGiT022922
	for perforce@freebsd.org; Sat, 14 Feb 2004 13:19:16 -0800 (PST)
	(envelope-from sam@freebsd.org)
Date: Sat, 14 Feb 2004 13:19:16 -0800 (PST)
Message-Id: <200402142119.i1ELJGiT022922@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 46947 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, 14 Feb 2004 21:19:17 -0000

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

Change 46947 by sam@sam_ebb on 2004/02/14 13:18:21

	move up initialization of ic_des_chan to before ieee80211_setmode
	to silence complaints about a NULL channel in ieee80211_chan2ieee

Affected files ...

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

Differences ...

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

@@ -155,10 +155,10 @@
 	/* validate ic->ic_curmode */
 	if ((ic->ic_modecaps & (1<<ic->ic_curmode)) == 0)
 		ic->ic_curmode = IEEE80211_MODE_AUTO;
+	ic->ic_des_chan = IEEE80211_CHAN_ANYC;	/* any channel is ok */
 
 	(void) ieee80211_setmode(ic, ic->ic_curmode);
 
-	ic->ic_des_chan = IEEE80211_CHAN_ANYC;	/* any channel is ok */
 	if (ic->ic_lintval == 0)
 		ic->ic_lintval = 100;		/* default sleep */
 	ic->ic_bmisstimeout = 7*ic->ic_lintval;	/* default 7 beacons */