Merge pull request #760 from leres/master

[tcpdump] / ethertype.h

diff --git a/ethertype.h b/ethertype.h
index 2aa53a08823dd6d755b80a33632a03013a7eb566..2bddd734df7afe838bb7e92c537a151550354469 100644 (file)
--- a/ethertype.h
+++ b/ethertype.h
@@ -19,6 +19,13 @@
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 
+/*
+ * Maximum length of the length field in an Ethernet header; any value
+ * greater than this is not a length value, so it's either an Ethernet
+ * type or an invalid value.
+ */
+#define        MAX_ETHERNET_LENGTH_VAL 1500
+
 /*
  * Ethernet types.
  *
@@ -145,6 +152,9 @@
 #ifndef ETHERTYPE_PPPOES
 #define ETHERTYPE_PPPOES       0x8864
 #endif
+#ifndef ETHERTYPE_NSH
+#define ETHERTYPE_NSH          0x894F
+#endif
 #ifndef ETHERTYPE_PPPOED2
 #define ETHERTYPE_PPPOED2      0x3c12
 #endif
@@ -196,8 +206,5 @@
 #ifndef        ETHERTYPE_GEONET
 #define        ETHERTYPE_GEONET        0x8947  /* ETSI GeoNetworking (Official IEEE registration from Jan 2013) */
 #endif
-#ifndef        ETHERTYPE_MEDSA
-#define        ETHERTYPE_MEDSA         0xdada  /* Marvel Distributed Switch Architecture */
-#endif
 
 extern const struct tok ethertype_values[];