svn commit: r187855 - 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:39:43 2009
New Revision: 187855
URL: http://svn.freebsd.org/changeset/base/187855

Log:
  merge r187796: fill in ieee channel #'s and max tx power

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:38:53 2009	(r187854)
+++ projects/vap7/sys/net80211/_ieee80211.h	Wed Jan 28 19:39:43 2009	(r187855)
@@ -276,12 +276,15 @@ struct ieee80211_channel {
 /* dynamic state */
 #define	IEEE80211_CHANSTATE_RADAR	0x01	/* radar detected */
 #define	IEEE80211_CHANSTATE_CACDONE	0x02	/* CAC completed */
+#define	IEEE80211_CHANSTATE_CWINT	0x04	/* interference detected */
 #define	IEEE80211_CHANSTATE_NORADAR	0x10	/* post notify on radar clear */
 
 #define	IEEE80211_IS_CHAN_RADAR(_c) \
 	(((_c)->ic_state & IEEE80211_CHANSTATE_RADAR) != 0)
 #define	IEEE80211_IS_CHAN_CACDONE(_c) \
 	(((_c)->ic_state & IEEE80211_CHANSTATE_CACDONE) != 0)
+#define	IEEE80211_IS_CHAN_CWINT(_c) \
+	(((_c)->ic_state & IEEE80211_CHANSTATE_CWINT) != 0)
 
 /* ni_chan encoding for FH phy */
 #define	IEEE80211_FH_CHANMOD	80