svn commit: r187853 - 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: Wed Jan 28 19:38:09 2009
New Revision: 187853
URL: http://svn.freebsd.org/changeset/base/187853

Log:
  merge r187793: define IEEE80211_CHAN_108A and IEEE80211_CHAN_108G
  in terms of their non-turbo names

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.h

Modified: projects/vap7/sys/net80211/_ieee80211.h
==============================================================================
--- projects/vap7/sys/net80211/_ieee80211.h	Wed Jan 28 19:37:25 2009	(r187852)
+++ projects/vap7/sys/net80211/_ieee80211.h	Wed Jan 28 19:38:09 2009	(r187853)
@@ -186,9 +186,9 @@ struct ieee80211_channel {
 #define	IEEE80211_CHAN_G \
 	(IEEE80211_CHAN_2GHZ | IEEE80211_CHAN_DYN)
 #define IEEE80211_CHAN_108A \
-	(IEEE80211_CHAN_5GHZ | IEEE80211_CHAN_OFDM | IEEE80211_CHAN_TURBO)
+	(IEEE80211_CHAN_A | IEEE80211_CHAN_TURBO)
 #define	IEEE80211_CHAN_108G \
-	(IEEE80211_CHAN_2GHZ | IEEE80211_CHAN_OFDM | IEEE80211_CHAN_TURBO)
+	(IEEE80211_CHAN_PUREG | IEEE80211_CHAN_TURBO)
 #define	IEEE80211_CHAN_ST \
 	(IEEE80211_CHAN_108A | IEEE80211_CHAN_STURBO)