1 files changed, 2 insertions, 15 deletions
diff --git a/epan/dissectors/packet-scsi.c b/epan/dissectors/packet-scsi.c
index 1a790efad7..58033f9056 100644
--- a/epan/dissectors/packet-scsi.c
+++ b/epan/dissectors/packet-scsi.c
@@ -795,19 +795,6 @@ const int *cdb_control_fields[6] = {
     NULL
 };
 
-static void
-scsi_defragment_init(void)
-{
-    reassembly_table_init(&scsi_reassembly_table,
-                          &addresses_reassembly_table_functions);
-}
-
-static void
-scsi_defragment_cleanup(void)
-{
-    reassembly_table_destroy(&scsi_reassembly_table);
-}
-
 static const fragment_items scsi_frag_items = {
     &ett_scsi_fragment,
     &ett_scsi_fragments,
@@ -7769,8 +7756,8 @@ proto_register_scsi(void)
                                    "Reassemble fragmented SCSI DATA IN/OUT transfers",
                                    "Whether fragmented SCSI DATA IN/OUT transfers should be reassembled",
                                    &scsi_defragment);
-    register_init_routine(scsi_defragment_init);
-    register_cleanup_routine(scsi_defragment_cleanup);
+    reassembly_table_register(&scsi_reassembly_table,
+                          &addresses_reassembly_table_functions);
 
     register_srt_table(proto_scsi, NULL, 1, scsistat_packet, scsistat_init, scsistat_param);