add skeleton support for 802.1ag CFM

[tcpdump] / ethertype.h

diff --git a/ethertype.h b/ethertype.h
index f8deb31a6339233167138565c6aefc50c3b16e61..96d6186959dfa14a13f0c1c55f92af853d49771a 100644 (file)
--- a/ethertype.h
+++ b/ethertype.h
@@ -18,7 +18,7 @@
  * WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *
- * @(#) $Header: /tcpdump/master/tcpdump/ethertype.h,v 1.17 2002-09-11 22:15:16 hannes Exp $ (LBL)
+ * @(#) $Header: /tcpdump/master/tcpdump/ethertype.h,v 1.27 2006-10-12 10:26:12 hannes Exp $ (LBL)
  */
 
 /*
@@ -33,6 +33,13 @@
  * <netinet/if_ether.h> if all it needs are ETHERTYPE_ values.
  */
 
+#ifndef ETHERTYPE_LEN
+#define ETHERTYPE_LEN           2
+#endif
+
+#ifndef ETHERTYPE_GRE_ISO
+#define ETHERTYPE_GRE_ISO       0x00FE  /* not really an ethertype only used in GRE */
+#endif
 #ifndef ETHERTYPE_PUP
 #define        ETHERTYPE_PUP           0x0200  /* PUP protocol */
 #endif
@@ -69,9 +76,6 @@
 #ifndef ETHERTYPE_SCA
 #define ETHERTYPE_SCA          0x6007
 #endif
-#ifndef ETHERTYPE_REVARP
-#define ETHERTYPE_REVARP       0x8035
-#endif
 #ifndef        ETHERTYPE_LANBRIDGE
 #define        ETHERTYPE_LANBRIDGE     0x8038
 #endif
@@ -105,6 +109,12 @@
 #ifndef ETHERTYPE_PPP
 #define        ETHERTYPE_PPP           0x880b
 #endif
+#ifndef ETHERTYPE_MPCP
+#define        ETHERTYPE_MPCP          0x8808
+#endif
+#ifndef ETHERTYPE_SLOW
+#define        ETHERTYPE_SLOW          0x8809
+#endif
 #ifndef        ETHERTYPE_MPLS
 #define        ETHERTYPE_MPLS          0x8847
 #endif
@@ -117,9 +127,23 @@
 #ifndef ETHERTYPE_PPPOES
 #define ETHERTYPE_PPPOES       0x8864
 #endif
+#ifndef ETHERTYPE_JUMBO
+#define ETHERTYPE_JUMBO         0x8870
+#endif
+#ifndef ETHERTYPE_EAPOL
+#define ETHERTYPE_EAPOL        0x888e
+#endif
 #ifndef        ETHERTYPE_LOOPBACK
 #define        ETHERTYPE_LOOPBACK      0x9000
 #endif
+#ifndef        ETHERTYPE_VMAN
+#define        ETHERTYPE_VMAN          0x9100 /* Extreme VMAN Protocol */ 
+#endif
+#ifndef        ETHERTYPE_CFM
+#define        ETHERTYPE_CFM           0xabcd /* 802.1ag - Ethertype is not yet assigned */
+#endif
 #ifndef        ETHERTYPE_ISO
 #define        ETHERTYPE_ISO           0xfefe  /* nonstandard - used in Cisco HDLC encapsulation */
 #endif
+
+extern const struct tok ethertype_values[];