osmocom
/
wireshark
14
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

Remove code commited by misstake. 

svn path=/trunk/; revision=39101
This commit is contained in:
Anders Broman 2011-09-23 11:22:48 +00:00
parent 7c0741ad15
commit d150a694cb
1 changed files with 2 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
epan/dissectors/packet-ethertype.c
View File

@ -42,7 +42,6 @@
#include "packet-vines.h"
#include <epan/etypes.h>
#include <epan/ppptypes.h>
#include <epan/prefs.h>
static dissector_table_t ethertype_dissector_table;
@ -221,21 +220,11 @@ ethertype(guint16 etype, tvbuff_t *tvb, int offset_after_etype,
volatile gboolean dissector_found = FALSE;
const char *volatile saved_proto;
void *pd_save;
module_t *eth_module;
pref_t *q_in_q_pref;
/* Add the Ethernet type to the protocol tree */
if (tree) {
eth_module = prefs_find_module("eth");
if (eth_module)
q_in_q_pref = prefs_find_preference(eth_module, "qinq_ethertype");
if (q_in_q_pref && (etype == prefs_get_uint_preference(q_in_q_pref)))
proto_tree_add_uint_format_value(fh_tree, etype_id, tvb,
offset_after_etype - 2, 2, etype,
"802.1QinQ VLAN in VLAN tunneling (0x%04x)", etype);
else
proto_tree_add_uint(fh_tree, etype_id, tvb,
offset_after_etype - 2, 2, etype);
proto_tree_add_uint(fh_tree, etype_id, tvb,
offset_after_etype - 2, 2, etype);
}
/* Get the captured length and reported length of the data