added ETHERTYPE_PROFINET

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@8982 f5534014-38df-0310-8fa8-9805f1628bb7

diff --git a/etypes.h b/etypes.h
index ca25b129db39fd7812d461087eae6a72f1898b4a..c6c5cddfe80eb076f90197be6937d44b3e31ff38 100644 (file)
--- a/etypes.h
+++ b/etypes.h
@@ -1,7 +1,7 @@
 /* etypes.h
  * Defines ethernet packet types, similar to tcpdump's ethertype.h
  *
- * $Id: etypes.h,v 1.35 2003/10/08 06:44:15 guy Exp $
+ * $Id: etypes.h,v 1.36 2003/11/17 18:23:34 ulfl Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -42,6 +42,7 @@
  * RFCs 894, 1042, 826
  * tcpdump's ethertype.h
  * http://www.cavebear.com/CaveBear/Ethernet/
+ * http://standards.ieee.org/regauth/ethertype/type-pub.html
  */
 
 #ifndef ETHERTYPE_VINES_IP
@@ -199,6 +200,10 @@
 #define ETHERTYPE_EAPOL        0x888e  /* 802.1x Authentication */
 #endif
 
+#ifndef ETHERTYPE_PROFINET
+#define ETHERTYPE_PROFINET     0x8892  /* PROFIBUS PROFInet protocol */
+#endif
+
 #ifndef ETHERTYPE_HYPERSCSI
 #define ETHERTYPE_HYPERSCSI     0x889A  /* HyperSCSI */
 #endif

diff --git a/packet-ethertype.c b/packet-ethertype.c
index 30fb1d2a2e2722ac48118e36db54807f4dbe80fe..38aa4e1c873870be362b356c0eb7eb15e1dee1f6 100644 (file)
--- a/packet-ethertype.c
+++ b/packet-ethertype.c
@@ -1,7 +1,7 @@
 /* ethertype.c
  * Routines for calling the right protocol for the ethertype.
  *
- * $Id: packet-ethertype.c,v 1.39 2003/10/08 06:44:15 guy Exp $
+ * $Id: packet-ethertype.c,v 1.40 2003/11/17 18:23:34 ulfl Exp $
  *
  * Gilbert Ramirez <gram@alumni.rice.edu>
  *
@@ -83,6 +83,7 @@ const value_string etype_vals[] = {
     {ETHERTYPE_CGMP,           "Cisco Group Management Protocol" },
     {ETHERTYPE_SLOW_PROTOCOLS, "Slow Protocols"                },
     {ETHERTYPE_RTNET,          "RTNET Protocol"                },
+    {ETHERTYPE_PROFINET,       "PROFInet"                },
 
     /*
      * NDISWAN on Windows translates Ethernet frames from higher-level