svn commit: r193665 - head/sys/net80211

Sam Leffler sam at FreeBSD.org
Sun Jun 7 23:16:12 UTC 2009


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",
 };
 
 /*


More information about the svn-src-all mailing list