From LEGO via bug 4405:

[obnox/wireshark/wip.git] / epan / dissectors / packet-dsp.c

diff --git a/epan/dissectors/packet-dsp.c b/epan/dissectors/packet-dsp.c
index f85238f1476dfcaa6de1441ffb0bd5109e83c6dc..ca1f6aef276438453388ed94db324f6789a5c335 100644 (file)
--- a/epan/dissectors/packet-dsp.c
+++ b/epan/dissectors/packet-dsp.c
@@ -757,7 +757,7 @@ static const ber_sequence_t AccessPointInformation_set[] = {
   { NULL, 0, 0, 0, NULL }
 };
 
-static int
+int
 dissect_dsp_AccessPointInformation(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
   offset = dissect_ber_set(implicit_tag, actx, tree, tvb, offset,
                               AccessPointInformation_set, hf_index, ett_dsp_AccessPointInformation);
@@ -1975,8 +1975,7 @@ dissect_dsp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree)
        }
 
        if(dsp_dissector) {
-         if (check_col(pinfo->cinfo, COL_INFO))
-           col_set_str(pinfo->cinfo, COL_INFO, dsp_op_name);
+    col_set_str(pinfo->cinfo, COL_INFO, dsp_op_name);
 
          while (tvb_reported_length_remaining(tvb, offset) > 0){
            old_offset=offset;
@@ -2549,7 +2548,7 @@ void proto_register_dsp(void) {
         "dsp.EXTERNAL", HFILL }},
 
 /*--- End of included file: packet-dsp-hfarr.c ---*/
-#line 278 "packet-dsp-template.c"
+#line 277 "packet-dsp-template.c"
   };
 
   /* List of subtrees */
@@ -2631,7 +2630,7 @@ void proto_register_dsp(void) {
     &ett_dsp_T_basicLevels,
 
 /*--- End of included file: packet-dsp-ettarr.c ---*/
-#line 284 "packet-dsp-template.c"
+#line 283 "packet-dsp-template.c"
   };
   module_t *dsp_module;
 
@@ -2672,7 +2671,7 @@ void proto_reg_handoff_dsp(void) {
 
 
 /*--- End of included file: packet-dsp-dis-tab.c ---*/
-#line 314 "packet-dsp-template.c"
+#line 313 "packet-dsp-template.c"
 
   /* APPLICATION CONTEXT */