Better fixes for the last commit.

svn path=/trunk/; revision=42529

diff --git a/plugins/wimax/mac_hd_generic_decoder.c b/plugins/wimax/mac_hd_generic_decoder.c
index 478d2e28b2bc87fc60cbaa46b89693aa341290e2..11630f87cda018c79461ba4294515192ff97ad56 100644 (file)
--- a/plugins/wimax/mac_hd_generic_decoder.c
+++ b/plugins/wimax/mac_hd_generic_decoder.c
@@ -86,9 +86,7 @@ guint cid_broadcast        = 0xFFFF;
 
 /* forward reference */
 static gint extended_subheader_decoder(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree);
-#ifdef DEBUG /* for debug only */
 static gint arq_feedback_payload_decoder(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, proto_item *parent_item);
-#endif
 
 /* Static variables */
 static GHashTable *payload_frag_table = NULL;
@@ -1132,7 +1130,9 @@ void dissect_mac_header_generic_decoder(tvbuff_t *tvb, packet_info *pinfo, proto
                                        if (first_arq_fb_payload && arq_fb_payload)
                                        {       /* decode and display the ARQ feedback payload */
                                                first_arq_fb_payload = FALSE;
-#ifdef DEBUG /* for debug only */
+#ifndef DEBUG
+                                               arq_feedback_payload_decoder(tvb_new_subset(payload_tvb, payload_offset, new_payload_len, new_payload_len), pinfo, generic_tree, parent_item);
+#else
                                                ret_length = arq_feedback_payload_decoder(tvb_new_subset(payload_tvb, payload_offset, new_payload_len, new_payload_len), pinfo, generic_tree, parent_item);
                                                if (ret_length != new_payload_len)
                                                {       /* error */
@@ -1375,7 +1375,6 @@ static gint extended_subheader_decoder(tvbuff_t *tvb, packet_info *pinfo, proto_
        return ext_length;
 }
 
-#ifdef DEBUG /* for debug only */
 static gint arq_feedback_payload_decoder(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, proto_item *parent_item)
 {
        gint length, i;
@@ -1478,7 +1477,6 @@ static gint arq_feedback_payload_decoder(tvbuff_t *tvb, packet_info *pinfo, prot
        /* return the offset */
        return offset;
 }
-#endif /* DEBUG */
 
 /* Register Wimax Generic Mac Header Protocol and Dissector */
 void proto_register_mac_header_generic(void)

diff --git a/plugins/wimax/msg_dlmap.c b/plugins/wimax/msg_dlmap.c
index f33ae6c432eedbd085186691f89cf0ffc9685dbe..77f60b8b64d688a4f87cd04124e52ed89a5ef04a 100644 (file)
--- a/plugins/wimax/msg_dlmap.c
+++ b/plugins/wimax/msg_dlmap.c
@@ -2207,7 +2207,7 @@ gint wimax_decode_dlmapc(tvbuff_t *tvb, packet_info *pinfo, proto_tree *base_tre
         col_append_sep_str(pinfo->cinfo, COL_INFO, NULL, "Compressed UL-MAP");
 
         /* subtract 8 from lennib (CRC) */
-        /* nib += wimax_decode_ulmapc(base_tree, bufptr, nib, lennib - 8, tvb); */
+        wimax_decode_ulmapc(base_tree, bufptr, nib, lennib - 8, tvb);
     }
 
     /* CRC is always appended */