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 6b78ed47f9f65bad22d1b3bb3ddc0c83c97bf686..193f2dbd3d131723df3c27235cac7054aebb3320 100644 (file)
--- a/CREDITS
+++ b/CREDITS
@@ -63,6 +63,7 @@ Additional people who have contributed patches:
        Mark Pizzolato                  <[email protected]>
        Martin Husemann                 <[email protected]>
        Matthew Luckie                  <[email protected]>
+       Mike Kershaw                    <[email protected]>
        Mike Wiacek                     <[email protected]>
        Monroe Williams                 <[email protected]>
        Nicolas Dade                    <[email protected]>

diff --git a/pcap-linux.c b/pcap-linux.c
index 84b5b8b1cf9b1a0547b31c167adf1c9900f25bfe..9c5d7c9b32dee34fe9a440b10aa0f199dfce2572 100644 (file)
--- 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