Merge pull request #760 from leres/master

[tcpdump] / ethertype.h

diff --git a/ethertype.h b/ethertype.h
index c98cff9db612c86d64fed416279a02269a8a262e..2bddd734df7afe838bb7e92c537a151550354469 100644 (file)
--- a/ethertype.h
+++ b/ethertype.h
@@ -17,10 +17,15 @@
  * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR IMPLIED
  * WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
- *
- * @(#) $Header: /tcpdump/master/tcpdump/ethertype.h,v 1.30 2008-02-06 10:47:53 guy Exp $ (LBL)
  */
 
+/*
+ * 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.
  *
@@ -147,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
@@ -168,6 +176,9 @@
 #ifndef ETHERTYPE_RRCP
 #define ETHERTYPE_RRCP         0x8899
 #endif
+#ifndef ETHERTYPE_AOE
+#define ETHERTYPE_AOE                  0x88a2
+#endif
 #ifndef        ETHERTYPE_LOOPBACK
 #define        ETHERTYPE_LOOPBACK      0x9000
 #endif
@@ -180,6 +191,9 @@
 #ifndef        ETHERTYPE_CFM
 #define        ETHERTYPE_CFM           0x8902 /* 802.1ag */
 #endif
+#ifndef        ETHERTYPE_IEEE1905_1
+#define        ETHERTYPE_IEEE1905_1    0x893a /* IEEE 1905.1 */
+#endif
 #ifndef        ETHERTYPE_ISO
 #define        ETHERTYPE_ISO           0xfefe  /* nonstandard - used in Cisco HDLC encapsulation */
 #endif