]> git.ipfire.org Git - thirdparty/hostap.git/commitdiff
radiotap: Update radiotap parser
authorJouni Malinen <j@w1.fi>
Sun, 7 Feb 2021 11:25:13 +0000 (13:25 +0200)
committerJouni Malinen <j@w1.fi>
Sun, 7 Feb 2021 11:25:13 +0000 (13:25 +0200)
Update the radiotap parser to the latest version of the
http://git.sipsolutions.net/radiotap.git/ library.

Signed-off-by: Jouni Malinen <j@w1.fi>
src/utils/radiotap.c
src/utils/radiotap.h

index 71996eb7908f5e29b9a48f25ee03336d2a250917..6dfe3053eec1d6f5a792db9cf3aa8cf7c4960421 100644 (file)
@@ -8,10 +8,8 @@
  * it under the terms of the GNU General Public License version 2 as
  * published by the Free Software Foundation.
  *
- * Alternatively, this software may be distributed under the terms of BSD
- * license.
- *
- * See COPYING for more details.
+ * Alternatively, this software may be distributed under the terms of ISC
+ * license, see COPYING for more details.
  */
 #include "platform.h"
 #include "radiotap_iter.h"
@@ -39,6 +37,8 @@ static const struct radiotap_align_size rtap_namespace_sizes[] = {
        [IEEE80211_RADIOTAP_DATA_RETRIES] = { .align = 1, .size = 1, },
        [IEEE80211_RADIOTAP_MCS] = { .align = 1, .size = 3, },
        [IEEE80211_RADIOTAP_AMPDU_STATUS] = { .align = 4, .size = 8, },
+       [IEEE80211_RADIOTAP_VHT] = { .align = 2, .size = 12, },
+       [IEEE80211_RADIOTAP_TIMESTAMP] = { .align = 8, .size = 12, },
        /*
         * add more here as they are defined in radiotap.h
         */
@@ -222,7 +222,7 @@ static int find_override(struct ieee80211_radiotap_iterator *iterator,
  * present fields.  @this_arg can be changed by the caller (eg,
  * incremented to move inside a compound argument like
  * IEEE80211_RADIOTAP_CHANNEL).  The args pointed to are in
- * little-endian format whatever the endianess of your CPU.
+ * little-endian format whatever the endianness of your CPU.
  *
  * Alignment Gotcha:
  * You must take care when dereferencing iterator.this_arg
index 460af23d8124657c22d0996656cbe7b4be840fd9..17bb6330d6b8e6170ca18b2cb192f883f2d3959b 100644 (file)
-/*-
- * Copyright (c) 2003, 2004 David Young.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. The name of David Young may not be used to endorse or promote
- *    products derived from this software without specific prior
- *    written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY DAVID YOUNG ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
- * PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL DAVID
- * YOUNG BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
- * TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY
- * OF SUCH DAMAGE.
- */
-
 /*
- * Modifications to fit into the linux IEEE 802.11 stack,
- * Mike Kershaw (dragorn@kismetwireless.net)
+ * Copyright (c) 2017          Intel Deutschland GmbH
+ *
+ * Permission to use, copy, modify, and/or distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
+#ifndef __RADIOTAP_H
+#define __RADIOTAP_H
 
-#ifndef IEEE80211RADIOTAP_H
-#define IEEE80211RADIOTAP_H
-
-#include <stdint.h>
-
-/* Base version of the radiotap packet header data */
-#define PKTHDR_RADIOTAP_VERSION                0
-
-/* A generic radio capture format is desirable. There is one for
- * Linux, but it is neither rigidly defined (there were not even
- * units given for some fields) nor easily extensible.
- *
- * I suggest the following extensible radio capture format. It is
- * based on a bitmap indicating which fields are present.
- *
- * I am trying to describe precisely what the application programmer
- * should expect in the following, and for that reason I tell the
- * units and origin of each measurement (where it applies), or else I
- * use sufficiently weaselly language ("is a monotonically nondecreasing
- * function of...") that I cannot set false expectations for lawyerly
- * readers.
- */
-
-/* The radio capture header precedes the 802.11 header.
- * All data in the header is little endian on all platforms.
+/**
+ * struct ieee82011_radiotap_header - base radiotap header
  */
 struct ieee80211_radiotap_header {
-       uint8_t it_version;     /* Version 0. Only increases
-                                * for drastic changes,
-                                * introduction of compatible
-                                * new fields does not count.
-                                */
+       /**
+        * @it_version: radiotap version, always 0
+        */
+       uint8_t it_version;
+
+       /**
+        * @it_pad: padding (or alignment)
+        */
        uint8_t it_pad;
-       le16 it_len;            /* length of the whole
-                                * header in bytes, including
-                                * it_version, it_pad,
-                                * it_len, and data fields.
-                                */
-       le32 it_present;        /* A bitmap telling which
-                                * fields are present. Set bit 31
-                                * (0x80000000) to extend the
-                                * bitmap by another 32 bits.
-                                * Additional extensions are made
-                                * by setting bit 31.
-                                */
-};
 
-/* Name                                 Data type    Units
- * ----                                 ---------    -----
- *
- * IEEE80211_RADIOTAP_TSFT              __le64       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.
- *
- * IEEE80211_RADIOTAP_CHANNEL           2 x uint16_t   MHz, bitmap
- *
- *      Tx/Rx frequency in MHz, followed by flags (see below).
- *
- * IEEE80211_RADIOTAP_FHSS              uint16_t       see below
- *
- *      For frequency-hopping radios, the hop set (first byte)
- *      and pattern (second byte).
- *
- * IEEE80211_RADIOTAP_RATE              u8           500kb/s
- *
- *      Tx/Rx data rate
- *
- * IEEE80211_RADIOTAP_DBM_ANTSIGNAL     s8           decibels from
- *                                                   one milliwatt (dBm)
- *
- *      RF signal power at the antenna, decibel difference from
- *      one milliwatt.
- *
- * IEEE80211_RADIOTAP_DBM_ANTNOISE      s8           decibels from
- *                                                   one milliwatt (dBm)
- *
- *      RF noise power at the antenna, decibel difference from one
- *      milliwatt.
- *
- * IEEE80211_RADIOTAP_DB_ANTSIGNAL      u8           decibel (dB)
- *
- *      RF signal power at the antenna, decibel difference from an
- *      arbitrary, fixed reference.
- *
- * IEEE80211_RADIOTAP_DB_ANTNOISE       u8           decibel (dB)
- *
- *      RF noise power at the antenna, decibel difference from an
- *      arbitrary, fixed reference point.
- *
- * IEEE80211_RADIOTAP_LOCK_QUALITY      uint16_t       unitless
- *
- *      Quality of Barker code lock. Unitless. Monotonically
- *      nondecreasing with "better" lock strength. Called "Signal
- *      Quality" in datasheets.  (Is there a standard way to measure
- *      this?)
- *
- * IEEE80211_RADIOTAP_TX_ATTENUATION    uint16_t       unitless
- *
- *      Transmit power expressed as unitless distance from max
- *      power set at factory calibration.  0 is max power.
- *      Monotonically nondecreasing with lower power levels.
- *
- * IEEE80211_RADIOTAP_DB_TX_ATTENUATION uint16_t       decibels (dB)
- *
- *      Transmit power expressed as decibel distance from max power
- *      set at factory calibration.  0 is max power.  Monotonically
- *      nondecreasing with lower power levels.
- *
- * IEEE80211_RADIOTAP_DBM_TX_POWER      s8           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_FLAGS             u8           bitmap
- *
- *      Properties of transmitted and received frames. See flags
- *      defined below.
- *
- * IEEE80211_RADIOTAP_ANTENNA           u8           antenna index
- *
- *      Unitless indication of the Rx/Tx antenna for this packet.
- *      The first antenna is antenna 0.
- *
- * IEEE80211_RADIOTAP_RX_FLAGS          uint16_t       bitmap
- *
- *     Properties of received frames. See flags defined below.
- *
- * IEEE80211_RADIOTAP_TX_FLAGS          uint16_t       bitmap
- *
- *     Properties of transmitted frames. See flags defined below.
- *
- * IEEE80211_RADIOTAP_RTS_RETRIES       u8           data
- *
- *     Number of rts retries a transmitted frame used.
- *
- * IEEE80211_RADIOTAP_DATA_RETRIES      u8           data
- *
- *     Number of unicast retries a transmitted frame used.
- *
- * IEEE80211_RADIOTAP_MCS      u8, u8, u8              unitless
- *
- *     Contains a bitmap of known fields/flags, the flags, and
- *     the MCS index.
- *
- * IEEE80211_RADIOTAP_AMPDU_STATUS     u32, u16, u8, u8        unitlesss
- *
- *     Contains the AMPDU information for the subframe.
- */
-enum ieee80211_radiotap_type {
+       /**
+        * @it_len: overall radiotap header length
+        */
+       le16 it_len;
+
+       /**
+        * @it_present: (first) present word
+        */
+       le32 it_present;
+} __packed;
+
+/* version is always 0 */
+#define PKTHDR_RADIOTAP_VERSION        0
+
+/* see the radiotap website for the descriptions */
+enum ieee80211_radiotap_presence {
        IEEE80211_RADIOTAP_TSFT = 0,
        IEEE80211_RADIOTAP_FLAGS = 1,
        IEEE80211_RADIOTAP_RATE = 2,
@@ -203,9 +64,11 @@ enum ieee80211_radiotap_type {
        IEEE80211_RADIOTAP_TX_FLAGS = 15,
        IEEE80211_RADIOTAP_RTS_RETRIES = 16,
        IEEE80211_RADIOTAP_DATA_RETRIES = 17,
-
+       /* 18 is XChannel, but it's not defined yet */
        IEEE80211_RADIOTAP_MCS = 19,
        IEEE80211_RADIOTAP_AMPDU_STATUS = 20,
+       IEEE80211_RADIOTAP_VHT = 21,
+       IEEE80211_RADIOTAP_TIMESTAMP = 22,
 
        /* valid in every it_present bitmap, even vendor namespaces */
        IEEE80211_RADIOTAP_RADIOTAP_NAMESPACE = 29,
@@ -213,79 +76,125 @@ enum ieee80211_radiotap_type {
        IEEE80211_RADIOTAP_EXT = 31
 };
 
-/* 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) */
+/* for IEEE80211_RADIOTAP_FLAGS */
+enum ieee80211_radiotap_flags {
+       IEEE80211_RADIOTAP_F_CFP = 0x01,
+       IEEE80211_RADIOTAP_F_SHORTPRE = 0x02,
+       IEEE80211_RADIOTAP_F_WEP = 0x04,
+       IEEE80211_RADIOTAP_F_FRAG = 0x08,
+       IEEE80211_RADIOTAP_F_FCS = 0x10,
+       IEEE80211_RADIOTAP_F_DATAPAD = 0x20,
+       IEEE80211_RADIOTAP_F_BADFCS = 0x40,
+};
+
+/* for IEEE80211_RADIOTAP_CHANNEL */
+enum ieee80211_radiotap_channel_flags {
+       IEEE80211_CHAN_CCK = 0x0020,
+       IEEE80211_CHAN_OFDM = 0x0040,
+       IEEE80211_CHAN_2GHZ = 0x0080,
+       IEEE80211_CHAN_5GHZ = 0x0100,
+       IEEE80211_CHAN_DYN = 0x0400,
+       IEEE80211_CHAN_HALF = 0x4000,
+       IEEE80211_CHAN_QUARTER = 0x8000,
+};
+
+/* for IEEE80211_RADIOTAP_RX_FLAGS */
+enum ieee80211_radiotap_rx_flags {
+       IEEE80211_RADIOTAP_F_RX_BADPLCP = 0x0002,
+};
+
+/* for IEEE80211_RADIOTAP_TX_FLAGS */
+enum ieee80211_radiotap_tx_flags {
+       IEEE80211_RADIOTAP_F_TX_FAIL = 0x0001,
+       IEEE80211_RADIOTAP_F_TX_CTS = 0x0002,
+       IEEE80211_RADIOTAP_F_TX_RTS = 0x0004,
+       IEEE80211_RADIOTAP_F_TX_NOACK = 0x0008,
+};
+
+/* for IEEE80211_RADIOTAP_MCS "have" flags */
+enum ieee80211_radiotap_mcs_have {
+       IEEE80211_RADIOTAP_MCS_HAVE_BW = 0x01,
+       IEEE80211_RADIOTAP_MCS_HAVE_MCS = 0x02,
+       IEEE80211_RADIOTAP_MCS_HAVE_GI = 0x04,
+       IEEE80211_RADIOTAP_MCS_HAVE_FMT = 0x08,
+       IEEE80211_RADIOTAP_MCS_HAVE_FEC = 0x10,
+       IEEE80211_RADIOTAP_MCS_HAVE_STBC = 0x20,
+};
 
-/* For IEEE80211_RADIOTAP_FLAGS */
-#define        IEEE80211_RADIOTAP_F_CFP        0x01    /* sent/received
-                                                * during CFP
-                                                */
-#define        IEEE80211_RADIOTAP_F_SHORTPRE   0x02    /* sent/received
-                                                * with short
-                                                * preamble
-                                                */
-#define        IEEE80211_RADIOTAP_F_WEP        0x04    /* sent/received
-                                                * with WEP encryption
-                                                */
-#define        IEEE80211_RADIOTAP_F_FRAG       0x08    /* sent/received
-                                                * with fragmentation
-                                                */
-#define        IEEE80211_RADIOTAP_F_FCS        0x10    /* frame includes FCS */
-#define        IEEE80211_RADIOTAP_F_DATAPAD    0x20    /* frame has padding between
-                                                * 802.11 header and payload
-                                                * (to 32-bit boundary)
-                                                */
-#define IEEE80211_RADIOTAP_F_BADFCS    0x40    /* frame failed FCS check */
+enum ieee80211_radiotap_mcs_flags {
+       IEEE80211_RADIOTAP_MCS_BW_MASK = 0x03,
+       IEEE80211_RADIOTAP_MCS_BW_20 = 0,
+       IEEE80211_RADIOTAP_MCS_BW_40 = 1,
+       IEEE80211_RADIOTAP_MCS_BW_20L = 2,
+       IEEE80211_RADIOTAP_MCS_BW_20U = 3,
+
+       IEEE80211_RADIOTAP_MCS_SGI = 0x04,
+       IEEE80211_RADIOTAP_MCS_FMT_GF = 0x08,
+       IEEE80211_RADIOTAP_MCS_FEC_LDPC = 0x10,
+       IEEE80211_RADIOTAP_MCS_STBC_MASK = 0x60,
+       IEEE80211_RADIOTAP_MCS_STBC_1 = 1,
+       IEEE80211_RADIOTAP_MCS_STBC_2 = 2,
+       IEEE80211_RADIOTAP_MCS_STBC_3 = 3,
+       IEEE80211_RADIOTAP_MCS_STBC_SHIFT = 5,
+};
 
-/* For IEEE80211_RADIOTAP_RX_FLAGS */
-#define IEEE80211_RADIOTAP_F_RX_BADPLCP        0x0002 /* bad PLCP */
+/* for IEEE80211_RADIOTAP_AMPDU_STATUS */
+enum ieee80211_radiotap_ampdu_flags {
+       IEEE80211_RADIOTAP_AMPDU_REPORT_ZEROLEN = 0x0001,
+       IEEE80211_RADIOTAP_AMPDU_IS_ZEROLEN = 0x0002,
+       IEEE80211_RADIOTAP_AMPDU_LAST_KNOWN = 0x0004,
+       IEEE80211_RADIOTAP_AMPDU_IS_LAST = 0x0008,
+       IEEE80211_RADIOTAP_AMPDU_DELIM_CRC_ERR = 0x0010,
+       IEEE80211_RADIOTAP_AMPDU_DELIM_CRC_KNOWN = 0x0020,
+};
 
-/* For IEEE80211_RADIOTAP_TX_FLAGS */
-#define IEEE80211_RADIOTAP_F_TX_FAIL   0x0001  /* failed due to excessive
-                                                * retries */
-#define IEEE80211_RADIOTAP_F_TX_CTS    0x0002  /* used cts 'protection' */
-#define IEEE80211_RADIOTAP_F_TX_RTS    0x0004  /* used rts/cts handshake */
-#define IEEE80211_RADIOTAP_F_TX_NOACK  0x0008  /* don't expect an ACK */
+/* for IEEE80211_RADIOTAP_VHT */
+enum ieee80211_radiotap_vht_known {
+       IEEE80211_RADIOTAP_VHT_KNOWN_STBC = 0x0001,
+       IEEE80211_RADIOTAP_VHT_KNOWN_TXOP_PS_NA = 0x0002,
+       IEEE80211_RADIOTAP_VHT_KNOWN_GI = 0x0004,
+       IEEE80211_RADIOTAP_VHT_KNOWN_SGI_NSYM_DIS = 0x0008,
+       IEEE80211_RADIOTAP_VHT_KNOWN_LDPC_EXTRA_OFDM_SYM = 0x0010,
+       IEEE80211_RADIOTAP_VHT_KNOWN_BEAMFORMED = 0x0020,
+       IEEE80211_RADIOTAP_VHT_KNOWN_BANDWIDTH = 0x0040,
+       IEEE80211_RADIOTAP_VHT_KNOWN_GROUP_ID = 0x0080,
+       IEEE80211_RADIOTAP_VHT_KNOWN_PARTIAL_AID = 0x0100,
+};
 
-/* For IEEE80211_RADIOTAP_AMPDU_STATUS */
-#define IEEE80211_RADIOTAP_AMPDU_REPORT_ZEROLEN                0x0001
-#define IEEE80211_RADIOTAP_AMPDU_IS_ZEROLEN            0x0002
-#define IEEE80211_RADIOTAP_AMPDU_LAST_KNOWN            0x0004
-#define IEEE80211_RADIOTAP_AMPDU_IS_LAST               0x0008
-#define IEEE80211_RADIOTAP_AMPDU_DELIM_CRC_ERR         0x0010
-#define IEEE80211_RADIOTAP_AMPDU_DELIM_CRC_KNOWN       0x0020
+enum ieee80211_radiotap_vht_flags {
+       IEEE80211_RADIOTAP_VHT_FLAG_STBC = 0x01,
+       IEEE80211_RADIOTAP_VHT_FLAG_TXOP_PS_NA = 0x02,
+       IEEE80211_RADIOTAP_VHT_FLAG_SGI = 0x04,
+       IEEE80211_RADIOTAP_VHT_FLAG_SGI_NSYM_M10_9 = 0x08,
+       IEEE80211_RADIOTAP_VHT_FLAG_LDPC_EXTRA_OFDM_SYM = 0x10,
+       IEEE80211_RADIOTAP_VHT_FLAG_BEAMFORMED = 0x20,
+};
 
-/* For IEEE80211_RADIOTAP_MCS */
-#define IEEE80211_RADIOTAP_MCS_HAVE_BW         0x01
-#define IEEE80211_RADIOTAP_MCS_HAVE_MCS                0x02
-#define IEEE80211_RADIOTAP_MCS_HAVE_GI         0x04
-#define IEEE80211_RADIOTAP_MCS_HAVE_FMT                0x08
-#define IEEE80211_RADIOTAP_MCS_HAVE_FEC                0x10
-#define IEEE80211_RADIOTAP_MCS_HAVE_STBC       0x20
-#define IEEE80211_RADIOTAP_MCS_HAVE_NESS       0x40
-#define IEEE80211_RADIOTAP_MCS_NESS_BIT1       0x80
+enum ieee80211_radiotap_vht_coding {
+       IEEE80211_RADIOTAP_CODING_LDPC_USER0 = 0x01,
+       IEEE80211_RADIOTAP_CODING_LDPC_USER1 = 0x02,
+       IEEE80211_RADIOTAP_CODING_LDPC_USER2 = 0x04,
+       IEEE80211_RADIOTAP_CODING_LDPC_USER3 = 0x08,
+};
 
+/* for IEEE80211_RADIOTAP_TIMESTAMP */
+enum ieee80211_radiotap_timestamp_unit_spos {
+       IEEE80211_RADIOTAP_TIMESTAMP_UNIT_MASK = 0x000F,
+       IEEE80211_RADIOTAP_TIMESTAMP_UNIT_MS = 0x0000,
+       IEEE80211_RADIOTAP_TIMESTAMP_UNIT_US = 0x0001,
+       IEEE80211_RADIOTAP_TIMESTAMP_UNIT_NS = 0x0003,
+       IEEE80211_RADIOTAP_TIMESTAMP_SPOS_MASK = 0x00F0,
+       IEEE80211_RADIOTAP_TIMESTAMP_SPOS_BEGIN_MDPU = 0x0000,
+       IEEE80211_RADIOTAP_TIMESTAMP_SPOS_PLCP_SIG_ACQ = 0x0010,
+       IEEE80211_RADIOTAP_TIMESTAMP_SPOS_EO_PPDU = 0x0020,
+       IEEE80211_RADIOTAP_TIMESTAMP_SPOS_EO_MPDU = 0x0030,
+       IEEE80211_RADIOTAP_TIMESTAMP_SPOS_UNKNOWN = 0x00F0,
+};
 
-#define IEEE80211_RADIOTAP_MCS_BW_MASK         0x03
-#define                IEEE80211_RADIOTAP_MCS_BW_20    0
-#define                IEEE80211_RADIOTAP_MCS_BW_40    1
-#define                IEEE80211_RADIOTAP_MCS_BW_20L   2
-#define                IEEE80211_RADIOTAP_MCS_BW_20U   3
-#define IEEE80211_RADIOTAP_MCS_SGI             0x04
-#define IEEE80211_RADIOTAP_MCS_FMT_GF          0x08
-#define IEEE80211_RADIOTAP_MCS_FEC_LDPC                0x10
-#define IEEE80211_RADIOTAP_MCS_STBC_MASK       0x60
-#define IEEE80211_RADIOTAP_MCS_STBC_SHIFT      5
-#define                IEEE80211_RADIOTAP_MCS_STBC_1   1
-#define                IEEE80211_RADIOTAP_MCS_STBC_2   2
-#define                IEEE80211_RADIOTAP_MCS_STBC_3   3
-#define IEEE80211_RADIOTAP_MCS_NESS_BIT0       0x80
+enum ieee80211_radiotap_timestamp_flags {
+       IEEE80211_RADIOTAP_TIMESTAMP_FLAG_64BIT = 0x00,
+       IEEE80211_RADIOTAP_TIMESTAMP_FLAG_32BIT = 0x01,
+       IEEE80211_RADIOTAP_TIMESTAMP_FLAG_ACCURACY = 0x02,
+};
 
-#endif                         /* IEEE80211_RADIOTAP_H */
+#endif /* __RADIOTAP_H */