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, 5 insertions, 4 deletions

diff --git a/epan/dissectors/packet-pw-fr.c b/epan/dissectors/packet-pw-fr.c
index a3e513c732..3e962ddb58 100644
--- a/epan/dissectors/packet-pw-fr.c
+++ b/epan/dissectors/packet-pw-fr.c
@@ -305,16 +305,17 @@ static hf_register_info hf[] = {
 	proto_register_subtree_array(ett, array_length(ett));
 	expert_pwfr = expert_register_protocol(proto_encaps);
 	expert_register_field_array(expert_pwfr, ei, array_length(ei));
-	register_dissector("pw_fr", dissect_pw_fr, proto_encaps );
 }
 
 
 void
 proto_reg_handoff_pw_fr(void)
 {
-	dissector_handle_t h;
-	h = find_dissector("pw_fr");
-	dissector_add_for_decode_as("mpls.label", h);
+	dissector_handle_t pw_fr_mpls_handle;
+
+	pw_fr_mpls_handle = create_dissector_handle( dissect_pw_fr, proto_encaps );
+	dissector_add_for_decode_as("mpls.label", pw_fr_mpls_handle);
+
 	fr_stripped_address_handle = find_dissector("fr_stripped_address");
 }