1 files changed, 2 insertions, 18 deletions
diff --git a/epan/dissectors/packet-rlc-lte.c b/epan/dissectors/packet-rlc-lte.c
index 3071ff347f..309bb14eb4 100644
--- a/epan/dissectors/packet-rlc-lte.c
+++ b/epan/dissectors/packet-rlc-lte.c
@@ -80,9 +80,6 @@ static gboolean global_rlc_lte_call_ip_for_mtch = FALSE;
 /* Preference to expect RLC headers without payloads */
 static gboolean global_rlc_lte_headers_expected = FALSE;
 
-/* Heuristic dissection */
-static gboolean global_rlc_lte_heur = FALSE;
-
 /* Re-assembly of segments */
 static gboolean global_rlc_lte_reassembly = TRUE;
 
@@ -2700,15 +2697,6 @@ static gboolean dissect_rlc_lte_heur(tvbuff_t *tvb, packet_info *pinfo,
     gboolean             infoAlreadySet = FALSE;
     gboolean             umSeqNumLengthTagPresent = FALSE;
 
-    /* This is a heuristic dissector, which means we get all the UDP
-     * traffic not sent to a known dissector and not claimed by
-     * a heuristic dissector called before us!
-     */
-
-    if (!global_rlc_lte_heur) {
-        return FALSE;
-    }
-
     /* Do this again on re-dissection to re-discover offset of actual PDU */
 
     /* Needs to be at least as long as:
@@ -3577,11 +3565,7 @@ void proto_register_rlc_lte(void)
         "only be called for complete PDUs (i.e. not segmented over RLC)",
         &global_rlc_lte_call_ip_for_mtch);
 
-    prefs_register_bool_preference(rlc_lte_module, "heuristic_rlc_lte_over_udp",
-        "Try Heuristic LTE-RLC over UDP framing",
-        "When enabled, use heuristic dissector to find RLC-LTE frames sent with "
-        "UDP framing",
-        &global_rlc_lte_heur);
+    prefs_register_obsolete_preference(rlc_lte_module, "heuristic_rlc_lte_over_udp");
 
     prefs_register_bool_preference(rlc_lte_module, "header_only_mode",
         "May see RLC headers only",
@@ -3606,7 +3590,7 @@ void proto_register_rlc_lte(void)
 void proto_reg_handoff_rlc_lte(void)
 {
     /* Add as a heuristic UDP dissector */
-    heur_dissector_add("udp", dissect_rlc_lte_heur, "RLC-LTE over UDP", "rlc_lte_udp", proto_rlc_lte);
+    heur_dissector_add("udp", dissect_rlc_lte_heur, "RLC-LTE over UDP", "rlc_lte_udp", proto_rlc_lte, HEURISTIC_DISABLE);
 
     pdcp_lte_handle = find_dissector("pdcp-lte");
     ip_handle       = find_dissector("ip");