Allocate DLT_ for 802.15.4 without any header munging, for Mikko

Saarnivala.

Fix a comment.

2 files changed, 18 insertions, 3 deletions

diff --git a/pcap/bpf.h b/pcap/bpf.h
index e8bc61b3..87705874 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.10 2007-05-24 23:57:36 hannes Exp $ (LBL)
+ * @(#) $Header: /tcpdump/master/libpcap/pcap/bpf.h,v 1.11 2007-06-05 18:02:29 guy Exp $ (LBL)
  */
 
 /*
@@ -695,6 +695,12 @@ struct bpf_version {
  */
 #define DLT_JUNIPER_ISM         194
 
+/*
+ * IEEE 802.15.4, exactly as it appears in the spec (no padding, no
+ * nothing); requested by Mikko Saarnivala <mikko.saarnivala@sensinode.com>.
+ */
+#define DLT_IEEE802_15_4	195
+
 
 /*
  * The instruction encodings.
diff --git a/savefile.c b/savefile.c
index 54d68c0a..471177ca 100644
--- a/savefile.c
+++ b/savefile.c
@@ -30,7 +30,7 @@
 
 #ifndef lint
 static const char rcsid[] _U_ =
-    "@(#) $Header: /tcpdump/master/libpcap/savefile.c,v 1.156 2007-05-24 23:57:36 hannes Exp $ (LBL)";
+    "@(#) $Header: /tcpdump/master/libpcap/savefile.c,v 1.157 2007-06-05 18:02:29 guy Exp $ (LBL)";
 #endif
 
 #ifdef HAVE_CONFIG_H
@@ -519,6 +519,12 @@ static const char rcsid[] _U_ =
  */
 #define LINKTYPE_JUNIPER_ISM    194
 
+/*
+ * IEEE 802.15.4, exactly as it appears in the spec (no padding, no
+ * nothing); requested by Mikko Saarnivala <mikko.saarnivala@sensinode.com>.
+ */
+#define LINKTYPE_IEEE802_15_4	195
+
 
 static struct linktype_map {
 	int	dlt;
@@ -758,12 +764,15 @@ static struct linktype_map {
 	/* Per Packet Information encapsulated packets */
 	{ DLT_PPI,			LINKTYPE_PPI },
 
-	/* IEEE 802.15 MAC Common Part Sublayer plus radiotap header */
+	/* IEEE 802.16 MAC Common Part Sublayer plus radiotap header */
 	{ DLT_IEEE802_16_MAC_CPS_RADIO, LINKTYPE_IEEE802_16_MAC_CPS_RADIO },
 
         /* Juniper Voice ISM */
         { DLT_JUNIPER_ISM,      LINKTYPE_JUNIPER_ISM },
 
+	/* IEEE 802.15.4 exactly as it appears in the spec */
+        { DLT_IEEE802_15_4,	LINKTYPE_IEEE802_15_4 },
+
 	{ -1,			-1 }
 };