svn commit: r245029 - user/adrian/ath_radar_stuff/src/pktlog

[Adrian Chadd]

Author: adrian
Date: Fri Jan  4 05:51:08 2013
New Revision: 245029
URL: http://svnweb.freebsd.org/changeset/base/245029

Log:
  Add radiotap xchannel field support.

Modified:
  user/adrian/ath_radar_stuff/src/pktlog/radiotap.c
  user/adrian/ath_radar_stuff/src/pktlog/radiotap.h

Modified: user/adrian/ath_radar_stuff/src/pktlog/radiotap.c
==============================================================================
--- user/adrian/ath_radar_stuff/src/pktlog/radiotap.c	Fri Jan  4 05:50:44 2013	(r245028)
+++ user/adrian/ath_radar_stuff/src/pktlog/radiotap.c	Fri Jan  4 05:51:08 2013	(r245029)
@@ -38,6 +38,7 @@ static const struct radiotap_align_size 
 	[IEEE80211_RADIOTAP_RTS_RETRIES] = { .align = 1, .size = 1, },
 	[IEEE80211_RADIOTAP_DATA_RETRIES] = { .align = 1, .size = 1, },
 	[IEEE80211_RADIOTAP_MCS] = { .align = 1, .size = 3, },
+	[IEEE80211_RADIOTAP_XCHANNEL] = { .align = 8, .size = 8 },
 	[IEEE80211_RADIOTAP_AMPDU_STATUS] = { .align = 4, .size = 8, },
 	/*
 	 * add more here as they are defined in radiotap.h

Modified: user/adrian/ath_radar_stuff/src/pktlog/radiotap.h
==============================================================================
--- user/adrian/ath_radar_stuff/src/pktlog/radiotap.h	Fri Jan  4 05:50:44 2013	(r245028)
+++ user/adrian/ath_radar_stuff/src/pktlog/radiotap.h	Fri Jan  4 05:51:08 2013	(r245029)
@@ -175,6 +175,17 @@ struct ieee80211_radiotap_header {
  *
  *     Number of unicast retries a transmitted frame used.
  *
+ * IEEE80211_RADIOTAP_XCHANNEL          uint32_t        bitmap
+ *                                      uint16_t        MHz
+ *                                      uint8_t         channel number
+ *                                      int8_t          .5 dBm
+ *
+ *      Extended channel specification: flags (see below) followed by
+ *      frequency in MHz, the corresponding IEEE channel number, and
+ *      finally the maximum regulatory transmit power cap in .5 dBm
+ *      units.  This property supersedes IEEE80211_RADIOTAP_CHANNEL
+ *      and only one of the two should be present.
+ *
  * IEEE80211_RADIOTAP_MCS	u8, u8, u8		unitless
  *
  *     Contains a bitmap of known fields/flags, the flags, and
@@ -203,7 +214,7 @@ enum ieee80211_radiotap_type {
 	IEEE80211_RADIOTAP_TX_FLAGS = 15,
 	IEEE80211_RADIOTAP_RTS_RETRIES = 16,
 	IEEE80211_RADIOTAP_DATA_RETRIES = 17,
-
+	IEEE80211_RADIOTAP_XCHANNEL = 18,
 	IEEE80211_RADIOTAP_MCS = 19,
 	IEEE80211_RADIOTAP_AMPDU_STATUS = 20,
 
@@ -222,6 +233,9 @@ enum ieee80211_radiotap_type {
 #define	IEEE80211_CHAN_PASSIVE	0x0200	/* Only passive scan allowed */
 #define	IEEE80211_CHAN_DYN	0x0400	/* Dynamic CCK-OFDM channel */
 #define	IEEE80211_CHAN_GFSK	0x0800	/* GFSK channel (FHSS PHY) */
+#define	IEEE80211_CHAN_HT20	0x00010000 /* HT 20 channel */
+#define	IEEE80211_CHAN_HT40U	0x00020000 /* HT 40 channel w/ ext above */
+#define	IEEE80211_CHAN_HT40D	0x00040000 /* HT 40 channel w/ ext below */
 
 /* For IEEE80211_RADIOTAP_FLAGS */
 #define	IEEE80211_RADIOTAP_F_CFP	0x01	/* sent/received