aboutsummaryrefslogtreecommitdiffstats
path: root/epan/dissectors/packet-ethertype.c
diff options
context:
space:
mode:
Diffstat (limited to 'epan/dissectors/packet-ethertype.c')
-rw-r--r--epan/dissectors/packet-ethertype.c11
1 files changed, 1 insertions, 10 deletions
diff --git a/epan/dissectors/packet-ethertype.c b/epan/dissectors/packet-ethertype.c
index 4b177417d5..8a88cebf4e 100644
--- a/epan/dissectors/packet-ethertype.c
+++ b/epan/dissectors/packet-ethertype.c
@@ -37,12 +37,9 @@
#include "packet-eth.h"
void proto_register_ethertype(void);
-void proto_reg_handoff_ethertype(void);
static dissector_table_t ethertype_dissector_table;
-static dissector_handle_t data_handle;
-
static int proto_ethertype = -1;
const value_string etype_vals[] = {
@@ -281,7 +278,7 @@ dissect_ethertype(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *dat
if (!dissector_found) {
/* No sub-dissector found.
Label rest of packet as "Data" */
- call_dissector(data_handle,next_tvb, pinfo, tree);
+ call_data_dissector(next_tvb, pinfo, tree);
/* Label protocol */
col_add_fstr(pinfo->cinfo, COL_PROTOCOL, "0x%04x", ethertype_data->etype);
@@ -358,12 +355,6 @@ proto_register_ethertype(void)
register_decode_as(&ethertype_da);
}
-void
-proto_reg_handoff_ethertype(void)
-{
- data_handle = find_dissector("data");
-}
-
/*
* Editor modelines - http://www.wireshark.org/tools/modelines.html
*