From owner-p4-projects@FreeBSD.ORG  Sun Apr 22 06:17:32 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 376A116A404; Sun, 22 Apr 2007 06:17:32 +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 A865716A402
	for <perforce@freebsd.org>; Sun, 22 Apr 2007 06:17:31 +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 9876513C43E
	for <perforce@freebsd.org>; Sun, 22 Apr 2007 06:17:31 +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 l3M6HVWY033912
	for <perforce@freebsd.org>; Sun, 22 Apr 2007 06:17:31 GMT
	(envelope-from sam@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l3M6HVJt033909
	for perforce@freebsd.org; Sun, 22 Apr 2007 06:17:31 GMT
	(envelope-from sam@freebsd.org)
Date: Sun, 22 Apr 2007 06:17:31 GMT
Message-Id: <200704220617.l3M6HVJt033909@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 118563 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 06:17:32 -0000

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

Change 118563 by sam@sam_ebb on 2007/04/22 06:17:22

	add missing array entry for static turb mode; while here
	add assertions so it doesn't happen in the future

Affected files ...

.. //depot/projects/wifi/sys/net80211/ieee80211.c#50 edit

Differences ...

==== //depot/projects/wifi/sys/net80211/ieee80211.c#50 (text+ko) ====

@@ -426,21 +426,27 @@
 static void
 addmedia(struct ieee80211com *ic, int mode, int mword)
 {
+#define	TURBO(m)	((m) | IFM_IEEE80211_TURBO)
 #define	ADD(_ic, _s, _o) \
 	ifmedia_add(&(_ic)->ic_media, \
 		IFM_MAKEWORD(IFM_IEEE80211, (_s), (_o), 0), 0, NULL)
 	static const u_int mopts[IEEE80211_MODE_MAX] = { 
-		IFM_AUTO,
-		IFM_IEEE80211_11A,
-		IFM_IEEE80211_11B,
-		IFM_IEEE80211_11G,
-		IFM_IEEE80211_FH,
-		IFM_IEEE80211_11A | IFM_IEEE80211_TURBO,
-		IFM_IEEE80211_11G | IFM_IEEE80211_TURBO,
+		IFM_AUTO,			/* IEEE80211_MODE_AUTO */
+		IFM_IEEE80211_11A,		/* IEEE80211_MODE_11A */
+		IFM_IEEE80211_11B,		/* IEEE80211_MODE_11B */
+		IFM_IEEE80211_11G,		/* IEEE80211_MODE_11G */
+		IFM_IEEE80211_FH,		/* IEEE80211_MODE_FH */
+		TURBO(IFM_IEEE80211_11A),	/* IEEE80211_MODE_TURBO_A */
+		TURBO(IFM_IEEE80211_11G),	/* IEEE80211_MODE_TURBO_G */
+		TURBO(IFM_IEEE80211_11A),	/* IEEE80211_MODE_STURBO_A */
 	};
 	u_int mopt;
 
+	KASSERT(mode < IEEE80211_MODE_MAX, ("bad mode %u", mode));
 	mopt = mopts[mode];
+	KASSERT(mopts != 0 || mode == IEEE80211_MODE_AUTO,
+	    ("no media mapping for mode %u", mode));
+
 	ADD(ic, mword, mopt);	/* e.g. 11a auto */
 	if (ic->ic_caps & IEEE80211_C_IBSS)
 		ADD(ic, mword, mopt | IFM_IEEE80211_ADHOC);
@@ -451,6 +457,7 @@
 	if (ic->ic_caps & IEEE80211_C_MONITOR)
 		ADD(ic, mword, mopt | IFM_IEEE80211_MONITOR);
 #undef ADD
+#undef TURBO
 }
 
 /*