Fix Missing -z proto,colinfo,ip,gtp.teid_cp and -z proto,colinfo,ip,gtp.teid_data

[obnox/wireshark/wip.git] / epan / etypes.h

diff --git a/epan/etypes.h b/epan/etypes.h
index 217c0909a4fcffee21da27b15af373b6b03db9dc..2a55e011f6e3ffc705b336068cbbc336d151ae39 100644 (file)
--- a/epan/etypes.h
+++ b/epan/etypes.h
@@ -71,6 +71,14 @@
 #define ETHERTYPE_ARP          0x0806
 #endif
 
+#ifndef ETHERTYPE_WOL
+#define ETHERTYPE_WOL          0x0842 /* Wake on LAN.  Not offically registered. */
+#endif
+
+#ifndef ETHERTYPE_WMX_M2M
+#define ETHERTYPE_WMX_M2M      0x08f0
+#endif
+
 #ifndef ETHERTYPE_VINES_IP
 #define ETHERTYPE_VINES_IP     0x0bad
 #endif
@@ -170,6 +178,10 @@
 #define ETHERTYPE_VLAN         0x8100  /* 802.1Q Virtual LAN */
 #endif
 
+#ifndef ETHERTYPE_NSRP
+#define ETHERTYPE_NSRP         0x8133
+#endif
+
 #ifndef ETHERTYPE_IPX
 #define ETHERTYPE_IPX          0x8137
 #endif
@@ -246,6 +258,10 @@
 #define ETHERTYPE_MS_NLB_HEARTBEAT     0x886f  /* MS Network Load Balancing heartbeat http://www.microsoft.com/technet/treeview/default.asp?url=/TechNet/prodtechnol/windows2000serv/deploy/confeat/nlbovw.asp */
 #endif
 
+#ifndef ETHERTYPE_HOMEPLUG
+#define ETHERTYPE_HOMEPLUG    0x887B  /* IEEE assigned Ethertype */
+#endif
+
 #ifndef ETHERTYPE_CDMA2000_A10_UBS
 #define ETHERTYPE_CDMA2000_A10_UBS     0x8881  /* the byte stream protocol that is used for IP based micro-mobility bearer interfaces (A10) in CDMA2000(R)-based wireless networks */
 #endif
@@ -274,6 +290,14 @@
 #define ETHERTYPE_AOE           0x88A2
 #endif
 
+#ifndef ETHERTYPE_ECATF
+#define ETHERTYPE_ECATF 0x88A4 /* Ethernet type for EtherCAT frames */
+#endif
+
+#ifndef ETHERTYPE_IEEE_802_1AD
+#define ETHERTYPE_IEEE_802_1AD  0x88A8 /* IEEE 802.1ad Provider Bridge, Q-in-Q */
+#endif
+
 #ifndef ETHERTYPE_EPL_V2
 #define ETHERTYPE_EPL_V2        0x88AB
 #endif
@@ -324,10 +348,32 @@
 #endif                                                                 /* Specification (IOS) for cdma2000 Access Network Interfaces (document numbers A.S0011-B */
                                                                                /* through A.S0017-B v1.0). This document already uses the Ether type 8881 */
 
+#ifndef ETHERTYPE_LLTD
+#define ETHERTYPE_LLTD                 0x88d9  /* Link Layer Topology Discovery (LLTD) */
+#endif
+
 #ifndef ETHERTYPE_MRP
 #define ETHERTYPE_MRP          0x88e3  /* IEC 61158-6-10 Media Redundancy Protocol (MRP) */
 #endif
 
+#ifndef ETHERTYPE_IEEE_802_1AH
+#define ETHERTYPE_IEEE_802_1AH  0x88F0 /* IEEE 802.1ah Provider Backbone Bridge Mac-in-Mac */
+#endif
+
+#ifndef ETHERTYPE_PTP
+#define ETHERTYPE_PTP          0x88F7  /* IEEE1588v2 (PTPv2) over Ethernet */
+#endif                                                         /* in particular for the information exchange between IED's in a power */
+                                                                       /* transmission or distribution substation. */
+                                                                       /*  There are three types of application services */
+
+#ifndef ETHERTYPE_CFM
+#define ETHERTYPE_CFM          0x8902  /* IEEE 802.1ag Connectivity Fault Management */
+#endif                                                         /* (CFM) protocol. */
+
+#ifndef ETHERTYPE_FCOE
+#define ETHERTYPE_FCOE         0x8906  /* Fibre Channel over Ethernet */
+#endif
+
 #ifndef ETHERTYPE_LOOP
 #define ETHERTYPE_LOOP         0x9000  /* used for layer 2 testing (do i see my own frames on the wire) */
 #endif