aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAnders Broman <anders.broman@ericsson.com>2010-05-24 04:09:03 +0000
committerAnders Broman <anders.broman@ericsson.com>2010-05-24 04:09:03 +0000
commita11836dc8b12ada0bfa8e944b72ac59c5fda7350 (patch)
tree2013f92a972c17cf1fef9222714794c4707a9bbe
parent5198a0b3de86eb3472aa2d5674d1ac4b565f8e29 (diff)
Move VLAN and ARP closer to the top.
svn path=/trunk/; revision=32927
-rw-r--r--epan/dissectors/packet-ethertype.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/epan/dissectors/packet-ethertype.c b/epan/dissectors/packet-ethertype.c
index 7b4f5496b8..c4147708b6 100644
--- a/epan/dissectors/packet-ethertype.c
+++ b/epan/dissectors/packet-ethertype.c
@@ -50,11 +50,12 @@ static dissector_handle_t data_handle;
const value_string etype_vals[] = {
{ ETHERTYPE_IP, "IP" },
{ ETHERTYPE_IPv6, "IPv6" },
+ { ETHERTYPE_VLAN, "802.1Q Virtual LAN" },
+ { ETHERTYPE_ARP, "ARP" },
{ ETHERTYPE_WLCCP, "Cisco Wireless Lan Context Control Protocol" },
{ ETHERTYPE_CENTRINO_PROMISC, "IEEE 802.11 (Centrino promiscuous)" },
{ ETHERTYPE_XNS_IDP, "XNS Internet Datagram Protocol" },
{ ETHERTYPE_X25L3, "X.25 Layer 3" },
- { ETHERTYPE_ARP, "ARP" },
{ ETHERTYPE_WOL, "Wake on LAN" },
{ ETHERTYPE_WMX_M2M, "WiMax Mac-to-Mac" },
{ ETHERTYPE_EPL_V1, "EPL_V1" },
@@ -84,7 +85,6 @@ const value_string etype_vals[] = {
{ ETHERTYPE_INTEL_ANS, "Intel ANS probe" },
{ ETHERTYPE_MS_NLB_HEARTBEAT, "MS NLB heartbeat" },
{ ETHERTYPE_HOMEPLUG, "Homeplug" },
- { ETHERTYPE_VLAN, "802.1Q Virtual LAN" },
{ ETHERTYPE_IEEE_802_1AD, "802.1ad Provider Bridge (Q-in-Q)" },
{ ETHERTYPE_IEEE_802_1AH, "802.1ah Provider Backbone Bridge (mac-in-mac)" },
{ ETHERTYPE_EAPOL, "802.1X Authentication" },