aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStig Bjørlykke <stig@bjorlykke.org>2016-08-18 19:15:53 +0200
committerMichael Mann <mmann78@netscape.net>2016-08-18 20:47:32 +0000
commit8accce861479c8d4f9d37a167c835c047c620b89 (patch)
tree3fe359da2115b27a8c85dc95bf68dbf0ae7a6d9e
parentea024e245e3db5f65a99479be54414ba5f2413fc (diff)
etypes: Add ETHERTYPE_LINK_CTL
The definition was found in the Linux kernel source code. Change-Id: I41d1435497042bc5905efc7e1af3941b9e8808e2 Ping-Bug: 12759 Reviewed-on: https://code.wireshark.org/review/17148 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
-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 f5a2057d4b..164b7e07ad 100644
--- a/epan/dissectors/packet-ethertype.c
+++ b/epan/dissectors/packet-ethertype.c
@@ -78,6 +78,7 @@ const value_string etype_vals[] = {
{ ETHERTYPE_QNX_QNET6, "QNX 6 QNET protocol" },
{ ETHERTYPE_PPPOED, "PPPoE Discovery" },
{ ETHERTYPE_PPPOES, "PPPoE Session" },
+ { ETHERTYPE_LINK_CTL, "HomePNA, wlan link local tunnel" },
{ ETHERTYPE_INTEL_ANS, "Intel ANS probe" },
{ ETHERTYPE_MS_NLB_HEARTBEAT, "MS NLB heartbeat" },
{ ETHERTYPE_JUMBO_LLC, "Jumbo LLC" },
diff --git a/epan/etypes.h b/epan/etypes.h
index 2e5acc7c80..2e3b661d1c 100644
--- a/epan/etypes.h
+++ b/epan/etypes.h
@@ -308,6 +308,10 @@ extern "C" {
#define ETHERTYPE_PPPOES 0x8864 /* PPPoE Session Protocol */
#endif
+#ifndef ETHERTYPE_LINK_CTL
+#define ETHERTYPE_LINK_CTL 0x886C /* HPNA, wlan link local tunnel */
+#endif
+
#ifndef ETHERTYPE_INTEL_ANS
#define ETHERTYPE_INTEL_ANS 0x886D /* Intel ANS (NIC teaming) http://www.intel.com/support/network/adapter/ans/probes.htm */
#endif