Protect code for particular Juniper DLT_ values with #ifdefs, so this

[tcpdump] / print-ether.c

diff --git a/print-ether.c b/print-ether.c
index a12e7b05342edddd77e811195053ef4f97c6dfdc..87b77d3fde83c8ee635d86d8a5a42898946856a9 100644 (file)
--- a/print-ether.c
+++ b/print-ether.c
@@ -20,7 +20,7 @@
  */
 #ifndef lint
 static const char rcsid[] _U_ =
  */
 #ifndef lint
 static const char rcsid[] _U_ =

-    "@(#) $Header: /tcpdump/master/tcpdump/print-ether.c,v 1.95 2005-04-06 21:32:39 mcr Exp $ (LBL)";
+    "@(#) $Header: /tcpdump/master/tcpdump/print-ether.c,v 1.95.2.1 2005-04-25 17:57:15 guy Exp $ (LBL)";

 #endif
 
 #ifdef HAVE_CONFIG_H
 #endif
 
 #ifdef HAVE_CONFIG_H


@@ -37,24 +37,8 @@ static const char rcsid[] _U_ =
 #include "ethertype.h"
 
 #include "ether.h"
 #include "ethertype.h"
 
 #include "ether.h"

-#include "llc.h"

 
 const struct tok ethertype_values[] = { 
 
 const struct tok ethertype_values[] = { 

-    /* not really ethertypes but PIDs that are used
-       in the SNAP printer - its more convenient
-       to put them into a single tokentable */
-    { PID_RFC2684_ETH_FCS,      "Ethernet + FCS" },
-    { PID_RFC2684_ETH_NOFCS,    "Ethernet no FCS" },
-    { PID_RFC2684_802_4_FCS,    "802.4 + FCS" },
-    { PID_RFC2684_802_4_NOFCS,  "w/o FCS" },
-    { PID_RFC2684_802_5_FCS,    "Tokenring + FCS" },
-    { PID_RFC2684_802_5_NOFCS,  "Tokenring no FCS" },
-    { PID_RFC2684_FDDI_FCS,     "FDDI + FCS" },
-    { PID_RFC2684_FDDI_NOFCS,   "FDDI no FCS" },
-    { PID_RFC2684_802_6_FCS,    "802.6 + FCS" },
-    { PID_RFC2684_802_6_NOFCS,  "802.6 no FCS" },
-    { PID_RFC2684_BPDU,         "BPDU" },
-    /* the real Ethertypes */

     { ETHERTYPE_IP,            "IPv4" },
     { ETHERTYPE_MPLS,          "MPLS unicast" },
     { ETHERTYPE_MPLS_MULTI,    "MPLS multicast" },
     { ETHERTYPE_IP,            "IPv4" },
     { ETHERTYPE_MPLS,          "MPLS unicast" },
     { ETHERTYPE_MPLS_MULTI,    "MPLS multicast" },