Merge pull request #435 from wolfgangkarall/sigusr1-man

[tcpdump] / ethertype.h

diff --git a/ethertype.h b/ethertype.h
index c98cff9db612c86d64fed416279a02269a8a262e..803991735eb297a748a5fe3ea35ed86510be7b53 100644 (file)
--- a/ethertype.h
+++ b/ethertype.h
@@ -17,8 +17,6 @@
  * 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)
  */
 
 /*
@@ -168,6 +166,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 +181,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