aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAnders Broman <anders.broman@ericsson.com>2010-06-18 04:18:08 +0000
committerAnders Broman <anders.broman@ericsson.com>2010-06-18 04:18:08 +0000
commitcd4cfa05ac9bd7b4a3538781f60b8b2729fd4ebf (patch)
treed8be29b861bbbbceb0b56ad59a28a871a180be88
parent6aba7f71094e9a17af0a4f0398a931f793a934b7 (diff)
Add the Gigamon ethertype.
svn path=/trunk/; revision=33250
-rw-r--r--epan/dissectors/packet-ethertype.c1
-rw-r--r--epan/etypes.h4
2 files changed, 5 insertions, 0 deletions
diff --git a/epan/dissectors/packet-ethertype.c b/epan/dissectors/packet-ethertype.c
index c4147708b6..5b534acf95 100644
--- a/epan/dissectors/packet-ethertype.c
+++ b/epan/dissectors/packet-ethertype.c
@@ -105,6 +105,7 @@ const value_string etype_vals[] = {
{ ETHERTYPE_CGMP, "Cisco Group Management Protocol" },
{ ETHERTYPE_MSRP, "802.1Qat Multiple Stream Reservation Protocol" },
{ ETHERTYPE_AVBTP, "IEEE 1722 Audio Video Bridging Transport Protocol" },
+ { ETHERTYPE_GIGAMON, "Gigamon Header" },
{ ETHERTYPE_MAC_CONTROL, "MAC Control" },
{ ETHERTYPE_SLOW_PROTOCOLS, "Slow Protocols" },
{ ETHERTYPE_RTMAC, "Real-Time Media Access Control" },
diff --git a/epan/etypes.h b/epan/etypes.h
index a25619c072..5fb5590f92 100644
--- a/epan/etypes.h
+++ b/epan/etypes.h
@@ -111,6 +111,10 @@
#define ETHERTYPE_AVBTP 0x22F0
#endif
+#ifndef ETHERTYPE_GIGAMON
+#define ETHERTYPE_GIGAMON 0x22e5 /* Gigamon Header */
+#endif
+
#ifndef ETHERTYPE_CENTRINO_PROMISC
#define ETHERTYPE_CENTRINO_PROMISC 0x2452 /* Intel Centrino promiscuous packets */
#endif