From Solomon Peachy <[email protected]>: Linux 2.4.18pre4 defines

ARPHRD_IEEE80211_PRISM, for sniffing on Prism II-based 802.11 interfaces
and getting the special Prism header, so we should map it to
DLT_PRISM_HEADER.

diff --git a/CREDITS b/CREDITS
index 3c39e5b4e3eb6336f269c36a26789ef7295e7fd1..a604760a0391740e0d9a04c5a8441f6fc4cf89e4 100644 (file)
--- a/CREDITS
+++ b/CREDITS
@@ -44,6 +44,7 @@ Additional people who have contributed patches:
        Rick Jones                      <[email protected]>
        Scott Barron                    <[email protected]>
        Scott Gifford                   <[email protected]>
+       Solomon Peachy                  <[email protected]>
        Stefan Hudson                   <[email protected]>
        Tony Li                         <[email protected]>
        Uns Lider                       <[email protected]>

diff --git a/pcap-linux.c b/pcap-linux.c
index 7cee19523437adbd8e443f021dca3f3717a2b7b2..f5032f92e8181556d151bb920b16478d4688a59b 100644 (file)
--- a/pcap-linux.c
+++ b/pcap-linux.c
@@ -26,7 +26,7 @@
  */
 #ifndef lint
 static const char rcsid[] =
-    "@(#) $Header: /tcpdump/master/libpcap/pcap-linux.c,v 1.75 2002-02-03 23:03:42 guy Exp $ (LBL)";
+    "@(#) $Header: /tcpdump/master/libpcap/pcap-linux.c,v 1.76 2002-02-05 05:47:14 guy Exp $ (LBL)";
 #endif
 
 /*
@@ -961,6 +961,13 @@ static void map_arphrd_to_dlt(pcap_t *handle, int arptype)
                handle->linktype = DLT_IEEE802_11;
                break;
 
+#ifndef ARPHRD_IEEE80211_PRISM  /* From Linux 2.4.18 */
+#define ARPHRD_IEEE80211_PRISM 802
+#endif
+       case ARPHRD_IEEE80211_PRISM:
+               handle->linktype = DLT_PRISM_HEADER;
+               break;
+
        case ARPHRD_PPP:
                /*
                 * Some PPP code in the kernel supplies no link-layer