diff options
| author | Gerald Combs <gerald@wireshark.org> | 2012-05-10 00:21:40 +0000 |
|---|---|---|
| committer | Gerald Combs <gerald@wireshark.org> | 2012-05-10 00:21:40 +0000 |
| commit | dedd0eadd0d56367946a3fe84585f1892fa91dc0 (patch) | |
| tree | 3620c92dd0cf682517644cd18fc306d3e9cd65e3 /plugins/wimax/mac_hd_generic_decoder.c | |
| parent | 4d30e72575cbf63b84918309985513f71dff224c (diff) | |
| download | wireshark-dedd0eadd0d56367946a3fe84585f1892fa91dc0.tar.gz | |
Better fixes for the last commit.
svn path=/trunk/; revision=42529
Diffstat (limited to 'plugins/wimax/mac_hd_generic_decoder.c')
| -rw-r--r-- | plugins/wimax/mac_hd_generic_decoder.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/plugins/wimax/mac_hd_generic_decoder.c b/plugins/wimax/mac_hd_generic_decoder.c index 478d2e28b2..11630f87cd 100644 --- 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) |