svn commit: r188794 - in projects/vap7/sys: . contrib/pf dev dev/ath dev/ath/ath_hal dev/ath/ath_hal/ar5210 dev/ath/ath_hal/ar5211 dev/ath/ath_hal/ar5212 dev/ath/ath_hal/ar5312 dev/ath/ath_hal/ar54...

[Sam Leffler]

Author: sam
Date: Thu Feb 19 05:48:59 2009
New Revision: 188794
URL: http://svn.freebsd.org/changeset/base/188794

Log:
  merge r188777: use c99 initializer

Modified:
  projects/vap7/sys/   (props changed)
  projects/vap7/sys/contrib/pf/   (props changed)
  projects/vap7/sys/dev/   (props changed)
  projects/vap7/sys/dev/ath/   (props changed)
  projects/vap7/sys/dev/ath/ath_hal/   (props changed)
  projects/vap7/sys/dev/ath/ath_hal/ar5210/   (props changed)
  projects/vap7/sys/dev/ath/ath_hal/ar5211/   (props changed)
  projects/vap7/sys/dev/ath/ath_hal/ar5212/   (props changed)
  projects/vap7/sys/dev/ath/ath_hal/ar5312/   (props changed)
  projects/vap7/sys/dev/ath/ath_hal/ar5416/   (props changed)
  projects/vap7/sys/dev/cxgb/   (props changed)
  projects/vap7/sys/dev/usb2/   (props changed)
  projects/vap7/sys/i386/conf/USB2   (props changed)
  projects/vap7/sys/modules/usb2/   (props changed)
  projects/vap7/sys/net80211/   (props changed)
  projects/vap7/sys/net80211/ieee80211_scan_sta.c

Modified: projects/vap7/sys/net80211/ieee80211_scan_sta.c
==============================================================================
--- projects/vap7/sys/net80211/ieee80211_scan_sta.c	Thu Feb 19 05:48:23 2009	(r188793)
+++ projects/vap7/sys/net80211/ieee80211_scan_sta.c	Thu Feb 19 05:48:59 2009	(r188794)
@@ -405,17 +405,20 @@ find11gchannel(struct ieee80211com *ic, 
 	}
 	return NULL;
 }
+
 static const u_int chanflags[IEEE80211_MODE_MAX] = {
-	IEEE80211_CHAN_B,	/* IEEE80211_MODE_AUTO */
-	IEEE80211_CHAN_A,	/* IEEE80211_MODE_11A */
-	IEEE80211_CHAN_B,	/* IEEE80211_MODE_11B */
-	IEEE80211_CHAN_G,	/* IEEE80211_MODE_11G */
-	IEEE80211_CHAN_FHSS,	/* IEEE80211_MODE_FH */
-	IEEE80211_CHAN_A,	/* IEEE80211_MODE_TURBO_A (check base channel)*/
-	IEEE80211_CHAN_G,	/* IEEE80211_MODE_TURBO_G */
-	IEEE80211_CHAN_ST,	/* IEEE80211_MODE_STURBO_A */
-	IEEE80211_CHAN_A,	/* IEEE80211_MODE_11NA (check legacy) */
-	IEEE80211_CHAN_G,	/* IEEE80211_MODE_11NG (check legacy) */
+	[IEEE80211_MODE_AUTO]	  = IEEE80211_CHAN_B,
+	[IEEE80211_MODE_11A]	  = IEEE80211_CHAN_A,
+	[IEEE80211_MODE_11B]	  = IEEE80211_CHAN_B,
+	[IEEE80211_MODE_11G]	  = IEEE80211_CHAN_G,
+	[IEEE80211_MODE_FH]	  = IEEE80211_CHAN_FHSS,
+	/* check base channel */
+	[IEEE80211_MODE_TURBO_A]  = IEEE80211_CHAN_A,
+	[IEEE80211_MODE_TURBO_G]  = IEEE80211_CHAN_G,
+	[IEEE80211_MODE_STURBO_A] = IEEE80211_CHAN_ST,
+	/* check legacy */
+	[IEEE80211_MODE_11NA]	  = IEEE80211_CHAN_A,
+	[IEEE80211_MODE_11NG]	  = IEEE80211_CHAN_G,
 };
 
 static void