Provide PHY type and band information in the 802.11 pseudo-header.

Provide that information so that the "802.11 radio information" protocol
can indicate whether a packet was 802.11 legacy/11b/11a/11g/11n/11ac,
and possibly whether it's 2.4 GHz or 5 GHz 11n.  (Sometimes the center
frequency might not be supplied, so the band information can be useful.)

Also, provide some 11ac information, now that we can distinguish between
11n and 11ac.  Don't calculate the data rate from the MCS index unless
it's 11n; we don't yet have code to calculate it for 11ac.

For radiotap, only provide guard interval information for 11n and 11ac,
not for earlier standards.

Handle the 11ac flag in the Peek remote protocol.

For Peek tagged files, the "extension flags" are 11n/11ac flags, so we
don't have to check for the "MCS used" bit in order to decide that the
packet is 11n or 11ac or to decide whether to provide the "bandwidth" or
"short GI" information.

Change-Id: Ia8a1a9b11a35243ed84eb4e72c384cc77512b098
Reviewed-on: https://code.wireshark.org/review/9032
Reviewed-by: Guy Harris <guy@alum.mit.edu>

5 files changed, 217 insertions, 140 deletions

diff --git a/wiretap/commview.c b/wiretap/commview.c
index 57de7605cf..d995e034a0 100644
--- a/wiretap/commview.c
+++ b/wiretap/commview.c
@@ -69,6 +69,16 @@ typedef struct commview_header {
 #define FLAGS_COMPRESSED	0x40
 #define FLAGS_RESERVED		0x80
 
+/* Values for the band variable of the header */
+#define BAND_11A		0x01
+#define BAND_11B		0x02
+#define BAND_11G		0x04
+#define BAND_11A_TURBO		0x08
+#define BAND_SUPERG		0x10
+#define BAND_PUBLIC_SAFETY	0x20	/* 499 GHz public safety */
+#define BAND_11N_5GHZ		0x40
+#define BAND_11N_2_4GHZ	0x80
+
 /* Capture mediums as defined by the commview file format */
 #define MEDIUM_ETHERNET		0
 #define MEDIUM_WIFI		1
@@ -150,6 +160,44 @@ commview_read_packet(FILE_T fh, struct wtap_pkthdr *phdr, Buffer *buf,
 		    PHDR_802_11_HAS_CHANNEL |
 		    PHDR_802_11_HAS_DATA_RATE |
 		    PHDR_802_11_HAS_SIGNAL_PERCENT;
+		switch (cv_hdr.band) {
+
+		case BAND_11A:
+			phdr->pseudo_header.ieee_802_11.presence_flags |= PHDR_802_11_HAS_PHY_BAND;
+			phdr->pseudo_header.ieee_802_11.phy_band = PHDR_802_11_PHY_BAND_11A;
+			break;
+
+		case BAND_11B:
+			phdr->pseudo_header.ieee_802_11.presence_flags |= PHDR_802_11_HAS_PHY_BAND;
+			phdr->pseudo_header.ieee_802_11.phy_band = PHDR_802_11_PHY_BAND_11B;
+			break;
+
+		case BAND_11G:
+			phdr->pseudo_header.ieee_802_11.presence_flags |= PHDR_802_11_HAS_PHY_BAND;
+			phdr->pseudo_header.ieee_802_11.phy_band = PHDR_802_11_PHY_BAND_11G;
+			break;
+
+		case BAND_11A_TURBO:
+			phdr->pseudo_header.ieee_802_11.presence_flags |= PHDR_802_11_HAS_PHY_BAND;
+			phdr->pseudo_header.ieee_802_11.phy_band = PHDR_802_11_PHY_BAND_11A_108;
+			break;
+
+		case BAND_SUPERG:
+			phdr->pseudo_header.ieee_802_11.presence_flags |= PHDR_802_11_HAS_PHY_BAND;
+			/* So what is "SuperG" here? */
+			phdr->pseudo_header.ieee_802_11.phy_band = PHDR_802_11_PHY_BAND_11G_STURBO;
+			break;
+
+		case BAND_11N_5GHZ:
+			phdr->pseudo_header.ieee_802_11.presence_flags |= PHDR_802_11_HAS_PHY_BAND;
+			phdr->pseudo_header.ieee_802_11.phy_band = PHDR_802_11_PHY_BAND_11N_5GHZ;
+			break;
+
+		case BAND_11N_2_4GHZ:
+			phdr->pseudo_header.ieee_802_11.presence_flags |= PHDR_802_11_HAS_PHY_BAND;
+			phdr->pseudo_header.ieee_802_11.phy_band = PHDR_802_11_PHY_BAND_11N_2_4GHZ;
+			break;
+		}
 		phdr->pseudo_header.ieee_802_11.channel = cv_hdr.channel;
 		phdr->pseudo_header.ieee_802_11.data_rate =
 		    cv_hdr.rate | (cv_hdr.direction << 8);
diff --git a/wiretap/network_instruments.c b/wiretap/network_instruments.c
index cbfbeb49a6..a4e3b67bd7 100644
--- a/wiretap/network_instruments.c
+++ b/wiretap/network_instruments.c
@@ -409,6 +409,7 @@ read_packet_header(wtap *wth, FILE_T fh, union wtap_pseudo_header *pseudo_header
                 PHDR_802_11_HAS_DATA_RATE |
                 PHDR_802_11_HAS_SIGNAL_PERCENT;
             /* set decryption status */
+            /* XXX - what other bits are there in conditions? */
             pseudo_header->ieee_802_11.decrypted = (wireless_header.conditions & WIRELESS_WEP_SUCCESS) != 0;
             pseudo_header->ieee_802_11.channel = wireless_header.frequency;
             pseudo_header->ieee_802_11.data_rate = wireless_header.rate;
diff --git a/wiretap/netxray.c b/wiretap/netxray.c
index 483ec9b77b..4c55904195 100644
--- a/wiretap/netxray.c
+++ b/wiretap/netxray.c
@@ -1253,6 +1253,11 @@ netxray_process_rec_header(wtap *wth, FILE_T fh, struct wtap_pkthdr *phdr,
 			phdr->pseudo_header.ieee_802_11.decrypted = FALSE;
 			phdr->pseudo_header.ieee_802_11.datapad = FALSE;
 
+			/*
+			 * XXX - any other information, such as PHY
+			 * type, frequency, 11n/11ac information,
+			 * etc.?
+			 */
 			phdr->pseudo_header.ieee_802_11.channel =
 			    hdr.hdr_2_x.xxx[12];
 			phdr->pseudo_header.ieee_802_11.data_rate =
diff --git a/wiretap/peektagged.c b/wiretap/peektagged.c
index 153255ed39..b475d8ced5 100644
--- a/wiretap/peektagged.c
+++ b/wiretap/peektagged.c
@@ -101,13 +101,13 @@ typedef struct peektagged_section_header {
 #define TAG_PEEKTAGGED_NOISE_DBM                0x0009
 #define TAG_PEEKTAGGED_UNKNOWN_0x000A           0x000A
 #define TAG_PEEKTAGGED_CENTER_FREQUENCY         0x000D  /* Frequency */
-#define TAG_PEEKTAGGED_UNKNOWN_0x000E           0x000E
-#define TAG_PEEKTAGGED_UNKNOWN_0x000F           0x000F  /* 000F-0013 - dBm values? */
-#define TAG_PEEKTAGGED_UNKNOWN_0x0010           0x0010
-#define TAG_PEEKTAGGED_UNKNOWN_0x0011           0x0011
-#define TAG_PEEKTAGGED_UNKNOWN_0x0012           0x0012
-#define TAG_PEEKTAGGED_UNKNOWN_0x0013           0x0013
-#define TAG_PEEKTAGGED_UNKNOWN_0x0014           0x0014
+#define TAG_PEEKTAGGED_UNKNOWN_0x000E           0x000E  /* "Band"? */
+#define TAG_PEEKTAGGED_UNKNOWN_0x000F           0x000F  /* antenna 2 signal dBm? */
+#define TAG_PEEKTAGGED_UNKNOWN_0x0010           0x0010  /* antenna 3 signal dBm? */
+#define TAG_PEEKTAGGED_UNKNOWN_0x0011           0x0011  /* antenna 4 signal dBm? */
+#define TAG_PEEKTAGGED_UNKNOWN_0x0012           0x0012  /* antenna 2 noise dBm? */
+#define TAG_PEEKTAGGED_UNKNOWN_0x0013           0x0013  /* antenna 3 noise dBm? */
+#define TAG_PEEKTAGGED_UNKNOWN_0x0014           0x0014  /* antenna 4 noise dBm? */
 #define TAG_PEEKTAGGED_EXT_FLAGS                0x0015  /* Extended flags for 802.11n and beyond */
 
 #define TAG_PEEKTAGGED_SLICE_LENGTH             0xffff
@@ -152,62 +152,6 @@ typedef struct peektagged_section_header {
 #define EXT_FLAG_802_11ac                       0x00000080
 #define EXT_FLAG_MCS_INDEX_USED                 0x00000100
 
-/*
- * XXX - mapping to radiotap, for fields that don't just map to wiretap
- * fields:
- *
- * FLAGS_CONTROL_FRAME: no equivalent - is it useful?  Can just look at FC?
- *
- * FLAGS_HAS_CRC_ERROR: flags.{frame failed FCS check}
- *
- * FLAGS_HAS_FRAME_ERROR: no equivalent
- *
- * STATUS_PROTECTED: flags.{sent/received with WEP encryption}?
- *
- * STATUS_DECRYPT_ERROR: no equivalent
- *
- * STATUS_SHORT_PREAMBLE: flags.{sent/received with short preamble}
- *
- * TAG_PEEKTAGGED_CHANNEL: no equivalent, but could be mapped to Channel
- *
- * TAG_PEEKTAGGED_DATA_RATE_OR_MCS_INDEX: Rate if it's a data rate,
- *   MCS.mcs if it's an MCS index
- *   Does EXT_FLAG_MCS_INDEX_USED map to the "MCS known" bit ?
- *
- * TAG_PEEKTAGGED_SIGNAL_PERC: no equivalent
- *
- * TAG_PEEKTAGGED_SIGNAL_DBM: Antenna signal
- *
- * TAG_PEEKTAGGED_NOISE_PERC: no equivalent
- *
- * TAG_PEEKTAGGED_NOISE_DBM: Antenna noise
- *
- * TAG_PEEKTAGGED_CENTER_FREQUENCY: XChannel.freq
- *
- * TAG_PEEKTAGGED_UNKNOWN_0x000F - TAG_PEEKTAGGED_UNKNOWN_0x0013: no equivalent
- *
- * EXT_FLAG_20_MHZ_LOWER
- * EXT_FLAG_20_MHZ_UPPER
- * EXT_FLAG_40_MHZ:
- *    mcs.bandwidth = 0: none of them set
- *    mcs.bandwidth = 1: EXT_FLAG_40_MHZ set
- *    mcs.bandwidth = 2: EXT_FLAG_20_MHZ_LOWER set
- *    mcs.bandwidth = 3: EXT_FLAG_20_MHZ_UPPER set
- *    anything else: ???
- *
- * EXT_FLAG_HALF_GI: mcs.{guard interval} = 1 (short GI)
- *
- * EXT_FLAG_FULL_GI: mcs.{guard interval} = 0 (long GI)
- *
- * EXT_FLAG_AMPDU: A-MPDU status present?  What about its value?
- *
- * EXT_FLAG_AMSDU: ???
- *
- * EXT_FLAG_802_11ac: nothing currently
- *
- * EXT_FLAG_MCS_INDEX_USED: see above?
- */
-
 /* 64-bit time in nanoseconds from the (Windows FILETIME) epoch */
 typedef struct peektagged_utime {
         guint32 upper;
@@ -579,7 +523,10 @@ peektagged_read_packet(wtap *wth, FILE_T fh, struct wtap_pkthdr *phdr,
             break;
 
         case TAG_PEEKTAGGED_UNKNOWN_0x000A:
-            /* XXX - seen in an OmniPeek 802.11n capture; value unknown */
+            /*
+             * XXX - seen in some 802.11 captures.
+             * Always seems to have the value 0 or 5.
+             */
             break;
 
         case TAG_PEEKTAGGED_CENTER_FREQUENCY:
@@ -589,35 +536,118 @@ peektagged_read_packet(wtap *wth, FILE_T fh, struct wtap_pkthdr *phdr,
             break;
 
         case TAG_PEEKTAGGED_UNKNOWN_0x000E:
-            /* XXX - seen in an AiroPeek/OmniPeek capture; value unknown */
+            /*
+             * XXX - seen in some 802.11 captures.
+             * Usually has the value 4, but, in some packets, has the
+             * values 6 or 302.
+             *
+             * Is this the mysterious "band" field that shows up in
+             * some "Peek remote" protocol captures, with values in
+             * the 30x or 40x ranges?  It's not always associated
+             * with the "extended flags" tag for HT/VHT information,
+             * so it's probably not 11n/11ac-specific.  Values other
+             * than 4 appear, in my captures, only in packets with
+             * the "extended flags" tag.  302 appeared in a packet
+             * with EXT_FLAG_MCS_INDEX_USED; 6 appeared in packets
+             * without EXT_FLAG_MCS_INDEX_USED.
+             */
             break;
 
         case TAG_PEEKTAGGED_UNKNOWN_0x000F:
-            /* XXX - seen in an AiroPeek/OmniPeek capture; dBm value? */
+            /*
+             * XXX - seen in some 802.11 captures; dB or dBm value?
+             * Multiple antennas?
+             */
             break;
 
         case TAG_PEEKTAGGED_UNKNOWN_0x0010:
-            /* XXX - seen in an AiroPeek/OmniPeek capture; dBm value? */
+            /*
+             * XXX - seen in some 802.11 captures; dB or dBm value?
+             * Multiple antennas?
+             */
             break;
 
         case TAG_PEEKTAGGED_UNKNOWN_0x0011:
-            /* XXX - seen in an AiroPeek/OmniPeek capture; dBm value? */
+            /*
+             * XXX - seen in some 802.11 captures; dB or dBm value?
+             * Multiple antennas?
+             */
             break;
 
         case TAG_PEEKTAGGED_UNKNOWN_0x0012:
-            /* XXX - seen in an AiroPeek/OmniPeek capture; dBm value? */
+            /*
+             * XXX - seen in some 802.11 captures; dB or dBm value?
+             * Multiple antennas?
+             */
             break;
 
         case TAG_PEEKTAGGED_UNKNOWN_0x0013:
-            /* XXX - seen in an AiroPeek/OmniPeek capture; dBm value? */
+            /*
+             * XXX - seen in some 802.11 captures; dB or dBm value?
+             * Multiple antennas?
+             */
             break;
 
         case TAG_PEEKTAGGED_UNKNOWN_0x0014:
-            /* XXX - seen in an AiroPeek/OmniPeek capture; value unknown */
+            /*
+             * XXX - seen in some 802.11 captures; dB or dBm value?
+             * Multiple antennas?
+             */
             break;
 
         case TAG_PEEKTAGGED_EXT_FLAGS:
+            /*
+             * We assume this is present for HT and VHT frames and absent
+             * for other frames.
+             */
             ext_flags = pletoh32(&tag_value[2]);
+            ieee_802_11.presence_flags |= PHDR_802_11_HAS_PHY_BAND;
+            /* XXX - any way to determine the band? */
+            ieee_802_11.phy_band = (ext_flags & EXT_FLAG_802_11ac) ? PHDR_802_11_PHY_BAND_11AC : PHDR_802_11_PHY_BAND_11N;
+
+            switch (ext_flags & EXT_FLAGS_BANDWIDTH) {
+
+            case 0:
+                ieee_802_11.presence_flags |= PHDR_802_11_HAS_BANDWIDTH;
+                ieee_802_11.bandwidth = PHDR_802_11_BANDWIDTH_20_MHZ;
+                break;
+
+            case EXT_FLAG_20_MHZ_LOWER:
+                ieee_802_11.presence_flags |= PHDR_802_11_HAS_BANDWIDTH;
+                ieee_802_11.bandwidth = PHDR_802_11_BANDWIDTH_20_20L;
+                break;
+
+            case EXT_FLAG_20_MHZ_UPPER:
+                ieee_802_11.presence_flags |= PHDR_802_11_HAS_BANDWIDTH;
+                ieee_802_11.bandwidth = PHDR_802_11_BANDWIDTH_20_20U;
+                break;
+
+            case EXT_FLAG_40_MHZ:
+                ieee_802_11.presence_flags |= PHDR_802_11_HAS_BANDWIDTH;
+                ieee_802_11.bandwidth = PHDR_802_11_BANDWIDTH_40_MHZ;
+                break;
+
+            default:
+                /* Mutually exclusive flags set */
+                break;
+            }
+
+            switch (ext_flags & EXT_FLAGS_GI) {
+
+            case EXT_FLAG_HALF_GI:
+                ieee_802_11.presence_flags |= PHDR_802_11_HAS_SHORT_GI;
+                ieee_802_11.short_gi = 1;
+                break;
+
+            case EXT_FLAG_FULL_GI:
+                ieee_802_11.presence_flags |= PHDR_802_11_HAS_SHORT_GI;
+                ieee_802_11.short_gi = 0;
+                break;
+
+            default:
+                /* Mutually exclusive flags set or nothing set */
+                break;
+            }
             break;
 
         case TAG_PEEKTAGGED_SLICE_LENGTH:
@@ -683,55 +713,8 @@ peektagged_read_packet(wtap *wth, FILE_T fh, struct wtap_pkthdr *phdr,
                 /* It's an MCS index. */
                 ieee_802_11.presence_flags |= PHDR_802_11_HAS_MCS_INDEX;
                 ieee_802_11.mcs_index = data_rate_or_mcs_index;
-
-                /*
-                 * Fill in other 802.11n information.
-                 */
-                switch (ext_flags & EXT_FLAGS_BANDWIDTH) {
-
-                case 0:
-                    ieee_802_11.presence_flags |= PHDR_802_11_HAS_BANDWIDTH;
-                    ieee_802_11.bandwidth = PHDR_802_11_BANDWIDTH_20_MHZ;
-                    break;
-
-                case EXT_FLAG_20_MHZ_LOWER:
-                    ieee_802_11.presence_flags |= PHDR_802_11_HAS_BANDWIDTH;
-                    ieee_802_11.bandwidth = PHDR_802_11_BANDWIDTH_20_20L;
-                    break;
-
-                case EXT_FLAG_20_MHZ_UPPER:
-                    ieee_802_11.presence_flags |= PHDR_802_11_HAS_BANDWIDTH;
-                    ieee_802_11.bandwidth = PHDR_802_11_BANDWIDTH_20_20U;
-                    break;
-
-                case EXT_FLAG_40_MHZ:
-                    ieee_802_11.presence_flags |= PHDR_802_11_HAS_BANDWIDTH;
-                    ieee_802_11.bandwidth = PHDR_802_11_BANDWIDTH_40_MHZ;
-                    break;
-
-                default:
-                    /* Mutually exclusive flags set */
-                    break;
-                }
-
-                switch (ext_flags & EXT_FLAGS_GI) {
-
-                case EXT_FLAG_HALF_GI:
-                    ieee_802_11.presence_flags |= PHDR_802_11_HAS_SHORT_GI;
-                    ieee_802_11.short_gi = 1;
-                    break;
-
-                case EXT_FLAG_FULL_GI:
-                    ieee_802_11.presence_flags |= PHDR_802_11_HAS_SHORT_GI;
-                    ieee_802_11.short_gi = 0;
-                    break;
-
-                default:
-                    /* Mutually exclusive flags set */
-                    break;
-                }
             } else {
-                /* It's a data rate */
+                /* It's a data rate. */
                 ieee_802_11.presence_flags |= PHDR_802_11_HAS_DATA_RATE;
                 ieee_802_11.data_rate = data_rate_or_mcs_index;
             }
diff --git a/wiretap/wtap.h b/wiretap/wtap.h
index fbdd39933d..5da0261956 100644
--- a/wiretap/wtap.h
+++ b/wiretap/wtap.h
@@ -559,10 +559,11 @@ struct ieee_802_11_phdr {
     gboolean decrypted;      /* TRUE if frame is decrypted even if "protected" bit is set */
     gboolean datapad;        /* TRUE if frame has padding between 802.11 header and payload */
     guint32  presence_flags; /* Flags indicating presence of fields */
+    guint16  phy_band;       /* Type of PHY and band */
     guint16  channel;        /* Channel number */
     guint16  data_rate;      /* Data rate, in .5 Mb/s units */
     guint16  mcs_index;      /* MCS index */
-    guint    bandwidth:2;    /* Bandwidth = 20 MHz, 40 MHz, 20+20L, 20+20U */
+    guint    bandwidth;      /* Bandwidth = 20 MHz, 40 MHz, etc. */
     guint    short_gi:1;     /* True for short guard interval */
     guint    greenfield:1;   /* True for greenfield, short for mixed */
     guint    ldpc:1;         /* True for LDPC FEC */
@@ -576,26 +577,65 @@ struct ieee_802_11_phdr {
     guint64  tsf_timestamp;
 };
 
-#define PHDR_802_11_HAS_CHANNEL        0x00000001 /* channel */
-#define PHDR_802_11_HAS_DATA_RATE      0x00000002 /* data_rate */
-#define PHDR_802_11_HAS_MCS_INDEX      0x00000004 /* mcs */
-#define PHDR_802_11_HAS_BANDWIDTH      0x00000008 /* bandwidth */
-#define PHDR_802_11_HAS_SHORT_GI       0x00000010 /* short_gi */
-#define PHDR_802_11_HAS_GREENFIELD     0x00000020 /* greenfield */
-#define PHDR_802_11_HAS_LDPC           0x00000040 /* ldpc */
-#define PHDR_802_11_HAS_STBC_STREAMS   0x00000080 /* stbc_streams */
-#define PHDR_802_11_HAS_NESS           0x00000100 /* ness */
-#define PHDR_802_11_HAS_FREQUENCY      0x00000200 /* frequency */
-#define PHDR_802_11_HAS_SIGNAL_PERCENT 0x00000400 /* signal_percent */
-#define PHDR_802_11_HAS_NOISE_PERCENT  0x00000800 /* noise_percent */
-#define PHDR_802_11_HAS_SIGNAL_DBM     0x00001000 /* signal_dbm */
-#define PHDR_802_11_HAS_NOISE_DBM      0x00002000 /* noise_dbm */
-#define PHDR_802_11_HAS_TSF_TIMESTAMP  0x00004000 /* tsf_timestamp */
-
-#define PHDR_802_11_BANDWIDTH_20_MHZ   0 /* 20 MHz */
-#define PHDR_802_11_BANDWIDTH_40_MHZ   1 /* 40 MHz */
-#define PHDR_802_11_BANDWIDTH_20_20L   2 /* 20 + 20L */
-#define PHDR_802_11_BANDWIDTH_20_20U   3 /* 20 + 20U */
+#define PHDR_802_11_HAS_PHY_BAND       0x00000001 /* phy_band */
+#define PHDR_802_11_HAS_CHANNEL        0x00000002 /* channel */
+#define PHDR_802_11_HAS_DATA_RATE      0x00000004 /* data_rate */
+#define PHDR_802_11_HAS_MCS_INDEX      0x00000008 /* mcs */
+#define PHDR_802_11_HAS_BANDWIDTH      0x00000010 /* bandwidth */
+#define PHDR_802_11_HAS_SHORT_GI       0x00000020 /* short_gi */
+#define PHDR_802_11_HAS_GREENFIELD     0x00000040 /* greenfield */
+#define PHDR_802_11_HAS_LDPC           0x00000080 /* ldpc */
+#define PHDR_802_11_HAS_STBC_STREAMS   0x00000100 /* stbc_streams */
+#define PHDR_802_11_HAS_NESS           0x00000200 /* ness */
+#define PHDR_802_11_HAS_FREQUENCY      0x00000400 /* frequency */
+#define PHDR_802_11_HAS_SIGNAL_PERCENT 0x00000800 /* signal_percent */
+#define PHDR_802_11_HAS_NOISE_PERCENT  0x00001000 /* noise_percent */
+#define PHDR_802_11_HAS_SIGNAL_DBM     0x00002000 /* signal_dbm */
+#define PHDR_802_11_HAS_NOISE_DBM      0x00004000 /* noise_dbm */
+#define PHDR_802_11_HAS_TSF_TIMESTAMP  0x00008000 /* tsf_timestamp */
+
+#define PHDR_802_11_PHY_BAND_11_FHSS        0  /* 802.11 FHSS (2.4 GHz GFSK) */
+#define PHDR_802_11_PHY_BAND_11_DSSS        1  /* 802.11 DSSS (2.4 GHz not GFSK) */
+#define PHDR_802_11_PHY_BAND_11B            2  /* 802.11b (2.4 GHz CCK) */
+#define PHDR_802_11_PHY_BAND_11A            3  /* 802.11a (5 GHz OFDM) */
+#define PHDR_802_11_PHY_BAND_11G            4  /* 802.11g (2.4 GHz, unknown modulation) */
+#define PHDR_802_11_PHY_BAND_11G_PURE       5  /* pure 802.11g (2.4 GHz OFDM) */
+#define PHDR_802_11_PHY_BAND_11G_MIXED      6  /* 802.11g (2.4 GHz dynamic CCK-OFDM) */
+#define PHDR_802_11_PHY_BAND_11A_108        7  /* turbo 802.11a */
+#define PHDR_802_11_PHY_BAND_11G_PURE_108   8  /* turbo pure 802.11g */
+#define PHDR_802_11_PHY_BAND_11G_MIXED_108  9  /* turbo 802.11g (dynamic CCK-OFDM) */
+#define PHDR_802_11_PHY_BAND_11G_STURBO     10 /* static turbo 802.11g */
+#define PHDR_802_11_PHY_BAND_11N            11 /* 802.11n (HT, unknown band) */
+#define PHDR_802_11_PHY_BAND_11N_5GHZ       12 /* 802.11n (5 GHz HT) */
+#define PHDR_802_11_PHY_BAND_11N_2_4GHZ     13 /* 802.11n (2.4 GHz HT) */
+#define PHDR_802_11_PHY_BAND_11AC           14 /* 802.11ac (VHT) */
+
+#define PHDR_802_11_BANDWIDTH_20_MHZ   0  /* 20 MHz */
+#define PHDR_802_11_BANDWIDTH_40_MHZ   1  /* 40 MHz */
+#define PHDR_802_11_BANDWIDTH_20_20L   2  /* 20 + 20L, 40 MHz */
+#define PHDR_802_11_BANDWIDTH_20_20U   3  /* 20 + 20U, 40 MHz */
+#define PHDR_802_11_BANDWIDTH_80_MHZ   4  /* 80 MHz */
+#define PHDR_802_11_BANDWIDTH_40_40L   5  /* 40 + 40L MHz, 80 MHz */
+#define PHDR_802_11_BANDWIDTH_40_40U   6  /* 40 + 40U MHz, 80 MHz */
+#define PHDR_802_11_BANDWIDTH_20LL     7  /* ???, 80 MHz */
+#define PHDR_802_11_BANDWIDTH_20LU     8  /* ???, 80 MHz */
+#define PHDR_802_11_BANDWIDTH_20UL     9  /* ???, 80 MHz */
+#define PHDR_802_11_BANDWIDTH_20UU     10 /* ???, 80 MHz */
+#define PHDR_802_11_BANDWIDTH_160_MHZ  11 /* 160 MHz */
+#define PHDR_802_11_BANDWIDTH_80_80L   12 /* 80 + 80L, 160 MHz */
+#define PHDR_802_11_BANDWIDTH_80_80U   13 /* 80 + 80U, 160 MHz */
+#define PHDR_802_11_BANDWIDTH_40LL     14 /* ???, 160 MHz */
+#define PHDR_802_11_BANDWIDTH_40LU     15 /* ???, 160 MHz */
+#define PHDR_802_11_BANDWIDTH_40UL     16 /* ???, 160 MHz */
+#define PHDR_802_11_BANDWIDTH_40UU     17 /* ???, 160 MHz */
+#define PHDR_802_11_BANDWIDTH_20LLL    18 /* ???, 160 MHz */
+#define PHDR_802_11_BANDWIDTH_20LLU    19 /* ???, 160 MHz */
+#define PHDR_802_11_BANDWIDTH_20LUL    20 /* ???, 160 MHz */
+#define PHDR_802_11_BANDWIDTH_20LUU    21 /* ???, 160 MHz */
+#define PHDR_802_11_BANDWIDTH_20ULL    22 /* ???, 160 MHz */
+#define PHDR_802_11_BANDWIDTH_20ULU    23 /* ???, 160 MHz */
+#define PHDR_802_11_BANDWIDTH_20UUL    24 /* ???, 160 MHz */
+#define PHDR_802_11_BANDWIDTH_20UUU    25 /* ???, 160 MHz */
 
 /* Packet "pseudo-header" for the output from CoSine L2 debug output. */