Merge branch 'master' of git://github.com/mcr/tcpdump

[tcpdump] / ethertype.h

diff --git a/ethertype.h b/ethertype.h
index dbbbae4afd44b2dcba5e6fcf7649fcf29df89fcb..8c063396d9ec9b242e93a6b63c23133c07b13c0b 100644 (file)
--- a/ethertype.h
+++ b/ethertype.h
@@ -76,6 +76,9 @@
 #ifndef ETHERTYPE_SCA
 #define ETHERTYPE_SCA          0x6007
 #endif
+#ifndef ETHERTYPE_TEB
+#define ETHERTYPE_TEB          0x6558
+#endif
 #ifndef        ETHERTYPE_LANBRIDGE
 #define        ETHERTYPE_LANBRIDGE     0x8038
 #endif
@@ -97,9 +100,26 @@
 #ifndef ETHERTYPE_AARP
 #define ETHERTYPE_AARP         0x80f3
 #endif
+#ifndef        ETHERTYPE_TIPC
+#define        ETHERTYPE_TIPC          0x88ca
+#endif
 #ifndef        ETHERTYPE_8021Q
 #define        ETHERTYPE_8021Q         0x8100
 #endif
+
+/* see:
+        http://en.wikipedia.org/wiki/IEEE_802.1Q
+    and http://en.wikipedia.org/wiki/QinQ
+*/
+#ifndef        ETHERTYPE_8021Q9100
+#define        ETHERTYPE_8021Q9100     0x9100
+#endif
+#ifndef        ETHERTYPE_8021Q9200
+#define        ETHERTYPE_8021Q9200     0x9200
+#endif
+#ifndef        ETHERTYPE_8021QinQ
+#define        ETHERTYPE_8021QinQ      0x88a8
+#endif
 #ifndef ETHERTYPE_IPX
 #define ETHERTYPE_IPX          0x8137
 #endif
@@ -127,6 +147,12 @@
 #ifndef ETHERTYPE_PPPOES
 #define ETHERTYPE_PPPOES       0x8864
 #endif
+#ifndef ETHERTYPE_PPPOED2
+#define ETHERTYPE_PPPOED2      0x3c12
+#endif
+#ifndef ETHERTYPE_PPPOES2
+#define ETHERTYPE_PPPOES2      0x3c13
+#endif
 #ifndef ETHERTYPE_JUMBO
 #define ETHERTYPE_JUMBO         0x8870
 #endif