1 files changed, 3 insertions, 14 deletions
diff --git a/epan/dissectors/packet-cell_broadcast.c b/epan/dissectors/packet-cell_broadcast.c
index 608af7463a..23162d7832 100644
--- a/epan/dissectors/packet-cell_broadcast.c
+++ b/epan/dissectors/packet-cell_broadcast.c
@@ -160,18 +160,6 @@ static const fragment_items gsm_page_items = {
    "pages"
 };
 
-
-static void gsm_cbs_message_reassembly_init(void)
-{
-  reassembly_table_init(&gsm_cbs_reassembly_table,
-                        &addresses_reassembly_table_functions);
-}
-
-static void gsm_cbs_message_reassembly_cleanup(void)
-{
-  reassembly_table_destroy(&gsm_cbs_reassembly_table);
-}
-
 guint dissect_cbs_serial_number(tvbuff_t *tvb, proto_tree *tree, guint offset)
 {
    guint16 serial_number = tvb_get_ntohs(tvb, offset) ;
@@ -571,8 +559,9 @@ proto_register_cbs(void)
    proto_cell_broadcast = proto_register_protocol("GSM Cell Broadcast Service", "GSM Cell Broadcast Service", "gsm_cbs");
 
    proto_register_field_array(proto_cell_broadcast, hf_cbs, array_length(hf_cbs));
-   register_init_routine(gsm_cbs_message_reassembly_init);
-   register_cleanup_routine(gsm_cbs_message_reassembly_cleanup);
+
+   reassembly_table_register(&gsm_cbs_reassembly_table,
+                        &addresses_reassembly_table_functions);
 
    /* subdissector code */
    register_dissector("gsm_cbs", dissect_gsm_cell_broadcast, proto_cell_broadcast);