NDOize safeputs() and safeputchar()

[tcpdump] / ethertype.h

diff --git a/ethertype.h b/ethertype.h
index 8c063396d9ec9b242e93a6b63c23133c07b13c0b..1a5791ea39c14243ee690b5f1b24990c91aed62b 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)
  */
 
 /*
@@ -153,6 +151,9 @@
 #ifndef ETHERTYPE_PPPOES2
 #define ETHERTYPE_PPPOES2      0x3c13
 #endif
+#ifndef ETHERTYPE_MS_NLB_HB
+#define ETHERTYPE_MS_NLB_HB    0x886f /* MS Network Load Balancing Heartbeat */
+#endif
 #ifndef ETHERTYPE_JUMBO
 #define ETHERTYPE_JUMBO         0x8870
 #endif
@@ -169,7 +170,7 @@
 #define        ETHERTYPE_LOOPBACK      0x9000
 #endif
 #ifndef        ETHERTYPE_VMAN
-#define        ETHERTYPE_VMAN          0x9100 /* Extreme VMAN Protocol */ 
+#define        ETHERTYPE_VMAN          0x9100 /* Extreme VMAN Protocol */
 #endif
 #ifndef        ETHERTYPE_CFM_OLD
 #define        ETHERTYPE_CFM_OLD       0xabcd /* 802.1ag depreciated */
@@ -180,5 +181,14 @@
 #ifndef        ETHERTYPE_ISO
 #define        ETHERTYPE_ISO           0xfefe  /* nonstandard - used in Cisco HDLC encapsulation */
 #endif
+#ifndef        ETHERTYPE_CALM_FAST
+#define        ETHERTYPE_CALM_FAST     0x1111  /* ISO CALM FAST */
+#endif
+#ifndef        ETHERTYPE_GEONET_OLD
+#define        ETHERTYPE_GEONET_OLD    0x0707  /* ETSI GeoNetworking (before Jan 2013) */
+#endif
+#ifndef        ETHERTYPE_GEONET
+#define        ETHERTYPE_GEONET        0x8947  /* ETSI GeoNetworking (Official IEEE registration from Jan 2013) */
+#endif
 
 extern const struct tok ethertype_values[];