Sync with netbsd:

o #ifdef _KERNEL the fallback definition for DLT_IEEE802_11_RADIO
o fix many comments
o rename antenna stuff and fix units/reference signal
o change IEEE80211_RADIOTAP_DBM_TX_POWER from unsigned 16-bit value
  to a signed 8-bit value
o change IEEE80211_RADIOTAP_FLAGS from 16 bits to 8 bits to simplify
  padding requirements
o drop IEEE80211_RADIOTAP_TIME
o change IEEE80211_RADIOTAP_ANTENNA from 16 bits to 8 bits
o drop IEEE80211_RADIOTAP_PAD
o add channel flag definitions for outside the kernel so radiotap
  doesn't depend on stuff in ieee80211*.h

Obtained from:	NetBSD

1 files changed, 60 insertions, 43 deletions

diff --git a/sys/net80211/ieee80211_radiotap.h b/sys/net80211/ieee80211_radiotap.h
index d263d5393880..22d1bfdfbcc6 100644
--- a/sys/net80211/ieee80211_radiotap.h
+++ b/sys/net80211/ieee80211_radiotap.h
@@ -1,5 +1,5 @@
 /* $FreeBSD$ */
-/*	$NetBSD: $	*/
+/* $NetBSD: ieee80211_radiotap.h,v 1.3 2003/11/16 09:02:42 dyoung Exp $ */
 
 /*-
  * Copyright (c) 2003, 2004 David Young.  All rights reserved.
@@ -46,22 +46,24 @@
  * function of...") that I cannot set false expectations for lawyerly
  * readers.
  */
+#ifdef _KERNEL
 #ifndef DLT_IEEE802_11_RADIO
 #define	DLT_IEEE802_11_RADIO	127	/* 802.11 plus WLAN header */
 #endif
+#endif /* _KERNEL */
 
 /* The radio capture header precedes the 802.11 header. */
 struct ieee80211_radiotap_header {
 	u_int8_t	it_version;	/* Version 0. Only increases
 					 * for drastic changes,
 					 * introduction of compatible
-					 * new LTVs does not count.
+					 * new fields does not count.
 					 */
 	u_int8_t	it_pad;
 	u_int16_t       it_len;         /* length of the whole
 					 * header in bytes, including
 					 * it_version, it_pad,
-					 * it_len, and LTVs.
+					 * it_len, and data fields.
 					 */
 	u_int32_t       it_present;     /* A bitmap telling which
 					 * fields are present. Set bit 31
@@ -70,33 +72,51 @@ struct ieee80211_radiotap_header {
 					 * Additional extensions are made
 					 * by setting bit 31.
 					 */
-};
+} __attribute__((__packed__));
 
 /* Name                                 Data type       Units
  * ----                                 ---------       -----
  *
- * IEEE80211_RADIOTAP_CHANNEL           u_int8_t	MHz
+ * IEEE80211_RADIOTAP_TSFT              u_int64_t       microseconds
+ *
+ *      Value in microseconds of the MAC's 64-bit 802.11 Time
+ *      Synchronization Function timer when the first bit of the
+ *      MPDU arrived at the MAC. For received frames, only.
  *
- *      Tx/Rx channel number (for DSSS/OFDM/PBCC PHY)
+ * IEEE80211_RADIOTAP_CHANNEL           2 x u_int16_t   MHz, bitmap
+ *
+ *      Tx/Rx frequency in MHz, followed by flags (see below).
  *
  * IEEE80211_RADIOTAP_FHSS              u_int16_t       see below
  *
  *      For frequency-hopping radios, the hop set (first byte)
  *      and pattern (second byte).
  *
- * IEEE80211_RADIOTAP_RATE              u_int8_t	.5Mb/s
+ * IEEE80211_RADIOTAP_RATE              u_int8_t        500kb/s
+ *
+ *      Tx/Rx data rate
+ *
+ * IEEE80211_RADIOTAP_DBM_ANTSIGNAL     int8_t          decibels from
+ *                                                      one milliwatt (dBm)
+ *
+ *      RF signal power at the antenna, decibel difference from
+ *      one milliwatt.
+ *
+ * IEEE80211_RADIOTAP_DBM_ANTNOISE      int8_t          decibels from
+ *                                                      one milliwatt (dBm)
  *
- *      IEEE Tx/Rx data rate cookie (including basic rate flag)
+ *      RF noise power at the antenna, decibel difference from one
+ *      milliwatt.
  *
- * IEEE80211_RADIOTAP_DB_ANTSIGNAL      int16_t         decibel (dB)
- *              
- *      RF signal power at the antenna, measured from a fixed,
- *      arbitrary reference point.
+ * IEEE80211_RADIOTAP_DB_ANTSIGNAL      u_int8_t        decibel (dB)
  *
- * IEEE80211_RADIOTAP_DB_ANTNOISE       int16_t         decibel (dB)
+ *      RF signal power at the antenna, decibel difference from an
+ *      arbitrary, fixed reference.
  *
- *      RF noise power at the antenna in decibels from an arbitrary,
- *      fixed reference point.
+ * IEEE80211_RADIOTAP_DB_ANTNOISE       u_int8_t        decibel (dB)
+ *
+ *      RF noise power at the antenna, decibel difference from an
+ *      arbitrary, fixed reference point.
  *
  * IEEE80211_RADIOTAP_BARKER_CODE_LOCK  u_int16_t       unitless
  *
@@ -117,68 +137,65 @@ struct ieee80211_radiotap_header {
  *      set at factory calibration.  0 is max power.  Monotonically
  *      nondecreasing with lower power levels.
  *
- * IEEE80211_RADIOTAP_DBM_TX_POWER      u_int16_t       decibels from
- *                                                      milliwatt (dBm)
+ * IEEE80211_RADIOTAP_DBM_TX_POWER      int8_t          decibels from
+ *                                                      one milliwatt (dBm)
  *
  *      Transmit power expressed as dBm (decibels from a 1 milliwatt
  *      reference). This is the absolute power level measured at
  *      the antenna port.
  *
- * IEEE80211_RADIOTAP_TSFT              u_int64_t       microseconds
- *
- *      Value in microseconds of the MAC's 64-bit 802.11 Time
- *      Synchronization Function timer when the first bit of the
- *      MPDU arrived at the MAC. For received frames, only.
- *      Little-endian byte order.
- *
- * IEEE80211_RADIOTAP_FLAGS             u_int16_t       bitmap
+ * IEEE80211_RADIOTAP_FLAGS             u_int8_t        bitmap
  *
  *      Properties of transmitted and received frames. See flags
  *      defined below.
  *
- * IEEE80211_RADIOTAP_TIME              u_int32_t       microseconds
- *
- *      For radios that provide it: packet arrival time in
- *      microseconds. Prism hardware will provide this, but it is
- *      not known whether it marks the first or the last bit of
- *      the frame. Nor is it known where that bit has arrived
- *      (antenna, modem, MAC?) when the time is measured.
- *
- * IEEE80211_RADIOTAP_ANTENNA           u_int16_t       antenna index
+ * IEEE80211_RADIOTAP_ANTENNA           u_int8_t        antenna index
  *
  *      Unitless indication of the Rx/Tx antenna for this packet.
  *      The first antenna is antenna 0.
  */
 enum ieee80211_radiotap_type {
-	IEEE80211_RADIOTAP_PAD = 0,
+	IEEE80211_RADIOTAP_TSFT = 0,
 	IEEE80211_RADIOTAP_FLAGS = 1,
 	IEEE80211_RADIOTAP_RATE = 2,
 	IEEE80211_RADIOTAP_CHANNEL = 3,
 	IEEE80211_RADIOTAP_FHSS = 4,
-	IEEE80211_RADIOTAP_DB_ANTSIGNAL = 5,
-	IEEE80211_RADIOTAP_DB_ANTNOISE = 6,
+	IEEE80211_RADIOTAP_DBM_ANTSIGNAL = 5,
+	IEEE80211_RADIOTAP_DBM_ANTNOISE = 6,
 	IEEE80211_RADIOTAP_LOCK_QUALITY = 7,
 	IEEE80211_RADIOTAP_TX_ATTENUATION = 8,
 	IEEE80211_RADIOTAP_DB_TX_ATTENUATION = 9,
 	IEEE80211_RADIOTAP_DBM_TX_POWER = 10,
 	IEEE80211_RADIOTAP_ANTENNA = 11,
-	IEEE80211_RADIOTAP_TSFT = 12,
+	IEEE80211_RADIOTAP_DB_ANTSIGNAL = 12,
+	IEEE80211_RADIOTAP_DB_ANTNOISE = 13,
 	IEEE80211_RADIOTAP_EXT = 31,
-	IEEE80211_RADIOTAP_TIME = 32
 };
 
+#ifndef _KERNEL
+/* Channel flags. */
+#define IEEE80211_CHAN_TURBO    0x0010  /* Turbo channel */
+#define IEEE80211_CHAN_CCK      0x0020  /* CCK channel */
+#define IEEE80211_CHAN_OFDM     0x0040  /* OFDM channel */
+#define IEEE80211_CHAN_2GHZ     0x0080  /* 2 GHz spectrum channel. */
+#define IEEE80211_CHAN_5GHZ     0x0100  /* 5 GHz spectrum channel */
+#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) */
+#endif /* !_KERNEL */
+
 /* For IEEE80211_RADIOTAP_FLAGS */
-#define	IEEE80211_RADIOTAP_F_CFP	0x0001  /* sent/received
+#define	IEEE80211_RADIOTAP_F_CFP	0x01	/* sent/received
 						 * during CFP
 						 */
-#define	IEEE80211_RADIOTAP_F_SHORTPRE	0x0002  /* sent/received
+#define	IEEE80211_RADIOTAP_F_SHORTPRE	0x02	/* sent/received
 						 * with short
 						 * preamble
 						 */
-#define	IEEE80211_RADIOTAP_F_WEP	0x0004  /* sent/received
+#define	IEEE80211_RADIOTAP_F_WEP	0x04	/* sent/received
 						 * with WEP encryption
 						 */
-#define	IEEE80211_RADIOTAP_F_FRAG	0x0008  /* sent/received
+#define	IEEE80211_RADIOTAP_F_FRAG	0x08	/* sent/received
 						 * with fragmentation
 						 */