[UMTS RLC] Rename proto variable

To match the recently renamed file name.

Change-Id: Id784b955ec96a52a5f380d415094dce81e1774d5
Reviewed-on: https://code.wireshark.org/review/22222
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>

8 files changed, 61 insertions, 61 deletions

diff --git a/epan/dissectors/asn1/rrc/packet-rrc-template.c b/epan/dissectors/asn1/rrc/packet-rrc-template.c
index a4f0254535..7e3d81189c 100644
--- a/epan/dissectors/asn1/rrc/packet-rrc-template.c
+++ b/epan/dissectors/asn1/rrc/packet-rrc-template.c
@@ -61,7 +61,7 @@
 
 extern int proto_fp;       /*Handler to FP*/
 extern int proto_umts_mac; /*Handler to MAC*/
-extern int proto_rlc;      /*Handler to RLC*/
+extern int proto_umts_rlc; /*Handler to RLC*/
 
 GTree * hsdsch_muxed_flows = NULL;
 GTree * rrc_ciph_inf = NULL;
diff --git a/epan/dissectors/asn1/rrc/rrc.cnf b/epan/dissectors/asn1/rrc/rrc.cnf
index 1f471f7850..7bd44dd5ea 100644
--- a/epan/dissectors/asn1/rrc/rrc.cnf
+++ b/epan/dissectors/asn1/rrc/rrc.cnf
@@ -825,7 +825,7 @@ HNBName TYPE=FT_STRING DISPLAY=STR_UNICODE
   /* Trying to figure where to get the U-RNTI from Either from an ASN.1 field (if this is CCCH) or RLC's attached info (if this is DCCH) */
   fpinf = (fp_info *)p_get_proto_data(wmem_file_scope(), actx->pinfo, proto_fp, 0);
   macinf = (umts_mac_info *)p_get_proto_data(wmem_file_scope(), actx->pinfo, proto_umts_mac, 0);
-  rlcinf = (rlc_info *)p_get_proto_data(wmem_file_scope(), actx->pinfo, proto_rlc, 0);
+  rlcinf = (rlc_info *)p_get_proto_data(wmem_file_scope(), actx->pinfo, proto_umts_rlc, 0);
   if (fpinf && macinf && rlcinf) {
     switch(macinf->content[fpinf->cur_tb]){
       case MAC_DCCH:
diff --git a/epan/dissectors/packet-catapult-dct2000.c b/epan/dissectors/packet-catapult-dct2000.c
index d2ad449f03..ab18b65b7c 100644
--- a/epan/dissectors/packet-catapult-dct2000.c
+++ b/epan/dissectors/packet-catapult-dct2000.c
@@ -283,7 +283,7 @@ static const value_string lte_nas_rrc_opcode_vals[] = {
 #define MAX_OUTHDR_VALUES 32
 
 extern int proto_fp;
-extern int proto_rlc;
+extern int proto_umts_rlc;
 
 extern int proto_rlc_lte;
 extern int proto_pdcp_lte;
@@ -1679,7 +1679,7 @@ static void attach_rlc_info(packet_info *pinfo, guint32 urnti, guint8 rbid,
 {
     /* Only need to set info once per session. */
     struct fp_info  *p_fp_info;
-    struct rlc_info *p_rlc_info = (struct rlc_info *)p_get_proto_data(wmem_file_scope(), pinfo, proto_rlc, 0);
+    struct rlc_info *p_rlc_info = (struct rlc_info *)p_get_proto_data(wmem_file_scope(), pinfo, proto_umts_rlc, 0);
 
     if (p_rlc_info != NULL) {
         return;
@@ -1735,7 +1735,7 @@ static void attach_rlc_info(packet_info *pinfo, guint32 urnti, guint8 rbid,
     p_rlc_info->li_size[0] = (enum rlc_li_size)outhdr_values[0];
 
     /* Store info in packet */
-    p_add_proto_data(wmem_file_scope(), pinfo, proto_rlc, 0, p_rlc_info);
+    p_add_proto_data(wmem_file_scope(), pinfo, proto_umts_rlc, 0, p_rlc_info);
 
     /* Also store minimal FP info consulted by RLC dissector
        TODO: Don't really know direction, but use S/R flag to make
diff --git a/epan/dissectors/packet-fp_hint.c b/epan/dissectors/packet-fp_hint.c
index 3b99141ce3..d25763e783 100644
--- a/epan/dissectors/packet-fp_hint.c
+++ b/epan/dissectors/packet-fp_hint.c
@@ -37,7 +37,7 @@ void proto_reg_handoff_fp_hint(void);
 static int proto_fp_hint = -1;
 extern int proto_fp;
 extern int proto_umts_mac;
-extern int proto_rlc;
+extern int proto_umts_rlc;
 
 static int ett_fph = -1;
 static int ett_fph_rb = -1;
@@ -154,14 +154,14 @@ static guint16 assign_rb_info(tvbuff_t *tvb, packet_info *pinfo, guint16 offset,
     struct rlc_info *rlcinf;
 
     macinf = (umts_mac_info *)p_get_proto_data(wmem_file_scope(), pinfo, proto_umts_mac, 0);
-    rlcinf = (rlc_info *)p_get_proto_data(wmem_file_scope(), pinfo, proto_rlc, 0);
+    rlcinf = (rlc_info *)p_get_proto_data(wmem_file_scope(), pinfo, proto_umts_rlc, 0);
     if (!macinf) {
         macinf = wmem_new0(wmem_file_scope(), struct umts_mac_info);
         p_add_proto_data(wmem_file_scope(), pinfo, proto_umts_mac, 0, macinf);
     }
     if (!rlcinf) {
         rlcinf = wmem_new0(wmem_file_scope(), struct rlc_info);
-        p_add_proto_data(wmem_file_scope(), pinfo, proto_rlc, 0, rlcinf);
+        p_add_proto_data(wmem_file_scope(), pinfo, proto_umts_rlc, 0, rlcinf);
     }
 
     while (i < rbcnt) {
diff --git a/epan/dissectors/packet-rrc.c b/epan/dissectors/packet-rrc.c
index b8744efff1..5be823754d 100644
--- a/epan/dissectors/packet-rrc.c
+++ b/epan/dissectors/packet-rrc.c
@@ -69,7 +69,7 @@
 
 extern int proto_fp;       /*Handler to FP*/
 extern int proto_umts_mac; /*Handler to MAC*/
-extern int proto_rlc;      /*Handler to RLC*/
+extern int proto_umts_rlc;      /*Handler to RLC*/
 
 GTree * hsdsch_muxed_flows = NULL;
 GTree * rrc_ciph_inf = NULL;
@@ -38737,7 +38737,7 @@ dissect_rrc_C_RNTI(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, prot
   /* Trying to figure where to get the U-RNTI from Either from an ASN.1 field (if this is CCCH) or RLC's attached info (if this is DCCH) */
   fpinf = (fp_info *)p_get_proto_data(wmem_file_scope(), actx->pinfo, proto_fp, 0);
   macinf = (umts_mac_info *)p_get_proto_data(wmem_file_scope(), actx->pinfo, proto_umts_mac, 0);
-  rlcinf = (rlc_info *)p_get_proto_data(wmem_file_scope(), actx->pinfo, proto_rlc, 0);
+  rlcinf = (rlc_info *)p_get_proto_data(wmem_file_scope(), actx->pinfo, proto_umts_rlc, 0);
   if (fpinf && macinf && rlcinf) {
     switch(macinf->content[fpinf->cur_tb]){
       case MAC_DCCH:
diff --git a/epan/dissectors/packet-umts_fp.c b/epan/dissectors/packet-umts_fp.c
index c76e9a43f6..1e070994e1 100644
--- a/epan/dissectors/packet-umts_fp.c
+++ b/epan/dissectors/packet-umts_fp.c
@@ -62,7 +62,7 @@ void proto_reg_handoff_fp(void);
 
 int proto_fp = -1;
 extern int proto_umts_mac;
-extern int proto_rlc;
+extern int proto_umts_rlc;
 
 static int hf_fp_release = -1;
 static int hf_fp_release_version = -1;
@@ -2678,7 +2678,7 @@ dissect_e_dch_channel_info(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
         guint  total_bits = 0;
         gboolean dissected = FALSE;
 
-        rlcinf = (rlc_info *)p_get_proto_data(wmem_file_scope(), pinfo, proto_rlc, 0);
+        rlcinf = (rlc_info *)p_get_proto_data(wmem_file_scope(), pinfo, proto_umts_rlc, 0);
         if (!rlcinf) {
             rlcinf = wmem_new0(wmem_packet_scope(), rlc_info);
         }
@@ -3233,7 +3233,7 @@ dissect_hsdsch_channel_info(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
         rlc_info *rlcinf;
         guint32 user_identity;
 
-        rlcinf = (rlc_info *)p_get_proto_data(wmem_file_scope(), pinfo, proto_rlc, 0);
+        rlcinf = (rlc_info *)p_get_proto_data(wmem_file_scope(), pinfo, proto_umts_rlc, 0);
         if (!rlcinf) {
             rlcinf = wmem_new0(wmem_packet_scope(), rlc_info);
         }
@@ -3448,7 +3448,7 @@ dissect_hsdsch_type_2_channel_info(tvbuff_t *tvb, packet_info *pinfo, proto_tree
         rlc_info *rlcinf;
         guint32 user_identity;
 
-        rlcinf = (rlc_info *)p_get_proto_data(wmem_file_scope(), pinfo, proto_rlc, 0);
+        rlcinf = (rlc_info *)p_get_proto_data(wmem_file_scope(), pinfo, proto_umts_rlc, 0);
         if (!rlcinf) {
             rlcinf = wmem_new0(wmem_packet_scope(), rlc_info);
         }
@@ -3703,7 +3703,7 @@ void dissect_hsdsch_common_channel_info(tvbuff_t *tvb, packet_info *pinfo, proto
         umts_mac_info *macinf;
         rlc_info *rlcinf;
 
-        rlcinf = (rlc_info *)p_get_proto_data(wmem_file_scope(), pinfo, proto_rlc, 0);
+        rlcinf = (rlc_info *)p_get_proto_data(wmem_file_scope(), pinfo, proto_umts_rlc, 0);
         if (!rlcinf) {
             rlcinf = wmem_new0(wmem_packet_scope(), rlc_info);
         }
@@ -5074,7 +5074,7 @@ fp_set_per_packet_inf_from_conv(conversation_t *p_conv,
             rlcinf->li_size[0] = RLC_LI_7BITS;
             rlcinf->ciphered[0] = FALSE;
             rlcinf->deciphered[0] = FALSE;
-            p_add_proto_data(wmem_file_scope(), pinfo, proto_rlc, 0, rlcinf);
+            p_add_proto_data(wmem_file_scope(), pinfo, proto_umts_rlc, 0, rlcinf);
 
 
             return fpi;
@@ -5103,7 +5103,7 @@ fp_set_per_packet_inf_from_conv(conversation_t *p_conv,
             rlcinf->deciphered[0] = FALSE;
 
             p_add_proto_data(wmem_file_scope(), pinfo, proto_umts_mac, 0, macinf);
-            p_add_proto_data(wmem_file_scope(), pinfo, proto_rlc, 0, rlcinf);
+            p_add_proto_data(wmem_file_scope(), pinfo, proto_umts_rlc, 0, rlcinf);
 
             return fpi;
 
@@ -5211,7 +5211,7 @@ fp_set_per_packet_inf_from_conv(conversation_t *p_conv,
                 offset++;
             }
             p_add_proto_data(wmem_file_scope(), pinfo, proto_umts_mac, 0, macinf);
-            p_add_proto_data(wmem_file_scope(), pinfo, proto_rlc, 0, rlcinf);
+            p_add_proto_data(wmem_file_scope(), pinfo, proto_umts_rlc, 0, rlcinf);
             /* Set offset to point to first TFI */
             offset = 2;
             break;
@@ -5244,7 +5244,7 @@ fp_set_per_packet_inf_from_conv(conversation_t *p_conv,
             rlcinf->li_size[0] = RLC_LI_7BITS;
             rlcinf->ciphered[0] = FALSE;
             rlcinf->deciphered[0] = FALSE;
-            p_add_proto_data(wmem_file_scope(), pinfo, proto_rlc, 0, rlcinf);
+            p_add_proto_data(wmem_file_scope(), pinfo, proto_umts_rlc, 0, rlcinf);
             break;
 
         case CHANNEL_RACH_FDD:
@@ -5271,13 +5271,13 @@ fp_set_per_packet_inf_from_conv(conversation_t *p_conv,
                 rlcinf->urnti[chan] = fpi->com_context_id;    /*Note: For DCCH, MAC dissector will override this with C-RNTI/U-RNTI*/
             }
             p_add_proto_data(wmem_file_scope(), pinfo, proto_umts_mac, 0, macinf);
-            p_add_proto_data(wmem_file_scope(), pinfo, proto_rlc, 0, rlcinf);
+            p_add_proto_data(wmem_file_scope(), pinfo, proto_umts_rlc, 0, rlcinf);
             break;
         case CHANNEL_HSDSCH_COMMON:
             rlcinf = wmem_new0(wmem_file_scope(), rlc_info);
             macinf = wmem_new0(wmem_file_scope(), umts_mac_info);
             p_add_proto_data(wmem_file_scope(), pinfo, proto_umts_mac, 0, macinf);
-            p_add_proto_data(wmem_file_scope(), pinfo, proto_rlc, 0, rlcinf);
+            p_add_proto_data(wmem_file_scope(), pinfo, proto_umts_rlc, 0, rlcinf);
             break;
         default:
             expert_add_info(pinfo, NULL, &ei_fp_transport_channel_type_unknown);
diff --git a/epan/dissectors/packet-umts_mac.c b/epan/dissectors/packet-umts_mac.c
index 9d4ef97e1b..d89b720aa9 100644
--- a/epan/dissectors/packet-umts_mac.c
+++ b/epan/dissectors/packet-umts_mac.c
@@ -38,7 +38,7 @@ void proto_reg_handoff_umts_mac(void);
 
 int proto_umts_mac = -1;
 extern int proto_fp;
-extern int proto_rlc;
+extern int proto_umts_rlc;
 
 /* dissector fields */
 static int hf_mac_fach_fdd_tctf = -1;
@@ -371,7 +371,7 @@ static int dissect_mac_fdd_rach(tvbuff_t *tvb, packet_info *pinfo, proto_tree *t
 
     macinf = (umts_mac_info *)p_get_proto_data(wmem_file_scope(), pinfo, proto_umts_mac, 0);
     fpinf  = (fp_info *)p_get_proto_data(wmem_file_scope(), pinfo, proto_fp, 0);
-    rlcinf = (rlc_info *)p_get_proto_data(wmem_file_scope(), pinfo, proto_rlc, 0);
+    rlcinf = (rlc_info *)p_get_proto_data(wmem_file_scope(), pinfo, proto_umts_rlc, 0);
     if (!macinf || !fpinf) {
         proto_tree_add_expert(rach_tree, pinfo, &ei_mac_per_frame_info_missing, tvb, 0, -1);
         return 1;
@@ -463,7 +463,7 @@ static int dissect_mac_fdd_fach(tvbuff_t *tvb, packet_info *pinfo, proto_tree *t
 
     macinf = (umts_mac_info *)p_get_proto_data(wmem_file_scope(), pinfo, proto_umts_mac, 0);
     fpinf  = (fp_info *)p_get_proto_data(wmem_file_scope(), pinfo, proto_fp, 0);
-    rlcinf = (rlc_info *)p_get_proto_data(wmem_file_scope(), pinfo, proto_rlc, 0);
+    rlcinf = (rlc_info *)p_get_proto_data(wmem_file_scope(), pinfo, proto_umts_rlc, 0);
 
     if (!macinf || !fpinf) {
         proto_tree_add_expert(fach_tree, pinfo, &ei_mac_per_frame_info_missing, tvb, 0, -1);
@@ -581,7 +581,7 @@ static int dissect_mac_fdd_dch(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tr
 
     macinf = (umts_mac_info *)p_get_proto_data(wmem_file_scope(), pinfo, proto_umts_mac, 0);
     fpinf  = (fp_info *)p_get_proto_data(wmem_file_scope(), pinfo, proto_fp, 0);
-    rlcinf = (rlc_info *)p_get_proto_data(wmem_file_scope(), pinfo, proto_rlc, 0);
+    rlcinf = (rlc_info *)p_get_proto_data(wmem_file_scope(), pinfo, proto_umts_rlc, 0);
 
     if (!macinf || !fpinf) {
         proto_tree_add_expert(dch_tree, pinfo, &ei_mac_per_frame_info_missing, tvb, 0, -1);
@@ -1019,7 +1019,7 @@ static int dissect_mac_fdd_edch_type2(tvbuff_t *tvb, packet_info *pinfo, proto_t
     proto_item *pi, *temp;
     proto_tree *macis_pdu_tree, *macis_sdu_tree;
     umts_mac_is_info * mac_is_info = (umts_mac_is_info *)p_get_proto_data(wmem_file_scope(), pinfo, proto_umts_mac, 0);
-    rlc_info * rlcinf = (rlc_info *)p_get_proto_data(wmem_file_scope(), pinfo, proto_rlc, 0);
+    rlc_info * rlcinf = (rlc_info *)p_get_proto_data(wmem_file_scope(), pinfo, proto_umts_rlc, 0);
     struct fp_info *p_fp_info = (struct fp_info *)p_get_proto_data(wmem_file_scope(), pinfo, proto_fp, 0);
 
     DISSECTOR_ASSERT(mac_is_info != NULL && rlcinf != NULL && p_fp_info != NULL);
@@ -1243,7 +1243,7 @@ static int dissect_mac_fdd_hsdsch(tvbuff_t *tvb, packet_info *pinfo, proto_tree
         macinf->fake_chid[pos] = FALSE;
         macinf->content[pos] = lchId_type_table[macinf->lchid[pos]];    /*Lookup MAC content*/
 
-        rlcinf = (rlc_info *)p_get_proto_data(wmem_file_scope(), pinfo, proto_rlc, 0);
+        rlcinf = (rlc_info *)p_get_proto_data(wmem_file_scope(), pinfo, proto_umts_rlc, 0);
         rlcinf->rbid[pos] = macinf->lchid[pos];
         rlcinf->mode[pos] =  lchId_rlc_map[macinf->lchid[pos]]; /*Look up RLC mode*/
         bitoffs += 4;
diff --git a/epan/dissectors/packet-umts_rlc.c b/epan/dissectors/packet-umts_rlc.c
index 1311fad451..d427ddd1b6 100644
--- a/epan/dissectors/packet-umts_rlc.c
+++ b/epan/dissectors/packet-umts_rlc.c
@@ -48,7 +48,7 @@
 void proto_register_rlc(void);
 void proto_reg_handoff_rlc(void);
 
-int proto_rlc = -1;
+int proto_umts_rlc = -1;
 
 extern int proto_fp;
 
@@ -351,7 +351,7 @@ rlc_channel_assign(struct rlc_channel *ch, enum rlc_mode mode, packet_info *pinf
     fp_info         *fpinf;
 
     fpinf = (fp_info *)p_get_proto_data(wmem_file_scope(), pinfo, proto_fp, 0);
-    rlcinf = (rlc_info *)p_get_proto_data(wmem_file_scope(), pinfo, proto_rlc, 0);
+    rlcinf = (rlc_info *)p_get_proto_data(wmem_file_scope(), pinfo, proto_umts_rlc, 0);
     if (!fpinf || !rlcinf) return -1;
 
     if (rlcinf->urnti[fpinf->cur_tb]) {
@@ -1596,7 +1596,7 @@ dissect_rlc_tm(enum rlc_channel_type channel, tvbuff_t *tvb, packet_info *pinfo,
     rlc_info      *rlcinf;
 
     fpinf = (fp_info *)p_get_proto_data(wmem_file_scope(), pinfo, proto_fp, 0);
-    rlcinf = (rlc_info *)p_get_proto_data(wmem_file_scope(), pinfo, proto_rlc, 0);
+    rlcinf = (rlc_info *)p_get_proto_data(wmem_file_scope(), pinfo, proto_umts_rlc, 0);
 
     if (tree) {
         if (fpinf && rlcinf) {
@@ -1845,7 +1845,7 @@ dissect_rlc_um(enum rlc_channel_type channel, tvbuff_t *tvb, packet_info *pinfo,
     seq = next_byte >> 1;
 
     fpinf = (fp_info *)p_get_proto_data(wmem_file_scope(), pinfo, proto_fp, 0);
-    rlcinf = (rlc_info *)p_get_proto_data(wmem_file_scope(), pinfo, proto_rlc, 0);
+    rlcinf = (rlc_info *)p_get_proto_data(wmem_file_scope(), pinfo, proto_umts_rlc, 0);
 
     if (tree) {
         if (fpinf && rlcinf) {
@@ -2244,7 +2244,7 @@ dissect_rlc_am(enum rlc_channel_type channel, tvbuff_t *tvb, packet_info *pinfo,
     guint64        polling;
 
     fpinf = (fp_info *)p_get_proto_data(wmem_file_scope(), pinfo, proto_fp, 0);
-    rlcinf = (rlc_info *)p_get_proto_data(wmem_file_scope(), pinfo, proto_rlc, 0);
+    rlcinf = (rlc_info *)p_get_proto_data(wmem_file_scope(), pinfo, proto_umts_rlc, 0);
 
     next_byte = tvb_get_guint8(tvb, offs++);
     dc = next_byte >> 7;
@@ -2356,7 +2356,7 @@ dissect_rlc_pcch(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data
     /* PCCH is always RLC TM */
     if (tree) {
         proto_item *ti;
-        ti = proto_tree_add_item(tree, proto_rlc, tvb, 0, -1, ENC_NA);
+        ti = proto_tree_add_item(tree, proto_umts_rlc, tvb, 0, -1, ENC_NA);
         subtree = proto_item_add_subtree(ti, ett_rlc);
         proto_item_append_text(ti, " TM (PCCH)");
     }
@@ -2378,7 +2378,7 @@ dissect_rlc_bcch(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data
     if (!fpi) return 0; /* dissection failure */
 
     if (tree) {
-        ti = proto_tree_add_item(tree, proto_rlc, tvb, 0, -1, ENC_NA);
+        ti = proto_tree_add_item(tree, proto_umts_rlc, tvb, 0, -1, ENC_NA);
         subtree = proto_item_add_subtree(ti, ett_rlc);
     }
     proto_item_append_text(ti, " TM (BCCH)");
@@ -2401,7 +2401,7 @@ dissect_rlc_ccch(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data
     if (!fpi) return 0; /* dissection failure */
 
     if (tree) {
-        ti = proto_tree_add_item(tree, proto_rlc, tvb, 0, -1, ENC_NA);
+        ti = proto_tree_add_item(tree, proto_umts_rlc, tvb, 0, -1, ENC_NA);
         subtree = proto_item_add_subtree(ti, ett_rlc);
     }
 
@@ -2432,7 +2432,7 @@ dissect_rlc_ctch(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void  *dat
     if (!fpi) return 0; /* dissection failure */
 
     if (tree) {
-        ti = proto_tree_add_item(tree, proto_rlc, tvb, 0, -1, ENC_NA);
+        ti = proto_tree_add_item(tree, proto_umts_rlc, tvb, 0, -1, ENC_NA);
         subtree = proto_item_add_subtree(ti, ett_rlc);
     }
 
@@ -2456,7 +2456,7 @@ dissect_rlc_dcch(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data
     col_clear(pinfo->cinfo, COL_INFO);
 
     fpi = (fp_info *)p_get_proto_data(wmem_file_scope(), pinfo, proto_fp, 0);
-    rlci = (rlc_info *)p_get_proto_data(wmem_file_scope(), pinfo, proto_rlc, 0);
+    rlci = (rlc_info *)p_get_proto_data(wmem_file_scope(), pinfo, proto_umts_rlc, 0);
 
     if (!fpi || !rlci){
         proto_tree_add_expert(tree, pinfo, &ei_rlc_no_per_frame_data, tvb, 0, -1);
@@ -2464,7 +2464,7 @@ dissect_rlc_dcch(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data
     }
 
     if (tree) {
-        ti = proto_tree_add_item(tree, proto_rlc, tvb, 0, -1, ENC_NA);
+        ti = proto_tree_add_item(tree, proto_umts_rlc, tvb, 0, -1, ENC_NA);
         subtree = proto_item_add_subtree(ti, ett_rlc);
     }
 
@@ -2496,7 +2496,7 @@ dissect_rlc_ps_dtch(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *d
     col_clear(pinfo->cinfo, COL_INFO);
 
     fpi  = (fp_info *)p_get_proto_data(wmem_file_scope(), pinfo, proto_fp, 0);
-    rlci = (rlc_info *)p_get_proto_data(wmem_file_scope(), pinfo, proto_rlc, 0);
+    rlci = (rlc_info *)p_get_proto_data(wmem_file_scope(), pinfo, proto_umts_rlc, 0);
 
     if (!fpi || !rlci) {
         proto_tree_add_expert(tree, pinfo, &ei_rlc_no_per_frame_data, tvb, 0, -1);
@@ -2504,7 +2504,7 @@ dissect_rlc_ps_dtch(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *d
     }
 
     if (tree) {
-        ti = proto_tree_add_item(tree, proto_rlc, tvb, 0, -1, ENC_NA);
+        ti = proto_tree_add_item(tree, proto_umts_rlc, tvb, 0, -1, ENC_NA);
         subtree = proto_item_add_subtree(ti, ett_rlc);
     }
 
@@ -2538,12 +2538,12 @@ dissect_rlc_dch_unknown(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, voi
     col_clear(pinfo->cinfo, COL_INFO);
 
     fpi = (fp_info *)p_get_proto_data(wmem_file_scope(), pinfo, proto_fp, 0);
-    rlci = (rlc_info *)p_get_proto_data(wmem_file_scope(), pinfo, proto_rlc, 0);
+    rlci = (rlc_info *)p_get_proto_data(wmem_file_scope(), pinfo, proto_umts_rlc, 0);
 
     if (!fpi || !rlci) return 0;
 
     if (tree) {
-        ti = proto_tree_add_item(tree, proto_rlc, tvb, 0, -1, ENC_NA);
+        ti = proto_tree_add_item(tree, proto_umts_rlc, tvb, 0, -1, ENC_NA);
         subtree = proto_item_add_subtree(ti, ett_rlc);
     }
 
@@ -2608,7 +2608,7 @@ dissect_rlc_heur(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data
     } else {
         fpInfoAlreadySet = TRUE;
     }
-    rlci = (rlc_info *)p_get_proto_data(wmem_file_scope(), pinfo, proto_rlc, 0);
+    rlci = (rlc_info *)p_get_proto_data(wmem_file_scope(), pinfo, proto_umts_rlc, 0);
     if (rlci == NULL) {
         /* Allocate new info struct for this frame */
         rlci = (rlc_info *)wmem_alloc0(wmem_file_scope(), sizeof(rlc_info));
@@ -2672,7 +2672,7 @@ dissect_rlc_heur(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data
         p_add_proto_data(wmem_file_scope(), pinfo, proto_fp, 0, fpi);
     }
     if (!rlcInfoAlreadySet) {
-        p_add_proto_data(wmem_file_scope(), pinfo, proto_rlc, 0, rlci);
+        p_add_proto_data(wmem_file_scope(), pinfo, proto_umts_rlc, 0, rlci);
     }
 
     /**************************************/
@@ -2687,7 +2687,7 @@ dissect_rlc_heur(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data
             col_clear(pinfo->cinfo, COL_INFO);
 
             if (tree) {
-                ti = proto_tree_add_item(tree, proto_rlc, rlc_tvb, 0, -1, ENC_NA);
+                ti = proto_tree_add_item(tree, proto_umts_rlc, rlc_tvb, 0, -1, ENC_NA);
                 subtree = proto_item_add_subtree(ti, ett_rlc);
             }
 
@@ -2738,7 +2738,7 @@ rlc_is_ciphered(packet_info * pinfo){
     }
 
     fpinf = (fp_info *)p_get_proto_data(wmem_file_scope(), pinfo, proto_fp, 0);
-    rlcinf = (rlc_info *)p_get_proto_data(wmem_file_scope(), pinfo, proto_rlc, 0);
+    rlcinf = (rlc_info *)p_get_proto_data(wmem_file_scope(), pinfo, proto_umts_rlc, 0);
 
     return ((rlcinf && fpinf && (rlcinf->ciphered[fpinf->cur_tb] == TRUE) && (rlcinf->deciphered[fpinf->cur_tb] == FALSE))
             || global_rlc_ciphered);
@@ -2951,22 +2951,22 @@ proto_register_rlc(void)
         { &ei_rlc_incomplete_sequence, { "rlc.incomplete_sequence", PI_MALFORMED, PI_ERROR, "Error: Incomplete sequence", EXPFILL }},
     };
 
-    proto_rlc = proto_register_protocol("Radio Link Control", "RLC", "rlc");
-    register_dissector("rlc.bcch",        dissect_rlc_bcch,        proto_rlc);
-    register_dissector("rlc.pcch",        dissect_rlc_pcch,        proto_rlc);
-    register_dissector("rlc.ccch",        dissect_rlc_ccch,        proto_rlc);
-    register_dissector("rlc.ctch",        dissect_rlc_ctch,        proto_rlc);
-    register_dissector("rlc.dcch",        dissect_rlc_dcch,        proto_rlc);
-    register_dissector("rlc.ps_dtch",     dissect_rlc_ps_dtch,     proto_rlc);
-    register_dissector("rlc.dch_unknown", dissect_rlc_dch_unknown, proto_rlc);
+    proto_umts_rlc = proto_register_protocol("Radio Link Control", "RLC", "rlc");
+    register_dissector("rlc.bcch",        dissect_rlc_bcch,        proto_umts_rlc);
+    register_dissector("rlc.pcch",        dissect_rlc_pcch,        proto_umts_rlc);
+    register_dissector("rlc.ccch",        dissect_rlc_ccch,        proto_umts_rlc);
+    register_dissector("rlc.ctch",        dissect_rlc_ctch,        proto_umts_rlc);
+    register_dissector("rlc.dcch",        dissect_rlc_dcch,        proto_umts_rlc);
+    register_dissector("rlc.ps_dtch",     dissect_rlc_ps_dtch,     proto_umts_rlc);
+    register_dissector("rlc.dch_unknown", dissect_rlc_dch_unknown, proto_umts_rlc);
 
-    proto_register_field_array(proto_rlc, hf, array_length(hf));
+    proto_register_field_array(proto_umts_rlc, hf, array_length(hf));
     proto_register_subtree_array(ett, array_length(ett));
-    expert_rlc = expert_register_protocol(proto_rlc);
+    expert_rlc = expert_register_protocol(proto_umts_rlc);
     expert_register_field_array(expert_rlc, ei, array_length(ei));
 
     /* Preferences */
-    rlc_module = prefs_register_protocol(proto_rlc, NULL);
+    rlc_module = prefs_register_protocol(proto_umts_rlc, NULL);
 
     prefs_register_obsolete_preference(rlc_module, "heuristic_rlc_over_udp");
 
@@ -3008,11 +3008,11 @@ proto_register_rlc(void)
 void
 proto_reg_handoff_rlc(void)
 {
-    rrc_handle = find_dissector_add_dependency("rrc", proto_rlc);
-    ip_handle  = find_dissector_add_dependency("ip", proto_rlc);
-    bmc_handle = find_dissector_add_dependency("bmc", proto_rlc);
+    rrc_handle = find_dissector_add_dependency("rrc", proto_umts_rlc);
+    ip_handle  = find_dissector_add_dependency("ip", proto_umts_rlc);
+    bmc_handle = find_dissector_add_dependency("bmc", proto_umts_rlc);
     /* Add as a heuristic UDP dissector */
-    heur_dissector_add("udp", dissect_rlc_heur, "RLC over UDP", "rlc_udp", proto_rlc, HEURISTIC_DISABLE);
+    heur_dissector_add("udp", dissect_rlc_heur, "RLC over UDP", "rlc_udp", proto_umts_rlc, HEURISTIC_DISABLE);
 }
 
 /*