aboutsummaryrefslogtreecommitdiffstats
path: root/epan/dissectors/packet-ethertype.c
diff options
context:
space:
mode:
authorAnders Broman <anders.broman@ericsson.com>2010-12-16 21:49:55 +0000
committerAnders Broman <anders.broman@ericsson.com>2010-12-16 21:49:55 +0000
commit96659d0252075a93ca806999377f41530d816990 (patch)
tree5549c6376613ea54d24d10068cc5a79caf09622e /epan/dissectors/packet-ethertype.c
parent6892af9c0a941a0d144335f58fa1c92fcc0fd934 (diff)
From Jouni Malinen:
Add support for dissecting TDLS (IEEE 802.11z) frames. These are mostly used as Action frames that are encapsulated in Data frames (to go through any AP). https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5493 svn path=/trunk/; revision=35208
Diffstat (limited to 'epan/dissectors/packet-ethertype.c')
-rw-r--r--epan/dissectors/packet-ethertype.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/epan/dissectors/packet-ethertype.c b/epan/dissectors/packet-ethertype.c
index a29e00bef7..eb717f9bef 100644
--- a/epan/dissectors/packet-ethertype.c
+++ b/epan/dissectors/packet-ethertype.c
@@ -153,6 +153,7 @@ const value_string etype_vals[] = {
{ ETHERTYPE_LLT, "Veritas Low Latency Transport (not officially registered)" },
{ ETHERTYPE_CFM, "IEEE 802.1ag Connectivity Fault Management (CFM) protocol" },
{ ETHERTYPE_FCOE, "Fibre Channel over Ethernet" },
+ { ETHERTYPE_IEEE80211_DATA_ENCAP, "IEEE 802.11 data encapsulation" },
{ ETHERTYPE_FIP, "FCoE Initialization Protocol" },
{ ETHERTYPE_PTP, "PTPv2 over Ethernet (IEEE1588)" },
{ ETHERTYPE_PRP, "Parallel Redundancy Protocol (IEC62439 Chapter 6)" },