aboutsummaryrefslogtreecommitdiffstats
path: root/pcap-bpf.h
diff options
context:
space:
mode:
authorguy <guy>2004-01-29 10:36:43 +0000
committerguy <guy>2004-01-29 10:36:43 +0000
commit7ac8a0a75b572dd57666572689a3c0ff98339e32 (patch)
treeaea76de3b3a7d1435bd48af0b90b16dbc9204324 /pcap-bpf.h
parent28d3e917c0a30949aa46287b87476f12de73a50c (diff)
DLT_IEEE802_11_RADIO is used for the BSD radio header; add a new
DLT_IEEE802_11_RADIO_AVS for future use with the AVS radio header. Fix a comment. Put in reserved LINKTYPE_USERn values corresponding to the reserved DLT_USERn values.
Diffstat (limited to 'pcap-bpf.h')
-rw-r--r--pcap-bpf.h25
1 files changed, 16 insertions, 9 deletions
diff --git a/pcap-bpf.h b/pcap-bpf.h
index 7be164b..6b6add9 100644
--- a/pcap-bpf.h
+++ b/pcap-bpf.h
@@ -37,7 +37,7 @@
*
* @(#)bpf.h 7.1 (Berkeley) 5/7/91
*
- * @(#) $Header: /tcpdump/master/libpcap/pcap-bpf.h,v 1.13 2003-12-20 02:38:23 guy Exp $ (LBL)
+ * @(#) $Header: /tcpdump/master/libpcap/pcap-bpf.h,v 1.14 2004-01-29 10:36:44 guy Exp $ (LBL)
*/
/*
@@ -337,15 +337,10 @@ struct bpf_version {
#define DLT_AURORA 126 /* Xilinx Aurora link layer */
/*
- * For future use with 802.11 captures - defined by AbsoluteValue
- * Systems to store a number of bits of link-layer information:
- *
- * http://www.shaftnet.org/~pizza/software/capturefrm.txt
- *
- * but could and arguably should also be used by non-AVS Linux
- * 802.11 drivers and BSD drivers; that may happen in the future.
+ * BSD header for 802.11 plus a number of bits of link-layer information
+ * including radio information.
*/
-#define DLT_IEEE802_11_RADIO 127 /* 802.11 plus WLAN header */
+#define DLT_IEEE802_11_RADIO 127 /* 802.11 plus BSD radio header */
/*
* Reserved for the TZSP encapsulation, as per request from
@@ -473,6 +468,18 @@ struct bpf_version {
#define DLT_USER15 162
/*
+ * For future use with 802.11 captures - defined by AbsoluteValue
+ * Systems to store a number of bits of link-layer information
+ * including radio information:
+ *
+ * http://www.shaftnet.org/~pizza/software/capturefrm.txt
+ *
+ * but could and arguably should also be used by non-AVS Linux
+ * 802.11 drivers; that may happen in the future.
+ */
+#define DLT_IEEE802_11_RADIO_AVS 163 /* 802.11 plus AVS radio header */
+
+/*
* The instruction encodings.
*/
/* instruction classes */