From cb1f8ef14dfe6ae855f2a91894b1931ab4e9eee2 Mon Sep 17 00:00:00 2001
From: guy <guy>
Date: Wed, 11 Dec 2002 22:43:31 +0000
Subject: [PATCH] Add new DLT_ type for AVS's WLAN header.

---
 bpf/net/bpf.h | 16 +++++++++++++---
 savefile.c    |  7 ++++++-
 2 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/bpf/net/bpf.h b/bpf/net/bpf.h
index 94ca189..030cc00 100644
--- a/bpf/net/bpf.h
+++ b/bpf/net/bpf.h
@@ -37,7 +37,7 @@
  *
  *      @(#)bpf.h       7.1 (Berkeley) 5/7/91
  *
- * @(#) $Header: /tcpdump/master/libpcap/bpf/net/Attic/bpf.h,v 1.63 2002-10-18 08:46:15 guy Exp $ (LBL)
+ * @(#) $Header: /tcpdump/master/libpcap/bpf/net/Attic/bpf.h,v 1.64 2002-12-11 22:43:32 guy Exp $ (LBL)
  */
 
 #ifndef BPF_MAJOR_VERSION
@@ -367,13 +367,23 @@ struct bpf_hdr {
 
 /* 
  * Reserved as per request from Kent Dahlgren <kent@praesum.com>
- * for private use
+ * for private use.
  */
-
 #define DLT_RIO                 124     /* RapidIO */
 #define DLT_PCI_EXP             125     /* PCI Express */
 #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.
+ */
+#define DLT_IEEE802_11_RADIO	127	/* 802.11 plus WLAN header */
+
 /*
  * The instruction encodings.
  */
diff --git a/savefile.c b/savefile.c
index 1caba97..a4267cf 100644
--- a/savefile.c
+++ b/savefile.c
@@ -30,7 +30,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-    "@(#) $Header: /tcpdump/master/libpcap/savefile.c,v 1.69 2002-10-24 08:09:42 risso Exp $ (LBL)";
+    "@(#) $Header: /tcpdump/master/libpcap/savefile.c,v 1.70 2002-12-11 22:43:31 guy Exp $ (LBL)";
 #endif
 
 #ifdef HAVE_CONFIG_H
@@ -167,6 +167,8 @@ static const char rcsid[] =
 #define LINKTYPE_IP_OVER_FC	122		/* RFC 2625 IP-over-Fibre Channel */
 #define LINKTYPE_SUNATM		123		/* Solaris+SunATM */
 
+#define LINKTYPE_IEEE802_11_RADIO 127		/* 802.11 plus WLAN header */
+
 /*
  * These types are reserved for future use.
  */
@@ -280,6 +282,9 @@ static struct linktype_map {
 	/* Xilinx Aurora link layer */
 	{ DLT_AURORA,		LINKTYPE_AURORA },
 
+	/* 802.11 plus WLAN header */
+	{ DLT_IEEE802_11_RADIO,	LINKTYPE_IEEE802_11_RADIO },
+
 	/*
 	 * Any platform that defines additional DLT_* codes should:
 	 *