Remove MPLS preference that doubled for Decode As.

Just use Decode As directly.
Also replace "registered" dissectors which just the creation of a handle since the dissectors really don't need to be "found" outside of themselves.

Change-Id: I1e0c3ae784b71c0145b1f1730a97feae8e9f488f
Reviewed-on: https://code.wireshark.org/review/7899
Reviewed-by: Michael Mann <mmann78@netscape.net>

1 files changed, 3 insertions, 8 deletions

diff --git a/epan/dissectors/packet-pw-eth.c b/epan/dissectors/packet-pw-eth.c
index af164220d6..eac4cb5e8b 100644
--- a/epan/dissectors/packet-pw-eth.c
+++ b/epan/dissectors/packet-pw-eth.c
@@ -191,11 +191,6 @@ proto_register_pw_eth(void)
                                 "pwethheuristic");
     proto_register_field_array(proto_pw_eth_cw, hf, array_length(hf));
     proto_register_subtree_array(ett, array_length(ett));
-    new_register_dissector("pw_eth_cw", dissect_pw_eth_cw, proto_pw_eth_cw);
-    register_dissector("pw_eth_nocw", dissect_pw_eth_nocw,
-                       proto_pw_eth_nocw);
-    register_dissector("pw_eth_heuristic", dissect_pw_eth_heuristic,
-                       proto_pw_eth_heuristic);
 }
 
 void
@@ -205,13 +200,13 @@ proto_reg_handoff_pw_eth(void)
 
     eth_withoutfcs_handle = find_dissector("eth_withoutfcs");
 
-    pw_eth_handle_cw = find_dissector("pw_eth_cw");
+    pw_eth_handle_cw = new_create_dissector_handle( dissect_pw_eth_cw, proto_pw_eth_cw );
     dissector_add_for_decode_as("mpls.label", pw_eth_handle_cw);
 
-    pw_eth_handle_nocw = find_dissector("pw_eth_nocw");
+    pw_eth_handle_nocw = create_dissector_handle( dissect_pw_eth_nocw, proto_pw_eth_nocw );
     dissector_add_for_decode_as("mpls.label", pw_eth_handle_nocw);
 
-    pw_eth_handle_heuristic = find_dissector("pw_eth_heuristic");
+    pw_eth_handle_heuristic = create_dissector_handle( dissect_pw_eth_heuristic, proto_pw_eth_heuristic );
     dissector_add_for_decode_as("mpls.label", pw_eth_handle_heuristic);
 }