Add changes in 4.2.1.

[tcpdump] / ethertype.h

diff --git a/ethertype.h b/ethertype.h
index a6b14c595356b046828e0ca3c5b624587f252625..fc5e515c6bb7bb8dbec92fc3984f726a7f511e5d 100644 (file)
--- a/ethertype.h
+++ b/ethertype.h
@@ -103,6 +103,20 @@
 #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
@@ -130,6 +144,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
@@ -142,12 +162,6 @@
 #ifndef ETHERTYPE_RRCP
 #define ETHERTYPE_RRCP         0x8899
 #endif
-#ifndef ETHERTYPE_PPPOED2
-#define ETHERTYPE_PPPOED2      0x3c12
-#endif
-#ifndef ETHERTYPE_PPPOES2
-#define ETHERTYPE_PPPOES2      0x3c13
-#endif
 #ifndef        ETHERTYPE_LOOPBACK
 #define        ETHERTYPE_LOOPBACK      0x9000
 #endif