From: guy <guy>
Date: Tue, 16 Aug 2005 04:18:32 +0000 (+0000)
Subject: From Mike "Dragorn" Kershaw: add support for the new ARPHRD_ value for
X-Git-Tag: libpcap-1.1.0~577
X-Git-Url: https://git.tcpdump.org/libpcap/commitdiff_plain/c166082296de7abe845fb2aca5d751649c95be9d

From Mike "Dragorn" Kershaw: add support for the new ARPHRD_ value for
802.11 with a radiotap header (used by the madwifi driver, and in the
pipeline to be officially assigned).
---

diff --git a/CREDITS b/CREDITS
index 6b78ed47..193f2dbd 100644
--- a/CREDITS
+++ b/CREDITS
@@ -63,6 +63,7 @@ Additional people who have contributed patches:
 	Mark Pizzolato			<List-tcpdump-workers@subscriptions.pizzolato.net>
 	Martin Husemann			<martin@netbsd.org>
 	Matthew Luckie			<mjl@luckie.org.nz>
+	Mike Kershaw			<dragorn@kismetwireless.net>
 	Mike Wiacek			<mike@iroot.net>
 	Monroe Williams			<monroe@pobox.com>
 	Nicolas Dade			<ndade@nsd.dyndns.org>
diff --git a/pcap-linux.c b/pcap-linux.c
index 84b5b8b1..9c5d7c9b 100644
--- a/pcap-linux.c
+++ b/pcap-linux.c
@@ -27,7 +27,7 @@
 
 #ifndef lint
 static const char rcsid[] _U_ =
-    "@(#) $Header: /tcpdump/master/libpcap/pcap-linux.c,v 1.115 2005-07-07 01:57:01 guy Exp $ (LBL)";
+    "@(#) $Header: /tcpdump/master/libpcap/pcap-linux.c,v 1.116 2005-08-16 04:18:32 guy Exp $ (LBL)";
 #endif
 
 /*
@@ -1185,6 +1185,13 @@ static void map_arphrd_to_dlt(pcap_t *handle, int arptype, int cooked_ok)
 		handle->linktype = DLT_PRISM_HEADER;
 		break;
 
+#ifndef ARPHRD_IEEE80211_RADIOTAP /* new */
+#define ARPHRD_IEEE80211_RADIOTAP 803
+#endif
+	case ARPHRD_IEEE80211_RADIOTAP:
+		handle->linktype = DLT_IEEE802_11_RADIO;
+		break;
+
 	case ARPHRD_PPP:
 		/*
 		 * Some PPP code in the kernel supplies no link-layer