From owner-p4-projects@FreeBSD.ORG  Sun Apr 22 05:17:17 2007
Return-Path: <owner-p4-projects@FreeBSD.ORG>
X-Original-To: p4-projects@freebsd.org
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 96E8C16A407; Sun, 22 Apr 2007 05:17:17 +0000 (UTC)
X-Original-To: perforce@freebsd.org
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 3EFB016A403
	for <perforce@freebsd.org>; Sun, 22 Apr 2007 05:17:17 +0000 (UTC)
	(envelope-from sam@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41])
	by mx1.freebsd.org (Postfix) with ESMTP id 2EE8213C44B
	for <perforce@freebsd.org>; Sun, 22 Apr 2007 05:17:17 +0000 (UTC)
	(envelope-from sam@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l3M5HHk2023583
	for <perforce@freebsd.org>; Sun, 22 Apr 2007 05:17:17 GMT
	(envelope-from sam@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l3M5HHGZ023580
	for perforce@freebsd.org; Sun, 22 Apr 2007 05:17:17 GMT
	(envelope-from sam@freebsd.org)
Date: Sun, 22 Apr 2007 05:17:17 GMT
Message-Id: <200704220517.l3M5HHGZ023580@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>
Cc: 
Subject: PERFORCE change 118560 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
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, 22 Apr 2007 05:17:17 -0000

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

Change 118560 by sam@sam_ebb on 2007/04/22 05:16:15

	add missing array entry for static turbo mode; while here
	leave some asserts so it doesn't happen again

Affected files ...

.. //depot/projects/wifi/sys/net80211/ieee80211_ioctl.c#75 edit

Differences ...

==== //depot/projects/wifi/sys/net80211/ieee80211_ioctl.c#75 (text+ko) ====

@@ -1605,11 +1605,15 @@
 		IEEE80211_CHAN_FHSS,	/* IEEE80211_MODE_FH */
 		IEEE80211_CHAN_108A,	/* IEEE80211_MODE_TURBO_A */
 		IEEE80211_CHAN_108G,	/* IEEE80211_MODE_TURBO_G */
+		IEEE80211_CHAN_STURBO,	/* IEEE80211_MODE_STURBO_A */
 	};
 	u_int modeflags;
 	int i;
 
+	KASSERT(mode < IEEE80211_MODE_MAX, ("bad mode %u", mode));
 	modeflags = chanflags[mode];
+	KASSERT(modeflags != 0 || mode == IEEE80211_MODE_AUTO,
+	    ("no chanflags for mode %u", mode));
 	for (i = 0; i < ic->ic_nchans; i++) {
 		struct ieee80211_channel *c = &ic->ic_channels[i];