From owner-svn-src-head@FreeBSD.ORG  Sun Jun  7 23:16:11 2009
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id D62D3106564A;
	Sun,  7 Jun 2009 23:16:11 +0000 (UTC) (envelope-from sam@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 568CE8FC12;
	Sun,  7 Jun 2009 23:16:11 +0000 (UTC) (envelope-from sam@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n57NGADA008636;
	Sun, 7 Jun 2009 23:16:10 GMT (envelope-from sam@svn.freebsd.org)
Received: (from sam@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n57NGAuS008635;
	Sun, 7 Jun 2009 23:16:10 GMT (envelope-from sam@svn.freebsd.org)
Message-Id: <200906072316.n57NGAuS008635@svn.freebsd.org>
From: Sam Leffler <sam@FreeBSD.org>
Date: Sun, 7 Jun 2009 23:16:10 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r193665 - head/sys/net80211
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 07 Jun 2009 23:16:12 -0000

Author: sam
Date: Sun Jun  7 23:16:10 2009
New Revision: 193665
URL: http://svn.freebsd.org/changeset/base/193665

Log:
  use c99-style initializers

Modified:
  head/sys/net80211/ieee80211_crypto.c

Modified: head/sys/net80211/ieee80211_crypto.c
==============================================================================
--- head/sys/net80211/ieee80211_crypto.c	Sun Jun  7 23:00:40 2009	(r193664)
+++ head/sys/net80211/ieee80211_crypto.c	Sun Jun  7 23:16:10 2009	(r193665)
@@ -235,13 +235,13 @@ ieee80211_crypto_available(u_int cipher)
 
 /* XXX well-known names! */
 static const char *cipher_modnames[IEEE80211_CIPHER_MAX] = {
-	"wlan_wep",	/* IEEE80211_CIPHER_WEP */
-	"wlan_tkip",	/* IEEE80211_CIPHER_TKIP */
-	"wlan_aes_ocb",	/* IEEE80211_CIPHER_AES_OCB */
-	"wlan_ccmp",	/* IEEE80211_CIPHER_AES_CCM */
-	"#4",		/* reserved */
-	"wlan_ckip",	/* IEEE80211_CIPHER_CKIP */
-	"wlan_none",	/* IEEE80211_CIPHER_NONE */
+	[IEEE80211_CIPHER_WEP]	   = "wlan_wep",
+	[IEEE80211_CIPHER_TKIP]	   = "wlan_tkip",
+	[IEEE80211_CIPHER_AES_OCB] = "wlan_aes_ocb",
+	[IEEE80211_CIPHER_AES_CCM] = "wlan_ccmp",
+	[IEEE80211_CIPHER_TKIPMIC] = "#4",	/* NB: reserved */
+	[IEEE80211_CIPHER_CKIP]	   = "wlan_ckip",
+	[IEEE80211_CIPHER_NONE]	   = "wlan_none",
 };
 
 /*