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, 6 insertions, 2 deletions

diff --git a/epan/dissectors/packet-pw-satop.c b/epan/dissectors/packet-pw-satop.c
index 4868daffb2..eb989cb097 100644
--- a/epan/dissectors/packet-pw-satop.c
+++ b/epan/dissectors/packet-pw-satop.c
@@ -460,17 +460,21 @@ void proto_register_pw_satop(void)
 	proto_register_subtree_array(ett_array, array_length(ett_array));
 	expert_pwsatop = expert_register_protocol(proto);
 	expert_register_field_array(expert_pwsatop, ei, array_length(ei));
-	register_dissector("pw_satop_mpls", dissect_pw_satop_mpls, proto);
 	register_dissector("pw_satop_udp", dissect_pw_satop_udp, proto);
 	return;
 }
 
 void proto_reg_handoff_pw_satop(void)
 {
+	dissector_handle_t pw_satop_mpls_handle;
+
 	data_handle = find_dissector("data");
 	pw_padding_handle = find_dissector("pw_padding");
+
 	/* For Decode As */
-	dissector_add_for_decode_as("mpls.label", find_dissector("pw_satop_mpls"));
+	pw_satop_mpls_handle = create_dissector_handle( dissect_pw_satop_mpls, proto );
+	dissector_add_for_decode_as("mpls.label", pw_satop_mpls_handle);
+
 	dissector_add_for_decode_as("udp.port", find_dissector("pw_satop_udp"));
 }