Add initial bounds check, get rid of union aodv.

[tcpdump] / ethertype.h

diff --git a/ethertype.h b/ethertype.h
index a6b14c595356b046828e0ca3c5b624587f252625..900bd38eec41ec0a77e81774104f95148c49f049 100644 (file)
--- a/ethertype.h
+++ b/ethertype.h
@@ -130,6 +130,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 +148,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