Wimax dissector improvements:

1. Remove message type field from all MAC Management "sub"dissectors and place it in Mac Management subdissector itself.  This may cause backwards-compatibility issues (malformed packets) with third-party subdissectors of the MAC Management dissector, but it didn't make sense to have so many filters for a single enumerated value, especially when the various "protocol" filters covers many of them.

2. Removed some if(tree) checks as column info and calling other dissectors are sometimes executed underneath.  Some of this is in preparation for addressing bug 5349.

3. Make all dissector functions (and a few others) static, and use register_dissector() when necessary.

4. Convert generic decoder CRC errors into expert info, rather than have it be a "protocol" filter (it just looks funny that way)


In general, these dissectors seem "over-protocolized". I understand the need for all of the dissectors, but I don't know if they all need "protocol" status.

svn path=/trunk/; revision=52203

1 files changed, 32 insertions, 74 deletions

diff --git a/plugins/wimax/msg_ulmap.c b/plugins/wimax/msg_ulmap.c
index 248b30d6c3..098bb9700c 100644
--- a/plugins/wimax/msg_ulmap.c
+++ b/plugins/wimax/msg_ulmap.c
@@ -36,7 +36,6 @@
 #include "wimax_mac.h"
 #include "wimax_bits.h"
 
-extern gint proto_mac_mgmt_msg_dlmap_decoder;
 extern	gboolean include_cor2_changes;
 
 #define MAC_MGMT_MSG_ULMAP 3
@@ -55,8 +54,6 @@ extern	gboolean include_cor2_changes;
     nib += nibs; \
     } while(0)
 
-extern gint man_ofdma;
-
 /* from msg_ucd.c */
 extern guint cqich_id_size;		/* Set for CQICH_Alloc_IE */
 
@@ -200,7 +197,6 @@ static const value_string boost_msgs[] =
 };
 
 /* ul-map fields */
-static gint hf_ulmap_message_type = -1;
 static gint hf_ulmap_reserved = -1;
 static gint hf_ulmap_ucd_count = -1;
 static gint hf_ulmap_alloc_start_time = -1;
@@ -266,7 +262,7 @@ void init_wimax_globals(void)
  * these functions take offset/length in bits
  *******************************************************************/
 
-gint Dedicated_UL_Control_IE(proto_tree *uiuc_tree, const guint8 *bufptr, gint offset, gint length, tvbuff_t *tvb)
+static gint Dedicated_UL_Control_IE(proto_tree *uiuc_tree, const guint8 *bufptr, gint offset, gint length, tvbuff_t *tvb)
 {
     /* 8.4.5.4.24.1 Dedicated_UL_Control_IE -- table 302r */
     /* UL-MAP HARQ Sub-Burst IE * offset/length are in bits */
@@ -290,7 +286,7 @@ gint Dedicated_UL_Control_IE(proto_tree *uiuc_tree, const guint8 *bufptr, gint o
     return (bit - offset); /* length in bits */
 }
 
-gint Dedicated_MIMO_UL_Control_IE(proto_tree *uiuc_tree, const guint8 *bufptr, gint offset, gint length, tvbuff_t *tvb)
+static gint Dedicated_MIMO_UL_Control_IE(proto_tree *uiuc_tree, const guint8 *bufptr, gint offset, gint length, tvbuff_t *tvb)
 {
     /* 8.4.5.4.24.2 Dedicated_MIMO_UL_Control_IE -- table 302s */
     /* UL-MAP HARQ Sub-Burst IE * offset/length are in bits */
@@ -312,7 +308,7 @@ gint Dedicated_MIMO_UL_Control_IE(proto_tree *uiuc_tree, const guint8 *bufptr, g
 
 /* begin Sub-Burst IEs */
 
-gint UL_HARQ_Chase_Sub_Burst_IE(proto_tree *uiuc_tree, const guint8 *bufptr, gint offset, gint length, tvbuff_t *tvb)
+static gint UL_HARQ_Chase_Sub_Burst_IE(proto_tree *uiuc_tree, const guint8 *bufptr, gint offset, gint length, tvbuff_t *tvb)
 {
     /* 8.4.5.4.24 UL_HARQ_Chase_sub_burst_IE -- table 302k */
     /* UL-MAP HARQ Sub-Burst IE * offset/length are in bits */
@@ -361,7 +357,7 @@ gint UL_HARQ_Chase_Sub_Burst_IE(proto_tree *uiuc_tree, const guint8 *bufptr, gin
     return (bit - offset); /* length in bits */
 }
 
-gint UL_HARQ_IR_CTC_Sub_Burst_IE(proto_tree *uiuc_tree, const guint8 *bufptr, gint offset, gint length, tvbuff_t *tvb)
+static gint UL_HARQ_IR_CTC_Sub_Burst_IE(proto_tree *uiuc_tree, const guint8 *bufptr, gint offset, gint length, tvbuff_t *tvb)
 {
     /* 8.4.5.4.24 UL_HARQ_IR_CTC_sub_burst_IE -- table 302l */
     /* UL-MAP HARQ Sub-Burst IE * offset/length are in bits */
@@ -410,7 +406,7 @@ gint UL_HARQ_IR_CTC_Sub_Burst_IE(proto_tree *uiuc_tree, const guint8 *bufptr, gi
     return (bit - offset); /* length in bits */
 }
 
-gint UL_HARQ_IR_CC_Sub_Burst_IE(proto_tree *uiuc_tree, const guint8 *bufptr, gint offset, gint length, tvbuff_t *tvb)
+static gint UL_HARQ_IR_CC_Sub_Burst_IE(proto_tree *uiuc_tree, const guint8 *bufptr, gint offset, gint length, tvbuff_t *tvb)
 {
     /* 8.4.5.4.24 UL_HARQ_IR_CC_sub_burst_IE -- table 302m */
     /* UL-MAP HARQ Sub-Burst IE * offset/length are in bits */
@@ -460,7 +456,7 @@ gint UL_HARQ_IR_CC_Sub_Burst_IE(proto_tree *uiuc_tree, const guint8 *bufptr, gin
     return (bit - offset); /* length in bits */
 }
 
-gint MIMO_UL_Chase_HARQ_Sub_Burst_IE(proto_tree *uiuc_tree, const guint8 *bufptr, gint offset, gint length, tvbuff_t *tvb)
+static gint MIMO_UL_Chase_HARQ_Sub_Burst_IE(proto_tree *uiuc_tree, const guint8 *bufptr, gint offset, gint length, tvbuff_t *tvb)
 {
     /* 8.4.5.4.24 MIMO_UL_Chase_HARQ_Sub_Burst_IE -- table 302n */
     /* UL-MAP HARQ Sub-Burst IE * offset/length are in bits */
@@ -520,7 +516,7 @@ gint MIMO_UL_Chase_HARQ_Sub_Burst_IE(proto_tree *uiuc_tree, const guint8 *bufptr
     return (bit - offset); /* length in bits */
 }
 
-gint MIMO_UL_IR_HARQ__Sub_Burst_IE(proto_tree *uiuc_tree, const guint8 *bufptr, gint offset, gint length, tvbuff_t *tvb)
+static gint MIMO_UL_IR_HARQ__Sub_Burst_IE(proto_tree *uiuc_tree, const guint8 *bufptr, gint offset, gint length, tvbuff_t *tvb)
 {
     /* 8.4.5.4.24 MIMO_UL_IR_HARQ__Sub_Burst_IE -- table 302o */
     /* UL-MAP HARQ Sub-Burst IE * offset/length are in bits */
@@ -580,7 +576,7 @@ gint MIMO_UL_IR_HARQ__Sub_Burst_IE(proto_tree *uiuc_tree, const guint8 *bufptr,
     return (bit - offset); /* length in bits */
 }
 
-gint MIMO_UL_IR_HARQ_for_CC_Sub_Burst_UIE(proto_tree *uiuc_tree, const guint8 *bufptr, gint offset, gint length, tvbuff_t *tvb)
+static gint MIMO_UL_IR_HARQ_for_CC_Sub_Burst_UIE(proto_tree *uiuc_tree, const guint8 *bufptr, gint offset, gint length, tvbuff_t *tvb)
 {
     /* 8.4.5.4.24 MIMO_UL_IR_HARQ_for_CC_Sub_Burst_UIE -- table 302p */
     /* UL-MAP HARQ Sub-Burst IE * offset/length are in bits */
@@ -641,7 +637,7 @@ gint MIMO_UL_IR_HARQ_for_CC_Sub_Burst_UIE(proto_tree *uiuc_tree, const guint8 *b
     return (bit - offset); /* length in bits */
 }
 
-gint MIMO_UL_STC_HARQ_Sub_Burst_IE(proto_tree *uiuc_tree, const guint8 *bufptr, gint offset, gint length, tvbuff_t *tvb)
+static gint MIMO_UL_STC_HARQ_Sub_Burst_IE(proto_tree *uiuc_tree, const guint8 *bufptr, gint offset, gint length, tvbuff_t *tvb)
 {
     /* 8.4.5.4.24 MIMO_UL_STC_HARQ_Sub_Burst_IE -- table 302q */
     /* UL-MAP HARQ Sub-Burst IE * offset/length are in bits */
@@ -699,7 +695,7 @@ gint MIMO_UL_STC_HARQ_Sub_Burst_IE(proto_tree *uiuc_tree, const guint8 *bufptr,
  * table 290a
  *******************************************************************/
 
-gint Power_Control_IE(proto_tree *uiuc_tree, const guint8 *bufptr, gint offset, gint length, tvbuff_t *tvb)
+static gint Power_Control_IE(proto_tree *uiuc_tree, const guint8 *bufptr, gint offset, gint length, tvbuff_t *tvb)
 {
     /* UL-MAP Extended IE = 0 */
     /* 8.4.5.4.5 Power_Control_IE */
@@ -722,7 +718,7 @@ gint Power_Control_IE(proto_tree *uiuc_tree, const guint8 *bufptr, gint offset,
     return nib;
 }
 
-gint Mini_Subchannel_allocation_IE(proto_tree *uiuc_tree, const guint8 *bufptr, gint offset, gint length, tvbuff_t *tvb)
+static gint Mini_Subchannel_allocation_IE(proto_tree *uiuc_tree, const guint8 *bufptr, gint offset, gint length, tvbuff_t *tvb)
 {
     /* UL-MAP Extended IE = 1 */
     /* 8.4.5.4.8 [2] Mini-Subchannel_allocation_IE */
@@ -763,7 +759,7 @@ gint Mini_Subchannel_allocation_IE(proto_tree *uiuc_tree, const guint8 *bufptr,
     return BIT_TO_NIB(bit);
 }
 
-gint AAS_UL_IE(proto_tree *uiuc_tree, const guint8 *bufptr, gint offset, gint length, tvbuff_t *tvb)
+static gint AAS_UL_IE(proto_tree *uiuc_tree, const guint8 *bufptr, gint offset, gint length, tvbuff_t *tvb)
 {
     /* UL-MAP Extended IE = 2 */
     /* 8.4.5.4.6 [2] AAS_UL_IE*/
@@ -791,7 +787,7 @@ gint AAS_UL_IE(proto_tree *uiuc_tree, const guint8 *bufptr, gint offset, gint le
     return BIT_TO_NIB(bit);
 }
 
-gint CQICH_Alloc_IE(proto_tree *uiuc_tree, const guint8 *bufptr, gint offset, gint length, tvbuff_t *tvb)
+static gint CQICH_Alloc_IE(proto_tree *uiuc_tree, const guint8 *bufptr, gint offset, gint length, tvbuff_t *tvb)
 {
     /* UL-MAP Extended IE = 3 */
     /* 8.4.5.4.12 [2] CQICH_Alloc_IE */
@@ -863,7 +859,7 @@ gint CQICH_Alloc_IE(proto_tree *uiuc_tree, const guint8 *bufptr, gint offset, gi
     return BIT_TO_NIB(bit);	/* Return position in nibbles. */
 }
 
-gint UL_Zone_IE(proto_tree *uiuc_tree, const guint8 *bufptr, gint offset, gint length, tvbuff_t *tvb)
+static gint UL_Zone_IE(proto_tree *uiuc_tree, const guint8 *bufptr, gint offset, gint length, tvbuff_t *tvb)
 {
     /* UL-MAP Extended IE = 4 */
     /* 8.4.5.4.7 [2] UL_Zone_IE */
@@ -891,7 +887,7 @@ gint UL_Zone_IE(proto_tree *uiuc_tree, const guint8 *bufptr, gint offset, gint l
     return BIT_TO_NIB(bit);
 }
 
-gint PHYMOD_UL_IE(proto_tree *uiuc_tree, const guint8 *bufptr, gint offset, gint length, tvbuff_t *tvb)
+static gint PHYMOD_UL_IE(proto_tree *uiuc_tree, const guint8 *bufptr, gint offset, gint length, tvbuff_t *tvb)
 {
     /* UL-MAP Extended IE = 5 */
     /* 8.4.5.4.14 [2] PHYMOD_UL_IE */
@@ -921,7 +917,7 @@ gint PHYMOD_UL_IE(proto_tree *uiuc_tree, const guint8 *bufptr, gint offset, gint
     return BIT_TO_NIB(bit);
 }
 
-gint MIMO_UL_IE(proto_tree *uiuc_tree, const guint8 *bufptr, gint offset, gint length, tvbuff_t *tvb)
+static gint MIMO_UL_IE(proto_tree *uiuc_tree, const guint8 *bufptr, gint offset, gint length, tvbuff_t *tvb)
 {
     /* UL-MAP Extended IE = 6 */
     /* 8.4.5.4.11 MIMO_UL_Basic_IE (not implemented) */
@@ -942,7 +938,7 @@ gint MIMO_UL_IE(proto_tree *uiuc_tree, const guint8 *bufptr, gint offset, gint l
     return nib;
 }
 
-gint ULMAP_Fast_Tracking_IE(proto_tree *uiuc_tree, const guint8 *bufptr, gint offset, gint length, tvbuff_t *tvb)
+static gint ULMAP_Fast_Tracking_IE(proto_tree *uiuc_tree, const guint8 *bufptr, gint offset, gint length, tvbuff_t *tvb)
 {
     /* UL-MAP Extended IE = 7 */
     /* 8.4.5.4.22 [2] ULMAP_Fast_Tracking_IE */
@@ -972,7 +968,7 @@ gint ULMAP_Fast_Tracking_IE(proto_tree *uiuc_tree, const guint8 *bufptr, gint of
     return BIT_TO_NIB(bit);
 }
 
-gint UL_PUSC_Burst_Allocation_in_other_segment_IE(proto_tree *uiuc_tree, const guint8 *bufptr, gint offset, gint length, tvbuff_t *tvb)
+static gint UL_PUSC_Burst_Allocation_in_other_segment_IE(proto_tree *uiuc_tree, const guint8 *bufptr, gint offset, gint length, tvbuff_t *tvb)
 {
     /* UL-MAP Extended IE = 8 */
     /* 8.4.5.4.17 [2] UL_PUSC_Burst_Allocation_in_other_segment_IE */
@@ -1001,7 +997,7 @@ gint UL_PUSC_Burst_Allocation_in_other_segment_IE(proto_tree *uiuc_tree, const g
     return BIT_TO_NIB(bit);
 }
 
-gint Fast_Ranging_IE(proto_tree *uiuc_tree, const guint8 *bufptr, gint offset, gint length, tvbuff_t *tvb)
+static gint Fast_Ranging_IE(proto_tree *uiuc_tree, const guint8 *bufptr, gint offset, gint length, tvbuff_t *tvb)
 {
     /* UL-MAP Extended IE = 9 */
     /* 8.4.5.4.21 [2] Fast_Ranging_IE */
@@ -1036,7 +1032,7 @@ gint Fast_Ranging_IE(proto_tree *uiuc_tree, const guint8 *bufptr, gint offset, g
     return BIT_TO_NIB(bit);
 }
 
-gint UL_Allocation_Start_IE(proto_tree *uiuc_tree, const guint8 *bufptr, gint offset, gint length, tvbuff_t *tvb)
+static gint UL_Allocation_Start_IE(proto_tree *uiuc_tree, const guint8 *bufptr, gint offset, gint length, tvbuff_t *tvb)
 {
     /* UL-MAP Extended IE = 0xA */
     /* 8.4.5.4.15 [2] UL_Allocation_Start_IE */
@@ -1066,7 +1062,7 @@ gint UL_Allocation_Start_IE(proto_tree *uiuc_tree, const guint8 *bufptr, gint of
  * table 290c
  *******************************************************************/
 
-gint CQICH_Enhanced_Allocation_IE(proto_tree *uiuc_tree, const guint8 *bufptr, gint offset, gint length, tvbuff_t *tvb)
+static gint CQICH_Enhanced_Allocation_IE(proto_tree *uiuc_tree, const guint8 *bufptr, gint offset, gint length, tvbuff_t *tvb)
 {
     /* UL-MAP Extended-2 IE = 0 */
     /* 8.4.5.4.16 [2] CQICH_Enhanced_Allocation_IE */
@@ -1119,7 +1115,7 @@ gint CQICH_Enhanced_Allocation_IE(proto_tree *uiuc_tree, const guint8 *bufptr, g
     return BIT_TO_NIB(bit);
 }
 
-gint HO_Anchor_Active_UL_MAP_IE(proto_tree *uiuc_tree, const guint8 *bufptr, gint offset, gint length, tvbuff_t *tvb)
+static gint HO_Anchor_Active_UL_MAP_IE(proto_tree *uiuc_tree, const guint8 *bufptr, gint offset, gint length, tvbuff_t *tvb)
 {
     /* UL-MAP Extended-2 IE = 1 */
     /* 8.4.5.4.18 [2] HO_Anchor_Active_UL_MAP_IE (not implemented) */
@@ -1140,7 +1136,7 @@ gint HO_Anchor_Active_UL_MAP_IE(proto_tree *uiuc_tree, const guint8 *bufptr, gin
     return nib;
 }
 
-gint HO_Active_Anchor_UL_MAP_IE(proto_tree *uiuc_tree, const guint8 *bufptr, gint offset, gint length, tvbuff_t *tvb)
+static gint HO_Active_Anchor_UL_MAP_IE(proto_tree *uiuc_tree, const guint8 *bufptr, gint offset, gint length, tvbuff_t *tvb)
 {
     /* UL-MAP Extended-2 IE = 2 */
     /* 8.4.5.4.19 [2] HO_Active_Anchor_UL_MAP_IE (not implemented) */
@@ -1161,7 +1157,7 @@ gint HO_Active_Anchor_UL_MAP_IE(proto_tree *uiuc_tree, const guint8 *bufptr, gin
     return nib;
 }
 
-gint Anchor_BS_switch_IE(proto_tree *uiuc_tree, const guint8 *bufptr, gint offset, gint length, tvbuff_t *tvb)
+static gint Anchor_BS_switch_IE(proto_tree *uiuc_tree, const guint8 *bufptr, gint offset, gint length, tvbuff_t *tvb)
 {
     /* UL-MAP Extended-2 IE = 3 */
     /* 8.4.5.4.23 [2] Anchor_BS_switch_IE */
@@ -1221,7 +1217,7 @@ gint Anchor_BS_switch_IE(proto_tree *uiuc_tree, const guint8 *bufptr, gint offse
     return BIT_TO_NIB(bit);
 }
 
-gint UL_sounding_command_IE(proto_tree *uiuc_tree, const guint8 *bufptr, gint offset, gint length, tvbuff_t *tvb)
+static gint UL_sounding_command_IE(proto_tree *uiuc_tree, const guint8 *bufptr, gint offset, gint length, tvbuff_t *tvb)
 {
     /* UL-MAP Extended-2 IE = 4 */
     /* 8.4.5.4.26 [2] UL_sounding_command_IE */
@@ -1328,7 +1324,7 @@ gint UL_sounding_command_IE(proto_tree *uiuc_tree, const guint8 *bufptr, gint of
     return BIT_TO_NIB(bit);
 }
 
-gint MIMO_UL_Enhanced_IE(proto_tree *uiuc_tree, const guint8 *bufptr, gint offset, gint length, tvbuff_t *tvb)
+static gint MIMO_UL_Enhanced_IE(proto_tree *uiuc_tree, const guint8 *bufptr, gint offset, gint length, tvbuff_t *tvb)
 {
     /* UL-MAP Extended-2 IE = 6 */
     /* 8.4.5.4.20 [2] MIMO_UL_Enhanced_IE (not implemented) */
@@ -1349,7 +1345,7 @@ gint MIMO_UL_Enhanced_IE(proto_tree *uiuc_tree, const guint8 *bufptr, gint offse
     return nib;
 }
 
-gint HARQ_ULMAP_IE(proto_tree *uiuc_tree, const guint8 *bufptr, gint offset, gint length, tvbuff_t *tvb)
+static gint HARQ_ULMAP_IE(proto_tree *uiuc_tree, const guint8 *bufptr, gint offset, gint length, tvbuff_t *tvb)
 {
     /* UL-MAP Extended-2 IE = 7 */
     /* 8.4.5.4.24 HARQ_ULMAP_IE */
@@ -1412,7 +1408,7 @@ gint HARQ_ULMAP_IE(proto_tree *uiuc_tree, const guint8 *bufptr, gint offset, gin
     return BIT_TO_NIB(bit);
 }
 
-gint HARQ_ACKCH_Region_Allocation_IE(proto_tree *uiuc_tree, const guint8 *bufptr, gint offset, gint length, tvbuff_t *tvb)
+static gint HARQ_ACKCH_Region_Allocation_IE(proto_tree *uiuc_tree, const guint8 *bufptr, gint offset, gint length, tvbuff_t *tvb)
 {
     /* UL-MAP Extended-2 IE = 8 */
     /* 8.4.5.4.25 [2] HARQ_ACKCH_Region_Allocation_IE */
@@ -1437,7 +1433,7 @@ gint HARQ_ACKCH_Region_Allocation_IE(proto_tree *uiuc_tree, const guint8 *bufptr
     return BIT_TO_NIB(bit);
 }
 
-gint AAS_SDMA_UL_IE(proto_tree *uiuc_tree, const guint8 *bufptr, gint offset, gint length, tvbuff_t *tvb)
+static gint AAS_SDMA_UL_IE(proto_tree *uiuc_tree, const guint8 *bufptr, gint offset, gint length, tvbuff_t *tvb)
 {
     /* UL-MAP Extended-2 IE = 0xE */
     /* 8.4.5.4.27 [2] AAS_SDMA_UL_IE  */
@@ -1521,7 +1517,7 @@ gint AAS_SDMA_UL_IE(proto_tree *uiuc_tree, const guint8 *bufptr, gint offset, gi
     return BIT_TO_NIB(bit);
 }
 
-gint Feedback_Polling_IE(proto_tree *uiuc_tree, const guint8 *bufptr, gint offset, gint length, tvbuff_t *tvb)
+static gint Feedback_Polling_IE(proto_tree *uiuc_tree, const guint8 *bufptr, gint offset, gint length, tvbuff_t *tvb)
 {
     /* UL-MAP Extended-2 IE = 0xF */
     /* 8.4.5.4.28 [2] Feedback_Polling_IE */
@@ -1573,33 +1569,6 @@ gint Feedback_Polling_IE(proto_tree *uiuc_tree, const guint8 *bufptr, gint offse
  * UL-MAP Miscellany
  *******************************************************************/
 
-
-void lshift_bits(guint8 *buffer, gint bytes, gint bits)
-{
-    /* left shift a buffer by specified number of bits */
-    /* used for ULMAP ExtIE CQICH alloc IE */
-    gint i;
-    gint xbits;
-
-    while (bits >= 8) {
-        for (i=1; i<bytes; i++)
-            buffer[i-1] = buffer[i];
-        bits -= 8;
-        bytes--;
-    }
-    if (bits > 0)
-    {
-        xbits = 8 - bits;
-        for (i = 0; i < (bytes-1); i++) {
-            buffer[i] <<= bits;
-            buffer[i] |= (buffer[i+1] >> xbits);
-        }
-        buffer[bytes-1] <<= bits;
-    }
-}
-
-
-
 gint dissect_ulmap_ie( proto_tree *ie_tree, const guint8 *bufptr, gint offset, gint length _U_, tvbuff_t *tvb)
 {
     /* decode a single UL-MAP IE and return the
@@ -1895,7 +1864,7 @@ gint dissect_ulmap_ie( proto_tree *ie_tree, const guint8 *bufptr, gint offset, g
     return (nibble - offset);
 }
 
-void dissect_mac_mgmt_msg_ulmap_decoder(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree)
+static void dissect_mac_mgmt_msg_ulmap_decoder(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree)
 {
     /* 6.3.2.3.4 [2] UL-MAP table 18 */
     guint offset = 0;
@@ -1912,13 +1881,9 @@ void dissect_mac_mgmt_msg_ulmap_decoder(tvbuff_t *tvb, packet_info *pinfo _U_, p
     bufptr = tvb_get_ptr(tvb, offset, tvb_len);
 
     /* display MAC UL-MAP */
-    ti = proto_tree_add_protocol_format(tree, proto_mac_mgmt_msg_ulmap_decoder, tvb, offset, tvb_len, "UL-MAP (%u bytes)", tvb_len);
+    ti = proto_tree_add_protocol_format(tree, proto_mac_mgmt_msg_ulmap_decoder, tvb, offset, -1, "UL-MAP");
     ulmap_tree = proto_item_add_subtree(ti, ett_ulmap);
 
-    /* Decode and display the UL-MAP */
-    proto_tree_add_item(ulmap_tree, hf_ulmap_message_type, tvb, offset, 1, ENC_BIG_ENDIAN);
-    offset++;
-
     proto_tree_add_item(ulmap_tree, hf_ulmap_reserved, tvb, offset, 1, ENC_BIG_ENDIAN);
     offset++;
     proto_tree_add_item(ulmap_tree, hf_ulmap_ucd_count, tvb, offset, 1, ENC_BIG_ENDIAN);
@@ -2069,13 +2034,6 @@ void proto_register_mac_mgmt_msg_ulmap(void)
 	/* UL-MAP fields display */
 	static hf_register_info hf[] =
 	{
-		{
-			&hf_ulmap_message_type,
-			{
-				"MAC Management Message Type", "wmx.macmgtmsgtype.ulmap",
-				FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL
-			}
-		},
 #if 0
 		{
 			&hf_ulmap_fch_expected,