Change each filter prefix to match the protocol name ("wmx"). Add a
authorgerald <gerald@f5534014-38df-0310-8fa8-9805f1628bb7>
Wed, 28 Nov 2007 22:56:27 +0000 (22:56 +0000)
committergerald <gerald@f5534014-38df-0310-8fa8-9805f1628bb7>
Wed, 28 Nov 2007 22:56:27 +0000 (22:56 +0000)
"wmx" prefix to each sub-protocol. "wmx"-ize the preferences and
dissector registration.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@23660 f5534014-38df-0310-8fa8-9805f1628bb7

39 files changed:
plugins/wimax/mac_hd_generic_decoder.c
plugins/wimax/mac_hd_type1_decoder.c
plugins/wimax/mac_hd_type2_decoder.c
plugins/wimax/mac_mgmt_msg_decoder.c
plugins/wimax/msg_aas_beam.c
plugins/wimax/msg_aas_fbck.c
plugins/wimax/msg_arq.c
plugins/wimax/msg_clk_cmp.c
plugins/wimax/msg_dcd.c
plugins/wimax/msg_dlmap.c
plugins/wimax/msg_dreg.c
plugins/wimax/msg_dsa.c
plugins/wimax/msg_dsc.c
plugins/wimax/msg_dsd.c
plugins/wimax/msg_dsx_rvd.c
plugins/wimax/msg_fpc.c
plugins/wimax/msg_pkm.c
plugins/wimax/msg_pmc.c
plugins/wimax/msg_prc_lt_ctrl.c
plugins/wimax/msg_reg_req.c
plugins/wimax/msg_reg_rsp.c
plugins/wimax/msg_rep.c
plugins/wimax/msg_res_cmd.c
plugins/wimax/msg_rng_req.c
plugins/wimax/msg_rng_rsp.c
plugins/wimax/msg_sbc.c
plugins/wimax/msg_ucd.c
plugins/wimax/msg_ulmap.c
plugins/wimax/packet-wmx.c
plugins/wimax/wimax_cdma_code_decoder.c
plugins/wimax/wimax_compact_dlmap_ie_decoder.c
plugins/wimax/wimax_compact_ulmap_ie_decoder.c
plugins/wimax/wimax_fch_decoder.c
plugins/wimax/wimax_ffb_decoder.c
plugins/wimax/wimax_hack_decoder.c
plugins/wimax/wimax_harq_map_decoder.c
plugins/wimax/wimax_pdu_decoder.c
plugins/wimax/wimax_phy_attributes_decoder.c
plugins/wimax/wimax_utils.c

index 9a07d438e7b94a3bb88f19fa5d17590304d3c8f5..73948c06121e10f3fe58f59352f9d99d07f792f5 100644 (file)
@@ -292,7 +292,7 @@ static hf_register_info hf[] =
        {
                &hf_mac_header_generic_value_bytes,
                {
-                       "Values", "wimax.genericValueBytes",
+                       "Values", "wmx.genericValueBytes",
                        FT_BYTES, BASE_HEX, NULL, 0x0,
                        "", HFILL
                }
@@ -300,7 +300,7 @@ static hf_register_info hf[] =
        {
                &hf_mac_header_generic_ht,
                {
-                       "MAC Header Type", "wimax.genericHt",
+                       "MAC Header Type", "wmx.genericHt",
                        FT_UINT24, BASE_HEX, VALS(ht_msgs), WIMAX_MAC_HEADER_GENERIC_HT,
                        "", HFILL
                }
@@ -308,7 +308,7 @@ static hf_register_info hf[] =
        {
                &hf_mac_header_generic_ec,
                {
-                       "MAC Encryption Control", "wimax.genericEc",
+                       "MAC Encryption Control", "wmx.genericEc",
                        FT_UINT24, BASE_HEX, VALS(ec_msgs), WIMAX_MAC_HEADER_GENERIC_EC,
                        "", HFILL
                }
@@ -316,7 +316,7 @@ static hf_register_info hf[] =
        {
                &hf_mac_header_generic_type_0,
                {
-                       "MAC Sub-type Bit 0", "wimax.genericType0",
+                       "MAC Sub-type Bit 0", "wmx.genericType0",
                        FT_UINT24, BASE_HEX, VALS(type_msg0), WIMAX_MAC_HEADER_GENERIC_TYPE_0,
                        "", HFILL
                }
@@ -324,7 +324,7 @@ static hf_register_info hf[] =
        {
                &hf_mac_header_generic_type_1,
                {
-                       "MAC Sub-type Bit 1", "wimax.genericType1",
+                       "MAC Sub-type Bit 1", "wmx.genericType1",
                        FT_UINT24, BASE_HEX, VALS(type_msg1), WIMAX_MAC_HEADER_GENERIC_TYPE_1,
                        "", HFILL
                }
@@ -332,7 +332,7 @@ static hf_register_info hf[] =
        {
                &hf_mac_header_generic_type_2,
                {
-                       "MAC Sub-type Bit 2", "wimax.genericType2",
+                       "MAC Sub-type Bit 2", "wmx.genericType2",
                        FT_UINT24, BASE_HEX, VALS(type_msg2), WIMAX_MAC_HEADER_GENERIC_TYPE_2,
                        "", HFILL
                }
@@ -340,7 +340,7 @@ static hf_register_info hf[] =
        {
                &hf_mac_header_generic_type_3,
                {
-                       "MAC Sub-type Bit 3", "wimax.genericType3",
+                       "MAC Sub-type Bit 3", "wmx.genericType3",
                        FT_UINT24, BASE_HEX, VALS(type_msg3), WIMAX_MAC_HEADER_GENERIC_TYPE_3,
                        "", HFILL
                }
@@ -348,7 +348,7 @@ static hf_register_info hf[] =
        {
                &hf_mac_header_generic_type_4,
                {
-                       "MAC Sub-type Bit 4", "wimax.genericType4",
+                       "MAC Sub-type Bit 4", "wmx.genericType4",
                        FT_UINT24, BASE_HEX, VALS(type_msg4), WIMAX_MAC_HEADER_GENERIC_TYPE_4,
                        "", HFILL
                }
@@ -356,7 +356,7 @@ static hf_register_info hf[] =
        {
                &hf_mac_header_generic_type_5,
                {
-                       "MAC Sub-type Bit 5", "wimax.genericType5",
+                       "MAC Sub-type Bit 5", "wmx.genericType5",
                        FT_UINT24, BASE_HEX, VALS(type_msg5), WIMAX_MAC_HEADER_GENERIC_TYPE_5,
                        "", HFILL
                }
@@ -364,7 +364,7 @@ static hf_register_info hf[] =
        {
                &hf_mac_header_generic_esf,
                {
-                       "Extended Sub-header Field", "wimax.genericEsf",
+                       "Extended Sub-header Field", "wmx.genericEsf",
                        FT_UINT24, BASE_HEX, VALS(esf_msgs), WIMAX_MAC_HEADER_GENERIC_ESF,
                        "", HFILL
                }
@@ -372,7 +372,7 @@ static hf_register_info hf[] =
        {
                &hf_mac_header_generic_ci,
                {
-                       "CRC Indicator", "wimax.genericCi",
+                       "CRC Indicator", "wmx.genericCi",
                        FT_UINT24, BASE_HEX, VALS(ci_msgs), WIMAX_MAC_HEADER_GENERIC_CI,
                        "", HFILL
                }
@@ -380,7 +380,7 @@ static hf_register_info hf[] =
        {
                &hf_mac_header_generic_eks,
                {
-                       "Encryption Key Sequence", "wimax.genericEks",
+                       "Encryption Key Sequence", "wmx.genericEks",
                        FT_UINT24, BASE_HEX, NULL, WIMAX_MAC_HEADER_GENERIC_EKS,
                        "", HFILL
                }
@@ -388,7 +388,7 @@ static hf_register_info hf[] =
        {
                &hf_mac_header_generic_rsv,
                {
-                       "Reserved", "wimax.genericRsv",
+                       "Reserved", "wmx.genericRsv",
                        FT_UINT24, BASE_DEC, NULL, WIMAX_MAC_HEADER_GENERIC_RSV,
                        "", HFILL
                }
@@ -396,7 +396,7 @@ static hf_register_info hf[] =
        {
                &hf_mac_header_generic_len,
                {
-                       "Length", "wimax.genericLen",
+                       "Length", "wmx.genericLen",
                        FT_UINT24, BASE_DEC, NULL, WIMAX_MAC_HEADER_GENERIC_LEN,
                        "", HFILL
                }
@@ -404,7 +404,7 @@ static hf_register_info hf[] =
        {
                &hf_mac_header_generic_cid,
                {
-                       "Connection ID", "wimax.genericCid",
+                       "Connection ID", "wmx.genericCid",
                        FT_UINT16, BASE_DEC, NULL, 0x0,
                        "", HFILL
                }
@@ -412,7 +412,7 @@ static hf_register_info hf[] =
        {
                &hf_mac_header_generic_hcs,
                {
-                       "Header Check Sequence", "wimax.genericHcs",
+                       "Header Check Sequence", "wmx.genericHcs",
                        FT_UINT8, BASE_HEX, NULL, 0x0,
                        "", HFILL
                }
@@ -420,7 +420,7 @@ static hf_register_info hf[] =
        {
                &hf_mac_header_generic_crc,
                {
-                       "CRC", "wimax.genericCrc",
+                       "CRC", "wmx.genericCrc",
                        FT_UINT32, BASE_HEX, NULL, 0x0,
                        "", HFILL
                }
@@ -603,7 +603,7 @@ static hf_register_info hf_ext[] =
        {
                &hf_mac_header_generic_ext_subheader_rsv,
                {
-                       "Reserved", "wimax.genericExtSubhd.Rsv",
+                       "Reserved", "wmx.genericExtSubhd.Rsv",
                        FT_UINT8, BASE_DEC, NULL, EXTENDED_SUB_HEADER_RSV_MASK,
                        "", HFILL
                }
@@ -611,7 +611,7 @@ static hf_register_info hf_ext[] =
        {
                &hf_mac_header_generic_ext_subheader_type_dl,
                {
-                       "DL Extended Subheader Type", "wimax.genericExtSubhd.Dl",
+                       "DL Extended Subheader Type", "wmx.genericExtSubhd.Dl",
                        FT_UINT8, BASE_DEC, VALS(dl_ext_sub_header_type), EXTENDED_SUB_HEADER_TYPE_MASK,
                        "", HFILL
                }
@@ -619,7 +619,7 @@ static hf_register_info hf_ext[] =
        {
                &hf_mac_header_generic_ext_subheader_type_ul,
                {
-                       "UL Extended Subheader Type", "wimax.genericExtSubhd.Ul",
+                       "UL Extended Subheader Type", "wmx.genericExtSubhd.Ul",
                        FT_UINT8, BASE_DEC, VALS(ul_ext_sub_header_type), EXTENDED_SUB_HEADER_TYPE_MASK,
                        "", HFILL
                }
@@ -627,7 +627,7 @@ static hf_register_info hf_ext[] =
        {
                &hf_mac_header_generic_ext_subheader_sdu_sn,
                {
-                       "SDU Sequence Number", "wimax.genericExtSubhd.SduSn",
+                       "SDU Sequence Number", "wmx.genericExtSubhd.SduSn",
                        FT_UINT8, BASE_DEC, NULL, 0x0,
                        "", HFILL
                }
@@ -635,7 +635,7 @@ static hf_register_info hf_ext[] =
        {
                &hf_mac_header_generic_ext_subheader_dl_sleep_control_pscid,
                {
-                       "Power Saving Class ID", "wimax.genericExtSubhd.DlSleepCtrlPSCID",
+                       "Power Saving Class ID", "wmx.genericExtSubhd.DlSleepCtrlPSCID",
                        FT_UINT24, BASE_DEC, NULL, DL_SLEEP_CONTROL_POWER_SAVING_CLASS_ID_MASK,
                        "", HFILL
                }
@@ -643,7 +643,7 @@ static hf_register_info hf_ext[] =
        {
                &hf_mac_header_generic_ext_subheader_dl_sleep_control_op,
                {
-                       "Operation", "wimax.genericExtSubhd.DlSleepCtrlOP",
+                       "Operation", "wmx.genericExtSubhd.DlSleepCtrlOP",
                        FT_UINT24, BASE_HEX, VALS(dl_sleep_control_ops), DL_SLEEP_CONTROL_OPERATION_MASK,
                        "", HFILL
                }
@@ -651,7 +651,7 @@ static hf_register_info hf_ext[] =
        {
                &hf_mac_header_generic_ext_subheader_dl_sleep_control_fswe,
                {
-                       "Final Sleep Window Exponent", "wimax.genericExtSubhd.DlSleepCtrlFSWE",
+                       "Final Sleep Window Exponent", "wmx.genericExtSubhd.DlSleepCtrlFSWE",
                        FT_UINT24, BASE_DEC, NULL, DL_SLEEP_CONTROL_FINAL_SLEEP_WINDOW_EXPONENT_MASK,
                        "", HFILL
                }
@@ -659,7 +659,7 @@ static hf_register_info hf_ext[] =
        {
                &hf_mac_header_generic_ext_subheader_dl_sleep_control_fswb,
                {
-                       "Final Sleep Window Base", "wimax.genericExtSubhd.DlSleepCtrlFSWB",
+                       "Final Sleep Window Base", "wmx.genericExtSubhd.DlSleepCtrlFSWB",
                        FT_UINT24, BASE_DEC, NULL, DL_SLEEP_CONTROL_FINAL_SLEEP_WINDOW_BASE_MASK,
                        "", HFILL
                }
@@ -667,7 +667,7 @@ static hf_register_info hf_ext[] =
        {
                &hf_mac_header_generic_ext_subheader_dl_sleep_control_rsv,
                {
-                       "Reserved", "wimax.genericExtSubhd.DlSleepCtrlRsv",
+                       "Reserved", "wmx.genericExtSubhd.DlSleepCtrlRsv",
                        FT_UINT24, BASE_DEC, NULL, DL_SLEEP_CONTROL_RESERVED_MASK,
                        "", HFILL
                }
@@ -675,7 +675,7 @@ static hf_register_info hf_ext[] =
        {
                &hf_mac_header_generic_ext_subheader_fb_req_uiuc,
                {
-                       "UIUC", "wimax.genericExtSubhd.FbReqUIUC",
+                       "UIUC", "wmx.genericExtSubhd.FbReqUIUC",
                        FT_UINT24, BASE_HEX, VALS(uiuc_values), FEEDBACK_REQUEST_UIUC_MASK,
                        "", HFILL
                }
@@ -683,7 +683,7 @@ static hf_register_info hf_ext[] =
        {
                &hf_mac_header_generic_ext_subheader_fb_req_fb_type,
                {
-                       "Feedback Type", "wimax.genericExtSubhd.FbReqFbType",
+                       "Feedback Type", "wmx.genericExtSubhd.FbReqFbType",
                        FT_UINT24, BASE_HEX, VALS(fb_types), FEEDBACK_REQUEST_FEEDBACK_TYPE_MASK,
                        "", HFILL
                }
@@ -691,7 +691,7 @@ static hf_register_info hf_ext[] =
        {
                &hf_mac_header_generic_ext_subheader_fb_req_ofdma_symbol_offset,
                {
-                       "OFDMA Symbol Offset", "wimax.genericExtSubhd.FbReqOfdmaSymbolOffset",
+                       "OFDMA Symbol Offset", "wmx.genericExtSubhd.FbReqOfdmaSymbolOffset",
                        FT_UINT24, BASE_HEX, NULL, FEEDBACK_REQUEST_OFDMA_SYMBOL_OFFSET_MASK,
                        "", HFILL
                }
@@ -699,7 +699,7 @@ static hf_register_info hf_ext[] =
        {
                &hf_mac_header_generic_ext_subheader_fb_req_subchannel_offset,
                {
-                       "Subchannel Offset", "wimax.genericExtSubhd.FbReqSubchannelOffset",
+                       "Subchannel Offset", "wmx.genericExtSubhd.FbReqSubchannelOffset",
                        FT_UINT24, BASE_HEX, NULL, FEEDBACK_REQUEST_SUBCHANNEL_OFFSET_MASK,
                        "", HFILL
                }
@@ -707,7 +707,7 @@ static hf_register_info hf_ext[] =
        {
                &hf_mac_header_generic_ext_subheader_fb_req_slots,
                {
-                       "Number of Slots", "wimax.genericExtSubhd.FbReqSlots",
+                       "Number of Slots", "wmx.genericExtSubhd.FbReqSlots",
                        FT_UINT24, BASE_HEX, NULL, FEEDBACK_REQUEST_NUMBER_OF_SLOTS_MASK,
                        "", HFILL
                }
@@ -715,7 +715,7 @@ static hf_register_info hf_ext[] =
        {
                &hf_mac_header_generic_ext_subheader_fb_req_frame_offset,
                {
-                       "Frame Offset", "wimax.genericExtSubhd.FbReqFrameOffset",
+                       "Frame Offset", "wmx.genericExtSubhd.FbReqFrameOffset",
                        FT_UINT24, BASE_HEX, NULL, FEEDBACK_REQUEST_FRAME_OFFSET_MASK,
                        "", HFILL
                }
@@ -723,7 +723,7 @@ static hf_register_info hf_ext[] =
        {
                &hf_mac_header_generic_ext_subheader_sn_req_rep_ind_1,
                {
-                       "First SN Report Indication", "wimax.genericExtSubhd.SnReqRepInd1",
+                       "First SN Report Indication", "wmx.genericExtSubhd.SnReqRepInd1",
                        FT_UINT8, BASE_DEC, VALS(sn_rep_msg), SN_REQUEST_SUBHEADER_SN_REPORT_INDICATION_1_MASK,
                        "", HFILL
                }
@@ -731,7 +731,7 @@ static hf_register_info hf_ext[] =
        {
                &hf_mac_header_generic_ext_subheader_sn_req_rep_ind_2,
                {
-                       "Second SN Report Indication", "wimax.genericExtSubhd.SnReqRepInd2",
+                       "Second SN Report Indication", "wmx.genericExtSubhd.SnReqRepInd2",
                        FT_UINT8, BASE_DEC, VALS(sn_rep_msg), SN_REQUEST_SUBHEADER_SN_REPORT_INDICATION_2_MASK,
                        "", HFILL
                }
@@ -739,7 +739,7 @@ static hf_register_info hf_ext[] =
        {
                &hf_mac_header_generic_ext_subheader_sn_req_rsv,
                {
-                       "Reserved", "wimax.genericExtSubhd.SnReqRsv",
+                       "Reserved", "wmx.genericExtSubhd.SnReqRsv",
                        FT_UINT8, BASE_DEC, NULL, SN_REQUEST_SUBHEADER_RESERVED_MASK,
                        "", HFILL
                }
@@ -747,7 +747,7 @@ static hf_register_info hf_ext[] =
        {
                &hf_mac_header_generic_ext_subheader_mimo_mode_fb_type,
                {
-                       "Feedback Type", "wimax.genericExtSubhd.MimoFbType",
+                       "Feedback Type", "wmx.genericExtSubhd.MimoFbType",
                        FT_UINT8, BASE_DEC, VALS(mimo_fb_types), MIMO_FEEDBACK_TYPE_MASK,
                        "", HFILL
                }
@@ -755,7 +755,7 @@ static hf_register_info hf_ext[] =
        {
                &hf_mac_header_generic_ext_subheader_mimo_fb_content,
                {
-                       "Feedback Content", "wimax.genericExtSubhd.MimoFbContent",
+                       "Feedback Content", "wmx.genericExtSubhd.MimoFbContent",
                        FT_UINT8, BASE_DEC, NULL, MIMO_FEEDBACK_CONTENT_MASK,
                        "", HFILL
                }
@@ -763,7 +763,7 @@ static hf_register_info hf_ext[] =
        {
                &hf_mac_header_generic_ext_subheader_ul_tx_pwr_rep,
                {
-                       "UL TX Power", "wimax.genericExtSubhd.UlTxPwr",
+                       "UL TX Power", "wmx.genericExtSubhd.UlTxPwr",
                        FT_UINT8, BASE_DEC, NULL, 0x0,
                        "", HFILL
                }
@@ -771,7 +771,7 @@ static hf_register_info hf_ext[] =
        {
                &hf_mac_header_generic_ext_subheader_mini_fb_type,
                {
-                       "Feedback Type", "wimax.genericExtSubhd.MiniFbType",
+                       "Feedback Type", "wmx.genericExtSubhd.MiniFbType",
                        FT_UINT16, BASE_DEC, VALS(fb_types), MINI_FEEDBACK_TYPE_MASK,
                        "", HFILL
                }
@@ -779,7 +779,7 @@ static hf_register_info hf_ext[] =
        {
                &hf_mac_header_generic_ext_subheader_mini_fb_content,
                {
-                       "Feedback Content", "wimax.genericExtSubhd.MiniFbContent",
+                       "Feedback Content", "wmx.genericExtSubhd.MiniFbContent",
                        FT_UINT16, BASE_DEC, NULL, MINI_FEEDBACK_CONTENT_MASK,
                        "", HFILL
                }
@@ -787,7 +787,7 @@ static hf_register_info hf_ext[] =
        {
                &hf_mac_header_generic_ext_subheader_pdu_sn_short,
                {
-                       "PDU Sequence Number", "wimax.genericExtSubhd.PduSnShort",
+                       "PDU Sequence Number", "wmx.genericExtSubhd.PduSnShort",
                        FT_UINT8, BASE_DEC, NULL, 0x0,
                        "", HFILL
                }
@@ -795,7 +795,7 @@ static hf_register_info hf_ext[] =
        {
                &hf_mac_header_generic_ext_subheader_pdu_sn_long,
                {
-                       "PDU Sequence Number", "wimax.genericExtSubhd.PduSnLong",
+                       "PDU Sequence Number", "wmx.genericExtSubhd.PduSnLong",
                        FT_UINT16, BASE_DEC, NULL, 0x0,
                        "", HFILL
                }
@@ -811,7 +811,7 @@ static hf_register_info hf_mesh[] =
        {
                &hf_mac_header_generic_mesh_subheader,
                {
-                       "Xmt Node Id", "wimax.genericMeshSubhd",
+                       "Xmt Node Id", "wmx.genericMeshSubhd",
                        FT_UINT16, BASE_DEC, NULL, 0x0,
                        "", HFILL
                }
@@ -857,7 +857,7 @@ static hf_register_info hf_frag[] =
        {
                &hf_mac_header_generic_frag_subhd_fc,
                {
-                       "Fragment Type", "wimax.genericFragSubhd.Fc",
+                       "Fragment Type", "wmx.genericFragSubhd.Fc",
                        FT_UINT8, BASE_DEC, VALS(frag_types), FRAGMENTATION_SUBHEADER_FC_MASK,
                        "", HFILL
                }
@@ -865,7 +865,7 @@ static hf_register_info hf_frag[] =
        {
                &hf_mac_header_generic_frag_subhd_fc_ext,
                {
-                       "Fragment Type", "wimax.genericFragSubhd.FcExt",
+                       "Fragment Type", "wmx.genericFragSubhd.FcExt",
                        FT_UINT16, BASE_DEC, VALS(frag_types), FRAGMENTATION_SUBHEADER_FC_MASK,
                        "", HFILL
                }
@@ -873,7 +873,7 @@ static hf_register_info hf_frag[] =
        {
                &hf_mac_header_generic_frag_subhd_bsn,
                {
-                       "Block Sequence Number (BSN)", "wimax.genericFragSubhd.Bsn",
+                       "Block Sequence Number (BSN)", "wmx.genericFragSubhd.Bsn",
                        FT_UINT16, BASE_DEC, NULL, FRAGMENTATION_SUBHEADER_BSN_MASK,
                        "", HFILL
                }
@@ -881,7 +881,7 @@ static hf_register_info hf_frag[] =
        {
                &hf_mac_header_generic_frag_subhd_fsn,
                {
-                       "Fragment Sequence Number (FSN)", "wimax.genericFragSubhd.Fsn",
+                       "Fragment Sequence Number (FSN)", "wmx.genericFragSubhd.Fsn",
                        FT_UINT8, BASE_DEC, NULL, FRAGMENTATION_SUBHEADER_FSN_MASK,
                        "", HFILL
                }
@@ -889,7 +889,7 @@ static hf_register_info hf_frag[] =
        {
                &hf_mac_header_generic_frag_subhd_fsn_ext,
                {
-                       "Fragment Sequence Number (FSN)", "wimax.genericFragSubhd.FsnExt",
+                       "Fragment Sequence Number (FSN)", "wmx.genericFragSubhd.FsnExt",
                        FT_UINT16, BASE_DEC, NULL, FRAGMENTATION_SUBHEADER_BSN_MASK,
                        "", HFILL
                }
@@ -897,7 +897,7 @@ static hf_register_info hf_frag[] =
        {
                &hf_mac_header_generic_frag_subhd_rsv,
                {
-                       "Reserved", "wimax.genericFragSubhd.Rsv",
+                       "Reserved", "wmx.genericFragSubhd.Rsv",
                        FT_UINT8, BASE_DEC, NULL, FRAGMENTATION_SUBHEADER_RSV_MASK,
                        "", HFILL
                }
@@ -905,7 +905,7 @@ static hf_register_info hf_frag[] =
        {
                &hf_mac_header_generic_frag_subhd_rsv_ext,
                {
-                       "Reserved", "wimax.genericFragSubhd.RsvExt",
+                       "Reserved", "wmx.genericFragSubhd.RsvExt",
                        FT_UINT16, BASE_DEC, NULL, FRAGMENTATION_SUBHEADER_RSV_EXT_MASK,
                        "", HFILL
                }
@@ -935,7 +935,7 @@ static hf_register_info hf_pack[] =
        {
                &hf_mac_header_generic_packing_subhd_fc,
                {
-                       "Fragment Type", "wimax.genericPackSubhd.Fc",
+                       "Fragment Type", "wmx.genericPackSubhd.Fc",
                        FT_UINT16, BASE_DEC, VALS(frag_types), PACKING_SUBHEADER_FC_MASK,
                        "", HFILL
                }
@@ -943,7 +943,7 @@ static hf_register_info hf_pack[] =
        {
                &hf_mac_header_generic_packing_subhd_fc_ext,
                {
-                       "Fragment Type", "wimax.genericPackSubhd.FcExt",
+                       "Fragment Type", "wmx.genericPackSubhd.FcExt",
                        FT_UINT24, BASE_HEX, VALS(frag_types), PACKING_SUBHEADER_FC_MASK,
                        "", HFILL
                }
@@ -951,7 +951,7 @@ static hf_register_info hf_pack[] =
        {
                &hf_mac_header_generic_packing_subhd_bsn,
                {
-                       "First Block Sequence Number", "wimax.genericPackSubhd.Bsn",
+                       "First Block Sequence Number", "wmx.genericPackSubhd.Bsn",
                        FT_UINT24, BASE_DEC, NULL, PACKING_SUBHEADER_BSN_MASK,
                        "", HFILL
                }
@@ -959,7 +959,7 @@ static hf_register_info hf_pack[] =
        {
                &hf_mac_header_generic_packing_subhd_fsn,
                {
-                       "Fragment Number", "wimax.genericPackSubhd.Fsn",
+                       "Fragment Number", "wmx.genericPackSubhd.Fsn",
                        FT_UINT16, BASE_DEC, NULL, PACKING_SUBHEADER_FSN_MASK,
                        "", HFILL
                }
@@ -967,7 +967,7 @@ static hf_register_info hf_pack[] =
        {
                &hf_mac_header_generic_packing_subhd_fsn_ext,
                {
-                       "Fragment Number", "wimax.genericPackSubhd.FsnExt",
+                       "Fragment Number", "wmx.genericPackSubhd.FsnExt",
                        FT_UINT24, BASE_DEC, NULL, PACKING_SUBHEADER_BSN_MASK,
                        "", HFILL
                }
@@ -975,7 +975,7 @@ static hf_register_info hf_pack[] =
        {
                &hf_mac_header_generic_packing_subhd_len,
                {
-                       "Length", "wimax.genericPackSubhd.Len",
+                       "Length", "wmx.genericPackSubhd.Len",
                        FT_UINT16, BASE_DEC, NULL, PACKING_SUBHEADER_LENGTH_MASK,
                        "", HFILL
                }
@@ -983,7 +983,7 @@ static hf_register_info hf_pack[] =
        {
                &hf_mac_header_generic_packing_subhd_len_ext,
                {
-                       "Length", "wimax.genericPackSubhd.LenExt",
+                       "Length", "wmx.genericPackSubhd.LenExt",
                        FT_UINT24, BASE_DEC, NULL, PACKING_SUBHEADER_LENGTH_EXT_MASK,
                        "", HFILL
                }
@@ -1003,7 +1003,7 @@ static hf_register_info hf_fast[] =
        {
                &hf_mac_header_generic_fast_fb_subhd_alloc_offset,
                {
-                       "Allocation Offset", "wimax.genericFastFbSubhd.AllocOffset",
+                       "Allocation Offset", "wmx.genericFastFbSubhd.AllocOffset",
                        FT_UINT8, BASE_DEC, NULL, FAST_FEEDBACK_ALLOCATION_OFFSET_MASK,
                        "", HFILL
                }
@@ -1011,7 +1011,7 @@ static hf_register_info hf_fast[] =
        {
                &hf_mac_header_generic_fast_fb_subhd_fb_type,
                {
-                       "Feedback Type", "wimax.genericFastFbSubhd.FbType",
+                       "Feedback Type", "wmx.genericFastFbSubhd.FbType",
                        FT_UINT8, BASE_DEC, VALS(fast_fb_types), FAST_FEEDBACK_FEEDBACK_TYPE_MASK,
                        "", HFILL
                }
@@ -1082,7 +1082,7 @@ static hf_register_info hf_grant[] =
        {
                &hf_mac_header_generic_grant_mgmt_ext_pbr_tree,
                {
-                       "Scheduling Service Type (Default)", 
+                       "Scheduling Service Type (Default)",
                        "wimax.genericGrantSubhd.Default",
                        FT_UINT16, BASE_DEC, NULL, 0x0,
                        "", HFILL
@@ -1091,7 +1091,7 @@ static hf_register_info hf_grant[] =
        {
                &hf_mac_header_generic_grant_mgmt_subhd_pbr,
                {
-                       "PiggyBack Request", "wimax.genericGrantSubhd.Pbr",
+                       "PiggyBack Request", "wmx.genericGrantSubhd.Pbr",
                        FT_UINT16, BASE_DEC, NULL, 0x0,
                        "", HFILL
                }
@@ -1099,7 +1099,7 @@ static hf_register_info hf_grant[] =
        {
                &hf_mac_header_generic_grant_mgmt_ugs_tree,
                {
-                       "Scheduling Service Type (UGS)", "wimax.genericGrantSubhd.UGS",
+                       "Scheduling Service Type (UGS)", "wmx.genericGrantSubhd.UGS",
                        FT_UINT16, BASE_DEC, NULL, 0x0,
                        "", HFILL
                }
@@ -1107,7 +1107,7 @@ static hf_register_info hf_grant[] =
        {
                &hf_mac_header_generic_grant_mgmt_subhd_ugs_si,
                {
-                       "Slip Indicator", "wimax.genericGrantSubhd.Si",
+                       "Slip Indicator", "wmx.genericGrantSubhd.Si",
                        FT_UINT16, BASE_DEC, VALS(si_msgs), GRANT_MGMT_SUBHEADER_UGS_SI_MASK,
                        "", HFILL
                }
@@ -1115,7 +1115,7 @@ static hf_register_info hf_grant[] =
        {
                &hf_mac_header_generic_grant_mgmt_subhd_ugs_pm,
                {
-                       "Poll-Me", "wimax.genericGrantSubhd.Pm",
+                       "Poll-Me", "wmx.genericGrantSubhd.Pm",
                        FT_UINT16, BASE_DEC, VALS(pm_msgs), GRANT_MGMT_SUBHEADER_UGS_PM_MASK,
                        "", HFILL
                }
@@ -1123,7 +1123,7 @@ static hf_register_info hf_grant[] =
        {
                &hf_mac_header_generic_grant_mgmt_subhd_ugs_fli,
                {
-                       "Frame Latency Indication", "wimax.genericGrantSubhd.Fli",
+                       "Frame Latency Indication", "wmx.genericGrantSubhd.Fli",
                        FT_UINT16, BASE_DEC, VALS(fli_msgs), GRANT_MGMT_SUBHEADER_UGS_FLI_MASK,
                        "", HFILL
                }
@@ -1131,7 +1131,7 @@ static hf_register_info hf_grant[] =
        {
                &hf_mac_header_generic_grant_mgmt_subhd_ugs_fl,
                {
-                       "Frame Latency", "wimax.genericGrantSubhd.Fl",
+                       "Frame Latency", "wmx.genericGrantSubhd.Fl",
                        FT_UINT16, BASE_DEC, NULL, GRANT_MGMT_SUBHEADER_UGS_FL_MASK,
                        "", HFILL
                }
@@ -1139,7 +1139,7 @@ static hf_register_info hf_grant[] =
        {
                &hf_mac_header_generic_grant_mgmt_subhd_ugs_rsv,
                {
-                       "Reserved", "wimax.genericGrantSubhd.Rsv",
+                       "Reserved", "wmx.genericGrantSubhd.Rsv",
                        FT_UINT16, BASE_DEC, NULL, GRANT_MGMT_SUBHEADER_UGS_RSV_MASK,
                        "", HFILL
                }
@@ -1156,7 +1156,7 @@ static hf_register_info hf_grant[] =
        {
                &hf_mac_header_generic_grant_mgmt_subhd_ext_pbr,
                {
-                       "Extended PiggyBack Request", "wimax.genericGrantSubhd.ExtPbr",
+                       "Extended PiggyBack Request", "wmx.genericGrantSubhd.ExtPbr",
                        FT_UINT16, BASE_DEC, NULL, GRANT_MGMT_SUBHEADER_EXT_PBR_MASK,
                        "", HFILL
                }
@@ -1164,7 +1164,7 @@ static hf_register_info hf_grant[] =
        {
                &hf_mac_header_generic_grant_mgmt_subhd_ext_fli,
                {
-                       "Frame Latency Indication", "wimax.genericGrantSubhd.ExtFli",
+                       "Frame Latency Indication", "wmx.genericGrantSubhd.ExtFli",
                        FT_UINT16, BASE_DEC, VALS(fli_msgs), GRANT_MGMT_SUBHEADER_EXT_FLI_MASK,
                        "", HFILL
                }
@@ -1172,7 +1172,7 @@ static hf_register_info hf_grant[] =
        {
                &hf_mac_header_generic_grant_mgmt_subhd_ext_fl,
                {
-                       "Frame Latency", "wimax.genericGrantSubhd.ExtFl",
+                       "Frame Latency", "wmx.genericGrantSubhd.ExtFl",
                        FT_UINT16, BASE_DEC, NULL, GRANT_MGMT_SUBHEADER_EXT_FL_MASK,
                        "", HFILL
                }
@@ -1227,7 +1227,7 @@ static hf_register_info hf_arq[] =
        {
                &hf_mac_header_generic_arq_fb_ie_cid,
                {
-                       "CID", "wimax.genericArq.FbIeCid",
+                       "CID", "wmx.genericArq.FbIeCid",
                        FT_UINT16, BASE_DEC, NULL, 0x0,
                        "", HFILL
                }
@@ -1235,7 +1235,7 @@ static hf_register_info hf_arq[] =
        {
                &hf_mac_header_generic_arq_fb_ie_last,
                {
-                       "Last IE", "wimax.genericArq.FbIeLast",
+                       "Last IE", "wmx.genericArq.FbIeLast",
                        FT_UINT16, BASE_DEC, VALS(last_ie_msgs), ARQ_FB_IE_LAST_BIT_MASK,
                        "", HFILL
                }
@@ -1243,7 +1243,7 @@ static hf_register_info hf_arq[] =
        {
                &hf_mac_header_generic_arq_fb_ie_ack_type,
                {
-                       "ACK Type", "wimax.genericArq.FbIeAckType",
+                       "ACK Type", "wmx.genericArq.FbIeAckType",
                        FT_UINT16, BASE_DEC, NULL, ARQ_FB_IE_ACK_TYPE_MASK,
                        "", HFILL
                }
@@ -1251,7 +1251,7 @@ static hf_register_info hf_arq[] =
        {
                &hf_mac_header_generic_arq_fb_ie_bsn,
                {
-                       "BSN", "wimax.genericArq.FbIeBsn",
+                       "BSN", "wmx.genericArq.FbIeBsn",
                        FT_UINT16, BASE_DEC, NULL, ARQ_FB_IE_BSN_MASK,
                        "", HFILL
                }
@@ -1259,7 +1259,7 @@ static hf_register_info hf_arq[] =
        {
                &hf_mac_header_generic_arq_fb_ie_num_maps,
                {
-                       "Number of ACK Maps", "wimax.genericArq.FbIeMaps",
+                       "Number of ACK Maps", "wmx.genericArq.FbIeMaps",
                        FT_UINT16, BASE_DEC, NULL, ARQ_FB_IE_NUM_MAPS_MASK,
                        "", HFILL
                }
@@ -1267,13 +1267,13 @@ static hf_register_info hf_arq[] =
        {
                &hf_ack_type_reserved,
                {
-                       "Reserved", "wimax.genericArq.FbIeRsvd", FT_UINT16, BASE_DEC, NULL, 0x03, "", HFILL
+                       "Reserved", "wmx.genericArq.FbIeRsvd", FT_UINT16, BASE_DEC, NULL, 0x03, "", HFILL
                }
        },
        {
                &hf_mac_header_generic_arq_fb_ie_sel_ack_map,
                {
-                       "Selective ACK Map", "wimax.genericArq.FbIeSelAckMap",
+                       "Selective ACK Map", "wmx.genericArq.FbIeSelAckMap",
                        FT_UINT16, BASE_HEX, NULL, 0x0,
                        "", HFILL
                }
@@ -1281,7 +1281,7 @@ static hf_register_info hf_arq[] =
        {
                &hf_mac_header_generic_arq_fb_ie_seq_format,
                {
-                       "Sequence Format", "wimax.genericArq.FbIeSeqFmt",
+                       "Sequence Format", "wmx.genericArq.FbIeSeqFmt",
                        FT_UINT16, BASE_DEC, NULL, ARQ_FB_IE_SEQ_FORMAT_MASK,
                        "", HFILL
                }
@@ -1289,7 +1289,7 @@ static hf_register_info hf_arq[] =
        {
                &hf_mac_header_generic_arq_fb_ie_seq_ack_map,
                {
-                       "Sequence ACK Map", "wimax.genericArq.FbIeSeqAckMap",
+                       "Sequence ACK Map", "wmx.genericArq.FbIeSeqAckMap",
                        FT_UINT16, BASE_HEX, NULL, ARQ_FB_IE_SEQ_ACK_MAP_MASK,
                        "", HFILL
                }
@@ -1297,7 +1297,7 @@ static hf_register_info hf_arq[] =
        {
                &hf_mac_header_generic_arq_fb_ie_seq1_length,
                {
-                       "Sequence 1 Length", "wimax.genericArq.FbIeSeq1Len",
+                       "Sequence 1 Length", "wmx.genericArq.FbIeSeq1Len",
                        FT_UINT16, BASE_DEC, NULL, ARQ_FB_IE_SEQ1_LENGTH_MASK,
                        "", HFILL
                }
@@ -1305,7 +1305,7 @@ static hf_register_info hf_arq[] =
        {
                &hf_mac_header_generic_arq_fb_ie_seq2_length,
                {
-                       "Sequence 2 Length", "wimax.genericArq.FbIeSeq2Len",
+                       "Sequence 2 Length", "wmx.genericArq.FbIeSeq2Len",
                        FT_UINT16, BASE_DEC, NULL, ARQ_FB_IE_SEQ2_LENGTH_MASK,
                        "", HFILL
                }
@@ -1313,7 +1313,7 @@ static hf_register_info hf_arq[] =
        {
                &hf_mac_header_generic_arq_fb_ie_seq3_length,
                {
-                       "Sequence 3 Length", "wimax.genericArq.FbIeSeq3Len",
+                       "Sequence 3 Length", "wmx.genericArq.FbIeSeq3Len",
                        FT_UINT16, BASE_DEC, NULL, ARQ_FB_IE_SEQ3_LENGTH_MASK,
                        "", HFILL
                }
@@ -1321,7 +1321,7 @@ static hf_register_info hf_arq[] =
        {
                &hf_mac_header_generic_arq_fb_ie_seq_ack_map_2,
                {
-                       "Sequence ACK Map", "wimax.genericArq.FbIeSeqAckMap2",
+                       "Sequence ACK Map", "wmx.genericArq.FbIeSeqAckMap2",
                        FT_UINT16, BASE_HEX, NULL, ARQ_FB_IE_SEQ_ACK_MAP_2_MASK,
                        "", HFILL
                }
@@ -1329,7 +1329,7 @@ static hf_register_info hf_arq[] =
        {
                &hf_mac_header_generic_arq_fb_ie_seq1_length_6,
                {
-                       "Sequence 1 Length", "wimax.genericArq.FbIeSeq1Len",
+                       "Sequence 1 Length", "wmx.genericArq.FbIeSeq1Len",
                        FT_UINT16, BASE_DEC, NULL, ARQ_FB_IE_SEQ1_LENGTH_6_MASK,
                        "", HFILL
                }
@@ -1337,7 +1337,7 @@ static hf_register_info hf_arq[] =
        {
                &hf_mac_header_generic_arq_fb_ie_seq2_length_6,
                {
-                       "Sequence 2 Length", "wimax.genericArq.FbIeSeq2Len",
+                       "Sequence 2 Length", "wmx.genericArq.FbIeSeq2Len",
                        FT_UINT16, BASE_DEC, NULL, ARQ_FB_IE_SEQ2_LENGTH_6_MASK,
                        "", HFILL
                }
@@ -1345,7 +1345,7 @@ static hf_register_info hf_arq[] =
        {
                &hf_mac_header_generic_arq_fb_ie_rsv,
                {
-                       "Reserved", "wimax.genericArq.FbIeRsv",
+                       "Reserved", "wmx.genericArq.FbIeRsv",
                        FT_UINT16, BASE_DEC, NULL, ARQ_FB_IE_RSV_MASK,
                        "", HFILL
                }
@@ -1466,7 +1466,7 @@ void proto_register_mac_header_generic(void)
                proto_mac_header_generic_decoder = proto_register_protocol (
                                                        "WiMax Generic/Type1/Type2 MAC Header Messages", /* name */
                                                        "WiMax Generic/Type1/Type2 MAC Header (hdr)", /* short name */
-                                                       "hdr" /* abbrev */
+                                                       "wmx.hdr" /* abbrev */
                                                        );
                /* register the field display messages */
                proto_register_field_array(proto_mac_header_generic_decoder, hf, array_length(hf));
@@ -1516,7 +1516,7 @@ void dissect_mac_header_generic_decoder(tvbuff_t *tvb, packet_info *pinfo, proto
        tvbuff_t *data_pdu_tvb;
        fragment_data *payload_frag;
        gboolean first_arq_fb_payload = TRUE;
-       
+
        dissector_handle_t mac_payload_handle;
 
        proto_mac_header_generic_decoder = proto_wimax;
@@ -1723,7 +1723,7 @@ void dissect_mac_header_generic_decoder(tvbuff_t *tvb, packet_info *pinfo, proto
                                child_item = proto_tree_add_item(generic_tree, hf_mac_header_generic_grant_mgmt_ext_pbr_tree, tvb, offset, 2, FALSE);
                                child_tree = proto_item_add_subtree(child_item, ett_mac_grant_mgmt_subheader_decoder);
                                proto_tree_add_item(child_tree, hf_mac_header_generic_grant_mgmt_subhd_pbr, tvb, offset, 2, FALSE);
-                               
+
                                /* update the length and offset */
                                length -= 2;
                                offset += 2;
index 631bed6976bd4564ecf9dbcdf06873f3867f1d7b..e0dc5332cd1a1361c56b62ca6a16e31db69e353a 100644 (file)
@@ -222,7 +222,7 @@ static hf_register_info hf[] =
        {
                &hf_mac_header_type_1_value_bytes,
                {
-                       "Values", "wimax.type1ValueBytes",
+                       "Values", "wmx.type1ValueBytes",
                        FT_BYTES, BASE_HEX, NULL, 0x0,
                        "", HFILL
                }
@@ -230,7 +230,7 @@ static hf_register_info hf[] =
        {
                &hf_mac_header_type_1_ht,
                {
-                       "MAC Header Type", "wimax.type1Ht",
+                       "MAC Header Type", "wmx.type1Ht",
                        FT_UINT24, BASE_DEC, NULL, WIMAX_MAC_HEADER_TYPE_1_HT,
                        "", HFILL
                }
@@ -238,7 +238,7 @@ static hf_register_info hf[] =
        {
                &hf_mac_header_type_1_ec,
                {
-                       "MAC Encryption Control", "wimax.type1Ec",
+                       "MAC Encryption Control", "wmx.type1Ec",
                        FT_UINT24, BASE_DEC, NULL, WIMAX_MAC_HEADER_TYPE_1_EC,
                        "", HFILL
                }
@@ -246,7 +246,7 @@ static hf_register_info hf[] =
        {
                &hf_mac_header_type_1_type,
                {
-                       "MAC Sub-Type", "wimax.type1Type",
+                       "MAC Sub-Type", "wmx.type1Type",
                        FT_UINT24, BASE_HEX, VALS(sub_types), WIMAX_MAC_HEADER_TYPE_1_TYPE,
                        "", HFILL
                }
@@ -254,7 +254,7 @@ static hf_register_info hf[] =
        {
                &hf_mac_header_type_1_br,
                {
-                       "Bandwidth Request", "wimax.type1Br",
+                       "Bandwidth Request", "wmx.type1Br",
                        FT_UINT24, BASE_DEC, NULL, WIMAX_MAC_HEADER_TYPE_1_BR,
                        "", HFILL
                }
@@ -262,7 +262,7 @@ static hf_register_info hf[] =
        {
                &hf_mac_header_type_1_br_3,
                {
-                       "Bandwidth Request", "wimax.type1Br3",
+                       "Bandwidth Request", "wmx.type1Br3",
                        FT_UINT24, BASE_DEC, NULL, WIMAX_MAC_HEADER_TYPE_1_BR_3,
                        "", HFILL
                }
@@ -270,7 +270,7 @@ static hf_register_info hf[] =
        {
                &hf_mac_header_type_1_fb_type,
                {
-                       "Feedback Type", "wimax.type1FbType",
+                       "Feedback Type", "wmx.type1FbType",
                        FT_UINT24, BASE_HEX, VALS(fb_types), WIMAX_MAC_HEADER_TYPE_1_FB_TYPE,
                        "", HFILL
                }
@@ -278,7 +278,7 @@ static hf_register_info hf[] =
        {
                &hf_mac_header_type_1_diuc,
                {
-                       "Preferred DIUC Index", "wimax.type1Diuc",
+                       "Preferred DIUC Index", "wmx.type1Diuc",
                        FT_UINT24, BASE_DEC, NULL, WIMAX_MAC_HEADER_TYPE_1_DIUC,
                        "", HFILL
                }
@@ -286,7 +286,7 @@ static hf_register_info hf[] =
        {
                &hf_mac_header_type_1_ultxpwr,
                {
-                       "UL TX Power", "wimax.type1UlTxPwr",
+                       "UL TX Power", "wmx.type1UlTxPwr",
                        FT_UINT24, BASE_DEC, NULL, WIMAX_MAC_HEADER_TYPE_1_UL_TX_PWR,
                        "", HFILL
                }
@@ -294,7 +294,7 @@ static hf_register_info hf[] =
        {
                &hf_mac_header_type_1_ultxpwr_3,
                {
-                       "UL TX Power", "wimax.type1UlTxPwr3",
+                       "UL TX Power", "wmx.type1UlTxPwr3",
                        FT_UINT24, BASE_DEC, NULL, WIMAX_MAC_HEADER_TYPE_1_UL_TX_PWR_3,
                        "", HFILL
                }
@@ -302,7 +302,7 @@ static hf_register_info hf[] =
        {
                &hf_mac_header_type_1_ulhdrm,
                {
-                       "Headroom to UL Max Power Level", "wimax.type1HdRm",
+                       "Headroom to UL Max Power Level", "wmx.type1HdRm",
                        FT_UINT24, BASE_DEC, NULL, WIMAX_MAC_HEADER_TYPE_1_UL_HDRM,
                        "", HFILL
                }
@@ -310,7 +310,7 @@ static hf_register_info hf[] =
        {
                &hf_mac_header_type_1_cinr,
                {
-                       "CINR Value", "wimax.type1Cinr",
+                       "CINR Value", "wmx.type1Cinr",
                        FT_UINT24, BASE_DEC, NULL, WIMAX_MAC_HEADER_TYPE_1_CINR,
                        "", HFILL
                }
@@ -318,7 +318,7 @@ static hf_register_info hf[] =
        {
                &hf_mac_header_type_1_dci,
                {
-                       "DCD Change Indication", "wimax.type1Dci",
+                       "DCD Change Indication", "wmx.type1Dci",
                        FT_UINT24, BASE_HEX, VALS(dci_msgs), WIMAX_MAC_HEADER_TYPE_1_DCI,
                        "", HFILL
                }
@@ -326,7 +326,7 @@ static hf_register_info hf[] =
        {
                &hf_mac_header_type_1_pscid,
                {
-                       "Power Saving Class ID", "wimax.type1PsCid",
+                       "Power Saving Class ID", "wmx.type1PsCid",
                        FT_UINT24, BASE_DEC, NULL, WIMAX_MAC_HEADER_TYPE_1_PSCID,
                        "", HFILL
                }
@@ -334,7 +334,7 @@ static hf_register_info hf[] =
        {
                &hf_mac_header_type_1_op,
                {
-                       "Operation", "wimax.type1Op",
+                       "Operation", "wmx.type1Op",
                        FT_UINT24, BASE_HEX, VALS(op_msgs), WIMAX_MAC_HEADER_TYPE_1_OP,
                        "", HFILL
                }
@@ -342,7 +342,7 @@ static hf_register_info hf[] =
        {
                &hf_mac_header_type_1_last,
                {
-                       "Last ARQ BSN or SDU SN", "wimax.type1Last",
+                       "Last ARQ BSN or SDU SN", "wmx.type1Last",
                        FT_UINT24, BASE_HEX, VALS(last_msgs), WIMAX_MAC_HEADER_TYPE_1_LAST,
                        "", HFILL
                }
@@ -350,7 +350,7 @@ static hf_register_info hf[] =
        {
                &hf_mac_header_type_1_sdu_sn1,
                {
-                       "ARQ BSN or MAC SDU SN (1)", "wimax.type1SduSn1",
+                       "ARQ BSN or MAC SDU SN (1)", "wmx.type1SduSn1",
                        FT_UINT24, BASE_DEC, NULL, WIMAX_MAC_HEADER_TYPE_1_SDU_SN1,
                        "", HFILL
                }
@@ -358,7 +358,7 @@ static hf_register_info hf[] =
        {
                &hf_mac_header_type_1_sdu_sn2,
                {
-                       "ARQ BSN or MAC SDU SN (2)", "wimax.type1SduSn2",
+                       "ARQ BSN or MAC SDU SN (2)", "wmx.type1SduSn2",
                        FT_UINT24, BASE_DEC, NULL, WIMAX_MAC_HEADER_TYPE_1_SDU_SN2,
                        "", HFILL
                }
@@ -366,7 +366,7 @@ static hf_register_info hf[] =
        {
                &hf_mac_header_type_1_sdu_sn3,
                {
-                       "ARQ BSN or MAC SDU SN (3)", "wimax.type1SduSn3",
+                       "ARQ BSN or MAC SDU SN (3)", "wmx.type1SduSn3",
                        FT_UINT24, BASE_DEC, NULL, WIMAX_MAC_HEADER_TYPE_1_SDU_SN3,
                        "", HFILL
                }
@@ -374,7 +374,7 @@ static hf_register_info hf[] =
        {
                &hf_mac_header_type_1_fbssi,
                {
-                       "FBSS Indicator", "wimax.type1Fbssi",
+                       "FBSS Indicator", "wmx.type1Fbssi",
                        FT_UINT24, BASE_DEC, NULL, WIMAX_MAC_HEADER_TYPE_1_FBSSI,
                        "", HFILL
                }
@@ -382,7 +382,7 @@ static hf_register_info hf[] =
        {
                &hf_mac_header_type_1_period,
                {
-                       "Preferred CQICH Allocation Period", "wimax.type1Period",
+                       "Preferred CQICH Allocation Period", "wmx.type1Period",
                        FT_UINT24, BASE_DEC, NULL, WIMAX_MAC_HEADER_TYPE_1_PERIOD,
                        "", HFILL
                }
@@ -390,7 +390,7 @@ static hf_register_info hf[] =
        {
                &hf_mac_header_type_1_rsv_2,
                {
-                       "Reserved", "wimax.type1Rsv2",
+                       "Reserved", "wmx.type1Rsv2",
                        FT_UINT24, BASE_DEC, NULL, WIMAX_MAC_HEADER_TYPE_1_RSV_2,
                        "", HFILL
                }
@@ -398,7 +398,7 @@ static hf_register_info hf[] =
        {
                &hf_mac_header_type_1_rsv_5,
                {
-                       "Reserved", "wimax.type1Rsv5",
+                       "Reserved", "wmx.type1Rsv5",
                        FT_UINT24, BASE_DEC, NULL, WIMAX_MAC_HEADER_TYPE_1_RSV_5,
                        "", HFILL
                }
@@ -406,7 +406,7 @@ static hf_register_info hf[] =
        {
                &hf_mac_header_type_1_rsv_7,
                {
-                       "Reserved", "wimax.type1Rsv7",
+                       "Reserved", "wmx.type1Rsv7",
                        FT_UINT24, BASE_DEC, NULL, WIMAX_MAC_HEADER_TYPE_1_RSV_7,
                        "", HFILL
                }
@@ -414,7 +414,7 @@ static hf_register_info hf[] =
        {
                &hf_mac_header_type_1_cid,
                {
-                       "Connection ID", "wimax.type1Cid",
+                       "Connection ID", "wmx.type1Cid",
                        FT_UINT16, BASE_DEC, NULL, 0x0,
                        "", HFILL
                }
@@ -422,7 +422,7 @@ static hf_register_info hf[] =
        {
                &hf_mac_header_type_1_hcs,
                {
-                       "Header Check Sequence", "wimax.type1Hcs",
+                       "Header Check Sequence", "wmx.type1Hcs",
                        FT_UINT8, BASE_HEX, NULL, 0x0,
                        "", HFILL
                }
index aba10dbb4fcc0bdd1f10c2b5a62b5c8edfba629c..7c1b202f9ce18335944dc46c7d5f3fb0193d94a5 100644 (file)
@@ -400,7 +400,7 @@ static hf_register_info hf[] =
        {
                &hf_mac_header_type_2_value_bytes,
                {
-                       "Values", "wimax.type2ValueBytes",
+                       "Values", "wmx.type2ValueBytes",
                        FT_BYTES, BASE_HEX, NULL, 0x0,
                        "", HFILL
                }
@@ -408,7 +408,7 @@ static hf_register_info hf[] =
        {
                &hf_mac_header_type_2_ht,
                {
-                       "MAC Header Type", "wimax.type2Ht",
+                       "MAC Header Type", "wmx.type2Ht",
                        FT_UINT8, BASE_DEC, NULL, WIMAX_MAC_HEADER_TYPE_2_HT,
                        "", HFILL
                }
@@ -416,7 +416,7 @@ static hf_register_info hf[] =
        {
                &hf_mac_header_type_2_ec,
                {
-                       "MAC Encryption Control", "wimax.type2Ec",
+                       "MAC Encryption Control", "wmx.type2Ec",
                        FT_UINT8, BASE_DEC, NULL, WIMAX_MAC_HEADER_TYPE_2_EC,
                        "", HFILL
                }
@@ -424,7 +424,7 @@ static hf_register_info hf[] =
        {
                &hf_mac_header_type_2_type,
                {
-                       "MAC Sub-Type", "wimax.type2Type",
+                       "MAC Sub-Type", "wmx.type2Type",
                        FT_UINT8, BASE_DEC, NULL, WIMAX_MAC_HEADER_TYPE_2_TYPE,
                        "", HFILL
                }
@@ -432,7 +432,7 @@ static hf_register_info hf[] =
        {
                &hf_mac_header_type_2_cii,
                {
-                       "CID Inclusion Indication", "wimax.type2Cii",
+                       "CID Inclusion Indication", "wmx.type2Cii",
                        FT_UINT8, BASE_DEC, VALS(cii_msgs), WIMAX_MAC_HEADER_TYPE_2_CII,
                        "", HFILL
                }
@@ -440,7 +440,7 @@ static hf_register_info hf[] =
        {
                &hf_mac_header_type_2_fb_type,
                {
-                       "Feedback Type", "wimax.type2FbType",
+                       "Feedback Type", "wmx.type2FbType",
                        FT_UINT8, BASE_DEC, VALS(fb_types), WIMAX_MAC_HEADER_TYPE_2_FB_TYPE,
                        "", HFILL
                }
@@ -448,7 +448,7 @@ static hf_register_info hf[] =
        {
                &hf_mac_header_type_2_cqi_fb_type,
                {
-                       "Mimo Feedback Type", "wimax.type2MimoFbType",
+                       "Mimo Feedback Type", "wmx.type2MimoFbType",
                        FT_UINT16, BASE_DEC, NULL, WIMAX_MAC_HEADER_TYPE_2_CQI_FB_TYPE,
                        "", HFILL
                }
@@ -456,7 +456,7 @@ static hf_register_info hf[] =
        {
                &hf_mac_header_type_2_cqi_payload,
                {
-                       "CQI and Mimo Feedback Payload", "wimax.type2MimoFbPayload",
+                       "CQI and Mimo Feedback Payload", "wmx.type2MimoFbPayload",
                        FT_UINT16, BASE_DEC, NULL, WIMAX_MAC_HEADER_TYPE_2_CQI_PAYLOAD,
                        "", HFILL
                }
@@ -464,7 +464,7 @@ static hf_register_info hf[] =
        {
                &hf_mac_header_type_2_cqi_rsv,
                {
-                       "Reserved", "wimax.type2MimoFbRsv",
+                       "Reserved", "wmx.type2MimoFbRsv",
                        FT_UINT16, BASE_DEC, NULL, WIMAX_MAC_HEADER_TYPE_2_CQI_RSV,
                        "", HFILL
                }
@@ -472,7 +472,7 @@ static hf_register_info hf[] =
        {
                &hf_mac_header_type_2_dl_ave_cinr,
                {
-                       "DL Average CINR", "wimax.type2DlAveCinr",
+                       "DL Average CINR", "wmx.type2DlAveCinr",
                        FT_UINT16, BASE_DEC, NULL, WIMAX_MAC_HEADER_TYPE_2_DL_AVE_CINR,
                        "", HFILL
                }
@@ -480,7 +480,7 @@ static hf_register_info hf[] =
        {
                &hf_mac_header_type_2_dl_ave_rsv,
                {
-                       "Reserved", "wimax.type2DlAveRsv",
+                       "Reserved", "wmx.type2DlAveRsv",
                        FT_UINT16, BASE_DEC, NULL, WIMAX_MAC_HEADER_TYPE_2_DL_AVE_RSV,
                        "", HFILL
                }
@@ -488,7 +488,7 @@ static hf_register_info hf[] =
        {
                &hf_mac_header_type_2_mimo_coef_ni,
                {
-                       "Number of Index", "wimax.type2MimoCoefNi",
+                       "Number of Index", "wmx.type2MimoCoefNi",
                        FT_UINT16, BASE_DEC, NULL, WIMAX_MAC_HEADER_TYPE_2_MIMO_COEF_NI,
                        "", HFILL
                }
@@ -496,7 +496,7 @@ static hf_register_info hf[] =
        {
                &hf_mac_header_type_2_mimo_coef_ai,
                {
-                       "Occurences of Antenna Index", "wimax.type2MimoCoefAi",
+                       "Occurences of Antenna Index", "wmx.type2MimoCoefAi",
                        FT_UINT16, BASE_DEC, NULL, WIMAX_MAC_HEADER_TYPE_2_MIMO_COEF_AI,
                        "", HFILL
                }
@@ -504,7 +504,7 @@ static hf_register_info hf[] =
        {
                &hf_mac_header_type_2_mimo_coef,
                {
-                       "MIMO Coefficients", "wimax.type2MimoCoef",
+                       "MIMO Coefficients", "wmx.type2MimoCoef",
                        FT_UINT16, BASE_DEC, NULL, WIMAX_MAC_HEADER_TYPE_2_MIMO_COEF,
                        "", HFILL
                }
@@ -512,7 +512,7 @@ static hf_register_info hf[] =
        {
                &hf_mac_header_type_2_mimo_coef_rsv,
                {
-                       "Reserved", "wimax.type2MimoCoefRsv",
+                       "Reserved", "wmx.type2MimoCoefRsv",
                        FT_UINT16, BASE_DEC, NULL, WIMAX_MAC_HEADER_TYPE_2_MIMO_COEF_RSV,
                        "", HFILL
                }
@@ -520,7 +520,7 @@ static hf_register_info hf[] =
        {
                &hf_mac_header_type_2_dl_chan_diuc,
                {
-                       "Prefered DIUC", "wimax.type2DlChanDiuc",
+                       "Prefered DIUC", "wmx.type2DlChanDiuc",
                        FT_UINT16, BASE_DEC, NULL, WIMAX_MAC_HEADER_TYPE_2_DL_CHAN_DIUC,
                        "", HFILL
                }
@@ -528,7 +528,7 @@ static hf_register_info hf[] =
        {
                &hf_mac_header_type_2_dl_chan_dcd,
                {
-                       "DCD Change Count", "wimax.type2DlChanDcd",
+                       "DCD Change Count", "wmx.type2DlChanDcd",
                        FT_UINT16, BASE_DEC, NULL, WIMAX_MAC_HEADER_TYPE_2_DL_CHAN_DCD,
                        "", HFILL
                }
@@ -536,7 +536,7 @@ static hf_register_info hf[] =
        {
                &hf_mac_header_type_2_dl_chan_rsv,
                {
-                       "Reserved", "wimax.type2DlChanRsv",
+                       "Reserved", "wmx.type2DlChanRsv",
                        FT_UINT16, BASE_DEC, NULL, WIMAX_MAC_HEADER_TYPE_2_DL_CHAN_RSV,
                        "", HFILL
                }
@@ -544,7 +544,7 @@ static hf_register_info hf[] =
        {
                &hf_mac_header_type_2_ul_tx_pwr,
                {
-                       "UL TX Power", "wimax.type2UlTxPwr",
+                       "UL TX Power", "wmx.type2UlTxPwr",
                        FT_UINT16, BASE_DEC, NULL, WIMAX_MAC_HEADER_TYPE_2_UL_TX_PWR,
                        "", HFILL
                }
@@ -552,7 +552,7 @@ static hf_register_info hf[] =
        {
                &hf_mac_header_type_2_ul_tx_pwr_rsv,
                {
-                       "Reserved", "wimax.type2UlTxPwrRsv",
+                       "Reserved", "wmx.type2UlTxPwrRsv",
                        FT_UINT16, BASE_DEC, NULL, WIMAX_MAC_HEADER_TYPE_2_UL_TX_PWR_RSV,
                        "", HFILL
                }
@@ -560,7 +560,7 @@ static hf_register_info hf[] =
        {
                &hf_mac_header_type_2_phy_diuc,
                {
-                       "Preferred DIUC Index", "wimax.type2PhyDiuc",
+                       "Preferred DIUC Index", "wmx.type2PhyDiuc",
                        FT_UINT24, BASE_DEC, NULL, WIMAX_MAC_HEADER_TYPE_2_PHY_DIUC,
                        "", HFILL
                }
@@ -568,7 +568,7 @@ static hf_register_info hf[] =
        {
                &hf_mac_header_type_2_phy_ul_tx_pwr,
                {
-                       "UL TX Power", "wimax.type2PhyUlTxPwr",
+                       "UL TX Power", "wmx.type2PhyUlTxPwr",
                        FT_UINT24, BASE_DEC, NULL, WIMAX_MAC_HEADER_TYPE_2_PHY_UL_TX_PWR,
                        "", HFILL
                }
@@ -576,7 +576,7 @@ static hf_register_info hf[] =
        {
                &hf_mac_header_type_2_phy_ul_hdrm,
                {
-                       "UL Headroom", "wimax.type2PhyHdRm",
+                       "UL Headroom", "wmx.type2PhyHdRm",
                        FT_UINT24, BASE_DEC, NULL, WIMAX_MAC_HEADER_TYPE_2_PHY_UL_HDRM,
                        "", HFILL
                }
@@ -584,7 +584,7 @@ static hf_register_info hf[] =
        {
                &hf_mac_header_type_2_phy_rsv,
                {
-                       "Reserved", "wimax.type2PhyRsv",
+                       "Reserved", "wmx.type2PhyRsv",
                        FT_UINT24, BASE_DEC, NULL, WIMAX_MAC_HEADER_TYPE_2_PHY_RSV,
                        "", HFILL
                }
@@ -592,7 +592,7 @@ static hf_register_info hf[] =
        {
                &hf_mac_header_type_2_amc_bitmap,
                {
-                       "AMC Band Indication Bitmap", "wimax.type2AmcBitmap",
+                       "AMC Band Indication Bitmap", "wmx.type2AmcBitmap",
                        FT_UINT32, BASE_DEC, NULL, WIMAX_MAC_HEADER_TYPE_2_AMC_BITMAP,
                        "", HFILL
                }
@@ -600,7 +600,7 @@ static hf_register_info hf[] =
        {
                &hf_mac_header_type_2_amc_cqi_1,
                {
-                       "CQI 1", "wimax.type2AmcCqi1",
+                       "CQI 1", "wmx.type2AmcCqi1",
                        FT_UINT32, BASE_DEC, NULL, WIMAX_MAC_HEADER_TYPE_2_AMC_CQI_1,
                        "", HFILL
                }
@@ -608,7 +608,7 @@ static hf_register_info hf[] =
        {
                &hf_mac_header_type_2_amc_cqi_2,
                {
-                       "CQI 2", "wimax.type2AmcCqi2",
+                       "CQI 2", "wmx.type2AmcCqi2",
                        FT_UINT32, BASE_DEC, NULL, WIMAX_MAC_HEADER_TYPE_2_AMC_CQI_2,
                        "", HFILL
                }
@@ -616,7 +616,7 @@ static hf_register_info hf[] =
        {
                &hf_mac_header_type_2_amc_cqi_3,
                {
-                       "CQI 3", "wimax.type2AmcCqi3",
+                       "CQI 3", "wmx.type2AmcCqi3",
                        FT_UINT32, BASE_DEC, NULL, WIMAX_MAC_HEADER_TYPE_2_AMC_CQI_3,
                        "", HFILL
                }
@@ -624,7 +624,7 @@ static hf_register_info hf[] =
        {
                &hf_mac_header_type_2_amc_cqi_4,
                {
-                       "CQI 4", "wimax.type2AmcCqi4",
+                       "CQI 4", "wmx.type2AmcCqi4",
                        FT_UINT32, BASE_DEC, NULL, WIMAX_MAC_HEADER_TYPE_2_AMC_CQI_4,
                        "", HFILL
                }
@@ -632,7 +632,7 @@ static hf_register_info hf[] =
        {
                &hf_mac_header_type_2_life_span,
                {
-                       "Life Span of Short-term", "wimax.type2LifeSpan",
+                       "Life Span of Short-term", "wmx.type2LifeSpan",
                        FT_UINT16, BASE_DEC, NULL, WIMAX_MAC_HEADER_TYPE_2_LIFE_SPAN,
                        "", HFILL
                }
@@ -640,7 +640,7 @@ static hf_register_info hf[] =
        {
                &hf_mac_header_type_2_life_span_rsv,
                {
-                       "Reserved", "wimax.type2LifeSpanRsv",
+                       "Reserved", "wmx.type2LifeSpanRsv",
                        FT_UINT16, BASE_DEC, NULL, WIMAX_MAC_HEADER_TYPE_2_LIFE_SPAN_RSV,
                        "", HFILL
                }
@@ -648,7 +648,7 @@ static hf_register_info hf[] =
        {
                &hf_mac_header_type_2_mt_num_fb_types,
                {
-                       "Number of Feedback Types", "wimax.type2MtNumFbTypes",
+                       "Number of Feedback Types", "wmx.type2MtNumFbTypes",
                        FT_UINT32, BASE_DEC, NULL, WIMAX_MAC_HEADER_TYPE_2_MT_NUM_FB_TYPES,
                        "", HFILL
                }
@@ -656,7 +656,7 @@ static hf_register_info hf[] =
        {
                &hf_mac_header_type_2_mt_occu_fb_type,
                {
-                       "Occurrences of Feedback Type", "wimax.type2MtOccuFbType",
+                       "Occurrences of Feedback Type", "wmx.type2MtOccuFbType",
                        FT_UINT32, BASE_DEC, NULL, WIMAX_MAC_HEADER_TYPE_2_MT_OCCU_FB_TYPE,
                        "", HFILL
                }
@@ -664,7 +664,7 @@ static hf_register_info hf[] =
        {
                &hf_mac_header_type_2_mt_fb_contents,
                {
-                       "Number of Feedback Types", "wimax.type2MtNumFbTypes",
+                       "Number of Feedback Types", "wmx.type2MtNumFbTypes",
                        FT_UINT32, BASE_HEX, NULL, WIMAX_MAC_HEADER_TYPE_2_MT_FB_CONTENTS,
                        "", HFILL
                }
@@ -672,7 +672,7 @@ static hf_register_info hf[] =
        {
                &hf_mac_header_type_2_lt_id_fb,
                {
-                       "Long-term Feedback Index", "wimax.type2LtFbId",
+                       "Long-term Feedback Index", "wmx.type2LtFbId",
                        FT_UINT16, BASE_DEC, NULL, WIMAX_MAC_HEADER_TYPE_2_LT_ID_FB,
                        "", HFILL
                }
@@ -680,7 +680,7 @@ static hf_register_info hf[] =
        {
                &hf_mac_header_type_2_lt_rank,
                {
-                       "Rank of Precoding Codebook", "wimax.type2LtRank",
+                       "Rank of Precoding Codebook", "wmx.type2LtRank",
                        FT_UINT16, BASE_DEC, NULL, WIMAX_MAC_HEADER_TYPE_2_LT_RANK,
                        "", HFILL
                }
@@ -688,7 +688,7 @@ static hf_register_info hf[] =
        {
                &hf_mac_header_type_2_lt_fec_qam,
                {
-                       "FEC and QAM", "wimax.type2LtFecQam",
+                       "FEC and QAM", "wmx.type2LtFecQam",
                        FT_UINT16, BASE_DEC, NULL, WIMAX_MAC_HEADER_TYPE_2_LT_FEC_QAM,
                        "", HFILL
                }
@@ -696,7 +696,7 @@ static hf_register_info hf[] =
        {
                &hf_mac_header_type_2_lt_rsv,
                {
-                       "Reserved", "wimax.type2LtFbId",
+                       "Reserved", "wmx.type2LtFbId",
                        FT_UINT16, BASE_DEC, NULL, WIMAX_MAC_HEADER_TYPE_2_LT_RSV,
                        "", HFILL
                }
@@ -704,7 +704,7 @@ static hf_register_info hf[] =
        {
                &hf_mac_header_type_2_comb_dl_ave,
                {
-                       "Combined DL Average CINR of Active BSs", "wimax.type2CombDlAve",
+                       "Combined DL Average CINR of Active BSs", "wmx.type2CombDlAve",
                        FT_UINT16, BASE_DEC, NULL, WIMAX_MAC_HEADER_TYPE_2_COMB_DL_AVE,
                        "", HFILL
                }
@@ -712,7 +712,7 @@ static hf_register_info hf[] =
        {
                &hf_mac_header_type_2_comb_dl_rsv,
                {
-                       "Reserved", "wimax.type2CombDlRsv",
+                       "Reserved", "wmx.type2CombDlRsv",
                        FT_UINT16, BASE_DEC, NULL, WIMAX_MAC_HEADER_TYPE_2_COMB_DL_RSV,
                        "", HFILL
                }
@@ -720,7 +720,7 @@ static hf_register_info hf[] =
        {
                &hf_mac_header_type_2_mimo_diuc,
                {
-                       "Preferred DIUC Index", "wimax.type2MimoDiuc",
+                       "Preferred DIUC Index", "wmx.type2MimoDiuc",
                        FT_UINT8, BASE_DEC, NULL, WIMAX_MAC_HEADER_TYPE_2_DIUC,
                        "", HFILL
                }
@@ -728,7 +728,7 @@ static hf_register_info hf[] =
        {
                &hf_mac_header_type_2_mimo_pbwi,
                {
-                       "Preferred Bandwidth Index", "wimax.type2MimoPbwi",
+                       "Preferred Bandwidth Index", "wmx.type2MimoPbwi",
                        FT_UINT8, BASE_DEC, VALS(pbwi_table), WIMAX_MAC_HEADER_TYPE_2_PBWI,
                        "", HFILL
                }
@@ -736,7 +736,7 @@ static hf_register_info hf[] =
        {
                &hf_mac_header_type_2_mimo_slpb,
                {
-                       "Starting Location of Preferred Bandwidth", "wimax.type2MimoSlpb",
+                       "Starting Location of Preferred Bandwidth", "wmx.type2MimoSlpb",
                        FT_UINT24, BASE_DEC, NULL, WIMAX_MAC_HEADER_TYPE_2_SLPB,
                        "", HFILL
                }
@@ -744,7 +744,7 @@ static hf_register_info hf[] =
        {
                &hf_mac_header_type_2_mimo_bpri_cid,
                {
-                       "Burst Profile Ranking Indicator with CID", "wimax.type2MimoBpriCid",
+                       "Burst Profile Ranking Indicator with CID", "wmx.type2MimoBpriCid",
                        FT_UINT24, BASE_HEX, VALS(bpri_table), WIMAX_MAC_HEADER_TYPE_2_PBRI_CID,
                        "", HFILL
                }
@@ -752,7 +752,7 @@ static hf_register_info hf[] =
        {
                &hf_mac_header_type_2_mimo_cid,
                {
-                       "Connection ID", "wimax.type2MimoCid",
+                       "Connection ID", "wmx.type2MimoCid",
                        FT_UINT24, BASE_DEC, NULL, WIMAX_MAC_HEADER_TYPE_2_CID,
                        "", HFILL
                }
@@ -760,7 +760,7 @@ static hf_register_info hf[] =
        {
                &hf_mac_header_type_2_mimo_bpri,
                {
-                       "Burst Profile Ranking Indicator without CID", "wimax.type2MimoBpri",
+                       "Burst Profile Ranking Indicator without CID", "wmx.type2MimoBpri",
                        FT_UINT24, BASE_HEX, VALS(bpri_table), WIMAX_MAC_HEADER_TYPE_2_PBRI,
                        "", HFILL
                }
@@ -768,7 +768,7 @@ static hf_register_info hf[] =
        {
                &hf_mac_header_type_2_mimo_cti,
                {
-                       "Coherent Time Index", "wimax.type2MimoCti",
+                       "Coherent Time Index", "wmx.type2MimoCti",
                        FT_UINT24, BASE_HEX, VALS(cti_table), WIMAX_MAC_HEADER_TYPE_2_CTI,
                        "", HFILL
                }
@@ -776,7 +776,7 @@ static hf_register_info hf[] =
        {
                &hf_mac_header_type_2_mimo_ai_0,
                {
-                       "Antenna 0 Indication", "wimax.type2MimoAi",
+                       "Antenna 0 Indication", "wmx.type2MimoAi",
                        FT_UINT24, BASE_HEX, VALS(ai_msgs), WIMAX_MAC_HEADER_TYPE_2_AI_0,
                        "", HFILL
                }
@@ -784,7 +784,7 @@ static hf_register_info hf[] =
        {
                &hf_mac_header_type_2_mimo_ai_1,
                {
-                       "Antenna 1 Indication", "wimax.type2MimoAi",
+                       "Antenna 1 Indication", "wmx.type2MimoAi",
                        FT_UINT24, BASE_HEX, VALS(ai_msgs), WIMAX_MAC_HEADER_TYPE_2_AI_1,
                        "", HFILL
                }
@@ -792,7 +792,7 @@ static hf_register_info hf[] =
        {
                &hf_mac_header_type_2_mimo_ai_2,
                {
-                       "Antenna 2 Indication", "wimax.type2MimoAi",
+                       "Antenna 2 Indication", "wmx.type2MimoAi",
                        FT_UINT24, BASE_HEX, VALS(ai_msgs), WIMAX_MAC_HEADER_TYPE_2_AI_2,
                        "", HFILL
                }
@@ -800,7 +800,7 @@ static hf_register_info hf[] =
        {
                &hf_mac_header_type_2_mimo_ai_3,
                {
-                       "Antenna 3 Indication", "wimax.type2MimoAi",
+                       "Antenna 3 Indication", "wmx.type2MimoAi",
                        FT_UINT24, BASE_HEX, VALS(ai_msgs), WIMAX_MAC_HEADER_TYPE_2_AI_3,
                        "", HFILL
                }
@@ -808,7 +808,7 @@ static hf_register_info hf[] =
        {
                &hf_mac_header_type_2_mimo_mi,
                {
-                       "MS Matrix Indicator", "wimax.type2MimoMi",
+                       "MS Matrix Indicator", "wmx.type2MimoMi",
                        FT_UINT24, BASE_HEX, VALS(mi_table), WIMAX_MAC_HEADER_TYPE_2_MI,
                        "", HFILL
                }
@@ -816,7 +816,7 @@ static hf_register_info hf[] =
        {
                &hf_mac_header_type_2_mimo_ct,
                {
-                       "CQI Type", "wimax.type2MimoCt",
+                       "CQI Type", "wmx.type2MimoCt",
                        FT_UINT24, BASE_HEX, VALS(ct_msgs), WIMAX_MAC_HEADER_TYPE_2_CT,
                        "", HFILL
                }
@@ -824,14 +824,14 @@ static hf_register_info hf[] =
        {
                &hf_mac_header_type_2_mimo_cqi,
                {
-                       "CQI Feedback", "wimax.type2MimoCqi",
+                       "CQI Feedback", "wmx.type2MimoCqi",
                        FT_UINT24, BASE_HEX, NULL, WIMAX_MAC_HEADER_TYPE_2_CQI,
                        "", HFILL
                }
        },
        {       &hf_mac_header_type_2_cinr_mean,
                {
-                       "CINR Mean", "wimax.type2CinrMean",
+                       "CINR Mean", "wmx.type2CinrMean",
                        FT_UINT8, BASE_HEX, NULL, 0x0,
                        "", HFILL
                }
@@ -839,7 +839,7 @@ static hf_register_info hf[] =
        {
                &hf_mac_header_type_2_cinr_devi,
                {
-                       "CINR Standard Deviation", "wimax.type2CinrDevi",
+                       "CINR Standard Deviation", "wmx.type2CinrDevi",
                        FT_UINT8, BASE_HEX, NULL, 0x0,
                        "", HFILL
                }
@@ -847,7 +847,7 @@ static hf_register_info hf[] =
        {
                &hf_mac_header_type_2_cl_mimo_type,
                {
-                       "Closed-Loop MIMO Type", "wimax.type2ClMimoType",
+                       "Closed-Loop MIMO Type", "wmx.type2ClMimoType",
                        FT_UINT16, BASE_HEX, NULL, WIMAX_MAC_HEADER_TYPE_2_CL_MIMO_TYPE,
                        "", HFILL
                }
@@ -855,7 +855,7 @@ static hf_register_info hf[] =
        {
                &hf_mac_header_type_2_cl_mimo_ant_id,
                {
-                       "Antenna Grouping Index", "wimax.type2ClMimoAntId",
+                       "Antenna Grouping Index", "wmx.type2ClMimoAntId",
                        FT_UINT16, BASE_DEC, NULL, WIMAX_MAC_HEADER_TYPE_2_CL_MIMO_ANT_ID,
                        "", HFILL
                }
@@ -863,7 +863,7 @@ static hf_register_info hf[] =
        {
                &hf_mac_header_type_2_cl_mimo_cqi,
                {
-                       "Average CQI", "wimax.type2ClMimoCqi",
+                       "Average CQI", "wmx.type2ClMimoCqi",
                        FT_UINT16, BASE_DEC, NULL, WIMAX_MAC_HEADER_TYPE_2_CL_MIMO_CQI,
                        "", HFILL
                }
@@ -871,7 +871,7 @@ static hf_register_info hf[] =
        {
                &hf_mac_header_type_2_cl_mimo_cqi_1,
                {
-                       "Average CQI", "wimax.type2ClMimoCqi",
+                       "Average CQI", "wmx.type2ClMimoCqi",
                        FT_UINT16, BASE_DEC, NULL, WIMAX_MAC_HEADER_TYPE_2_CL_MIMO_CQI_1,
                        "", HFILL
                }
@@ -879,7 +879,7 @@ static hf_register_info hf[] =
        {
                &hf_mac_header_type_2_cl_mimo_cqi_2,
                {
-                       "Average CQI", "wimax.type2ClMimoCqi",
+                       "Average CQI", "wmx.type2ClMimoCqi",
                        FT_UINT16, BASE_DEC, NULL, WIMAX_MAC_HEADER_TYPE_2_CL_MIMO_CQI_2,
                        "", HFILL
                }
@@ -887,7 +887,7 @@ static hf_register_info hf[] =
        {
                &hf_mac_header_type_2_cl_mimo_rsv,
                {
-                       "Reserved", "wimax.type2ClMimoRsv",
+                       "Reserved", "wmx.type2ClMimoRsv",
                        FT_UINT16, BASE_DEC, NULL, WIMAX_MAC_HEADER_TYPE_2_CL_MIMO_RSV,
                        "", HFILL
                }
@@ -895,7 +895,7 @@ static hf_register_info hf[] =
        {
                &hf_mac_header_type_2_cl_mimo_rsv_1,
                {
-                       "Reserved", "wimax.type2ClMimoRsv",
+                       "Reserved", "wmx.type2ClMimoRsv",
                        FT_UINT16, BASE_DEC, NULL, WIMAX_MAC_HEADER_TYPE_2_CL_MIMO_RSV_1,
                        "", HFILL
                }
@@ -903,7 +903,7 @@ static hf_register_info hf[] =
        {
                &hf_mac_header_type_2_cl_mimo_rsv_2,
                {
-                       "Reserved", "wimax.type2ClMimoRsv",
+                       "Reserved", "wmx.type2ClMimoRsv",
                        FT_UINT16, BASE_DEC, NULL, WIMAX_MAC_HEADER_TYPE_2_CL_MIMO_RSV_2,
                        "", HFILL
                }
@@ -911,7 +911,7 @@ static hf_register_info hf[] =
        {
                &hf_mac_header_type_2_cl_mimo_streams,
                {
-                       "Number of Streams", "wimax.type2ClMimoStreams",
+                       "Number of Streams", "wmx.type2ClMimoStreams",
                        FT_UINT16, BASE_DEC, NULL, WIMAX_MAC_HEADER_TYPE_2_CL_MIMO_STREAMS,
                        "", HFILL
                }
@@ -919,7 +919,7 @@ static hf_register_info hf[] =
        {
                &hf_mac_header_type_2_cl_mimo_ant_sel,
                {
-                       "Antenna Selection Option Index", "wimax.type2ClMimoAntSel",
+                       "Antenna Selection Option Index", "wmx.type2ClMimoAntSel",
                        FT_UINT16, BASE_DEC, NULL, WIMAX_MAC_HEADER_TYPE_2_CL_MIMO_ANT_SEL,
                        "", HFILL
                }
@@ -927,7 +927,7 @@ static hf_register_info hf[] =
        {
                &hf_mac_header_type_2_cl_mimo_codebook_id,
                {
-                       "Codebook Index", "wimax.type2ClMimoCodeBkId",
+                       "Codebook Index", "wmx.type2ClMimoCodeBkId",
                        FT_UINT16, BASE_DEC, NULL, WIMAX_MAC_HEADER_TYPE_2_CL_MIMO_CODEBOOK_ID,
                        "", HFILL
                }
@@ -935,7 +935,7 @@ static hf_register_info hf[] =
        {
                &hf_mac_header_type_2_cid,
                {
-                       "Connection ID", "wimax.type2Cid",
+                       "Connection ID", "wmx.type2Cid",
                        FT_UINT16, BASE_DEC, NULL, 0x0,
                        "", HFILL
                }
@@ -943,7 +943,7 @@ static hf_register_info hf[] =
        {
                &hf_mac_header_type_2_no_cid,
                {
-                       "Reserved", "wimax.type2NoCid",
+                       "Reserved", "wmx.type2NoCid",
                        FT_UINT16, BASE_HEX, NULL, 0x0,
                        "", HFILL
                }
@@ -951,7 +951,7 @@ static hf_register_info hf[] =
        {
                &hf_mac_header_type_2_hcs,
                {
-                       "Header Check Sequence", "wimax.type2Hcs",
+                       "Header Check Sequence", "wmx.type2Hcs",
                        FT_UINT8, BASE_HEX, NULL, 0x0,
                        "", HFILL
                }
index bd9a761b1d5dfdad261c018eede7cef9708ff788..602d0e7d7ef7a8f4a8dfcaa56bc86efde77dafb3 100644 (file)
@@ -204,7 +204,7 @@ static hf_register_info hf[] =
        {
                &hf_mac_mgmt_msg_values,
                {
-                       "Values", "wimax.values",
+                       "Values", "wmx.values",
                        FT_BYTES, BASE_HEX, NULL, 0x0,
                        "", HFILL
                }
@@ -212,7 +212,7 @@ static hf_register_info hf[] =
        {
                &hf_mac_mgmt_msg_unknown_type,
                {
-                       "Unknown MAC Message Type", "wimax.unknown_type",
+                       "Unknown MAC Message Type", "wmx.unknown_type",
                        FT_BYTES, BASE_HEX, NULL, 0x0,
                        "", HFILL
                }
@@ -229,7 +229,7 @@ void proto_register_mac_mgmt_msg(void)
                proto_mac_mgmt_msg_decoder = proto_register_protocol (
                                                        "WiMax MAC Management Message", /* name */
                                                        "MGMT MSG", /* short name */
-                                                       "mgmtmsg" /* abbrev */
+                                                       "wmx.mgmtmsg" /* abbrev */
                                                        );
 #endif
 
index adbccb3cdb461f42719e01afd4d1e234fcd8b483..70ca17f5f6684ebe778787c053f4daeff204ca3e 100644 (file)
@@ -111,21 +111,21 @@ static hf_register_info hf_aas_beam[] =
        {
                &hf_aas_beam_message_type,
                {
-                       "MAC Management Message Type", "wimax.macmgtmsgtype.aas_beam", 
+                       "MAC Management Message Type", "wmx.macmgtmsgtype.aas_beam", 
                        FT_UINT8, BASE_DEC, NULL, 0x0, "", HFILL
                }
        },
        {
                &hf_aas_beam_select_index,
                {
-                       "AAS Beam Index", "wimax.aas_beam.aas_beam_index", 
+                       "AAS Beam Index", "wmx.aas_beam.aas_beam_index", 
                        FT_UINT8, BASE_DEC, NULL, AAS_BEAM_SELECT_AAS_BEAM_INDEX_MASK, "", HFILL
                }
        },
        {
                &hf_aas_beam_beam_bit_mask,
                {
-                       "Beam Bit Mask", "wimax.aas_beam.beam_bit_mask", 
+                       "Beam Bit Mask", "wmx.aas_beam.beam_bit_mask", 
                        FT_UINT8, BASE_HEX, NULL, AAS_BEAM_BEAM_BIT_MASK_MASK, "", HFILL
                }
        },
@@ -133,63 +133,63 @@ static hf_register_info hf_aas_beam[] =
        {
                &hf_aas_beam_cinr_value,
                {
-                       "CINR Mean Value", "wimax.aas_beam.cinr_mean_value", 
+                       "CINR Mean Value", "wmx.aas_beam.cinr_mean_value", 
                        FT_UINT8, BASE_DEC, NULL, 0x0, "", HFILL
                }
        },
        {
                &hf_aas_beam_feedback_request_number,
                {
-                       "Feedback Request Number", "wimax.aas_beam.feedback_request_number", 
+                       "Feedback Request Number", "wmx.aas_beam.feedback_request_number", 
                        FT_UINT8, BASE_DEC, NULL, AAS_BEAM_FEEDBACK_REQUEST_NUMBER_MASK, "", HFILL
                }
        },
        {
                &hf_aas_beam_frame_number,
                {
-                       "Frame Number", "wimax.aas_beam.frame_number", 
+                       "Frame Number", "wmx.aas_beam.frame_number", 
                        FT_UINT8, BASE_DEC, NULL, 0x0, "", HFILL
                }
        },
        {
                &hf_aas_beam_freq_value_im,
                {
-                       "Frequency Value (imaginary part)", "wimax.aas_beam.freq_value_im", 
+                       "Frequency Value (imaginary part)", "wmx.aas_beam.freq_value_im", 
                        FT_UINT8, BASE_DEC, NULL, 0x0, "", HFILL
                }
        },
        {
                &hf_aas_beam_freq_value_re,
                {
-                       "Frequency Value (real part)", "wimax.aas_beam.freq_value_re", 
+                       "Frequency Value (real part)", "wmx.aas_beam.freq_value_re", 
                        FT_UINT8, BASE_DEC, NULL, 0x0, "", HFILL
                }
        },
        {
                &hf_aas_beam_measurement_report_type,
                {
-                       "Measurement Report Type", "wimax.aas_beam.measurement_report_type", 
+                       "Measurement Report Type", "wmx.aas_beam.measurement_report_type", 
                        FT_UINT8, BASE_DEC, VALS(vals_report_types), AAS_BEAM_MEASUREMENT_REPORT_TYPE_MASK, "", HFILL
                }
        },
        {
                &hf_aas_beam_select_reserved,
                {
-                       "Reserved", "wimax.aas_beam.reserved", 
+                       "Reserved", "wmx.aas_beam.reserved", 
                        FT_UINT8, BASE_HEX, NULL, AAS_BEAM_SELECT_RESERVED_MASK, "", HFILL
                }
        },
        {
                &hf_aas_beam_resolution_parameter,
                {
-                       "Resolution Parameter", "wimax.aas_beam.resolution_parameter", 
+                       "Resolution Parameter", "wmx.aas_beam.resolution_parameter", 
                        FT_UINT8, BASE_DEC, VALS(vals_resolution_parameter), AAS_BEAM_RESOLUTION_PARAMETER_MASK, "", HFILL
                }
        },
        {
                &hf_aas_beam_rssi_value,
                {
-                       "RSSI Mean Value", "wimax.aas_beam.rssi_mean_value", 
+                       "RSSI Mean Value", "wmx.aas_beam.rssi_mean_value", 
                        FT_UINT8, BASE_DEC, NULL, 0x0, "", HFILL
                }
        },
@@ -197,7 +197,7 @@ static hf_register_info hf_aas_beam[] =
        {
                &hf_aas_beam_unknown_type,
                {
-                       "Unknown TLV type", "wimax.aas_beam.unknown_type", 
+                       "Unknown TLV type", "wmx.aas_beam.unknown_type", 
                        FT_BYTES, BASE_HEX, NULL, 0x0, "", HFILL
                }
        }
index 288de920439b675c940571fd4dee5ef3665e691e..8fce1a44be377b52995fa7158ac6fcccc474af64 100644 (file)
@@ -114,126 +114,126 @@ static hf_register_info hf_aas_fbck[] =
        {
                &hf_aas_fbck_message_type,
                {
-                       "MAC Management Message Type", "wimax.macmgtmsgtype.aas_fbck", 
+                       "MAC Management Message Type", "wmx.macmgtmsgtype.aas_fbck",
                        FT_UINT8, BASE_DEC, NULL, 0x0, "", HFILL
                }
        },
        {
                &hf_aas_fbck_cinr_value,
                {
-                       "CINR Mean Value", "wimax.aas_fbck.cinr_mean_value", 
+                       "CINR Mean Value", "wmx.aas_fbck.cinr_mean_value",
                        FT_UINT8, BASE_DEC, NULL, 0x0, "", HFILL
                }
        },
        {
                &hf_aas_fbck_req_counter,
                {
-                       "Feedback Request Counter", "wimax.aas_fbck.counter", 
+                       "Feedback Request Counter", "wmx.aas_fbck.counter",
                        FT_UINT8, BASE_DEC, NULL, OFDMA_AAS_FBCK_REQ_FB_REQ_COUNTER_MASK, "", HFILL
                }
        },
        {
                &hf_aas_fbck_frame_number,
                {
-                       "Frame Number", "wimax.aas_fbck.frame_number", 
+                       "Frame Number", "wmx.aas_fbck.frame_number",
                        FT_UINT8, BASE_DEC, NULL, 0x0, "", HFILL
                }
        },
        {
                &hf_aas_fbck_freq_value_re,
                {
-                       "Frequency Value (real part)", "wimax.aas_fbck.freq_value_re", 
+                       "Frequency Value (real part)", "wmx.aas_fbck.freq_value_re",
                        FT_UINT8, BASE_DEC, NULL, 0x0, "", HFILL
                }
        },
        {
                &hf_aas_fbck_freq_value_im,
                {
-                       "Frequency Value (imaginary part)", "wimax.aas_fbck.freq_value_im", 
+                       "Frequency Value (imaginary part)", "wmx.aas_fbck.freq_value_im",
                        FT_UINT8, BASE_DEC, NULL, 0x0, "", HFILL
                }
        },
        {
                &hf_aas_fbck_number_of_frames,
                {
-                       "Number Of Frames", "wimax.aas_fbck.number_of_frames", 
+                       "Number Of Frames", "wmx.aas_fbck.number_of_frames",
                        FT_UINT8, BASE_DEC, NULL, OFDMA_AAS_FBCK_REQ_NUMBER_OF_FRAME_MASK, "", HFILL
                }
        },
        {
                &hf_aas_fbck_req_resolution_0,
                {
-                       "Frequency Measurement Resolution", "wimax.aas_fbck.resolution", 
+                       "Frequency Measurement Resolution", "wmx.aas_fbck.resolution",
                        FT_UINT8, BASE_DEC, VALS(vals_resolutions_0), OFDMA_AAS_FBCK_REQ_FB_REQ_RESOLUTION_MASK, "", HFILL
                }
        },
        {
                &hf_aas_fbck_req_resolution_1,
                {
-                       "Frequency Measurement Resolution", "wimax.aas_fbck.resolution", 
+                       "Frequency Measurement Resolution", "wmx.aas_fbck.resolution",
                        FT_UINT8, BASE_DEC, VALS(vals_resolutions_1), OFDMA_AAS_FBCK_REQ_FB_REQ_RESOLUTION_MASK, "", HFILL
                }
        },
        {
                &hf_aas_fbck_rssi_value,
                {
-                       "RSSI Mean Value", "wimax.aas_fbck.rssi_mean_value", 
+                       "RSSI Mean Value", "wmx.aas_fbck.rssi_mean_value",
                        FT_UINT8, BASE_DEC, NULL, 0x0, "", HFILL
                }
        },
        {
                &hf_aas_fbck_unknown_type,
                {
-                       "Unknown TLV type", "wimax.aas_fbck.unknown_type", 
+                       "Unknown TLV type", "wmx.aas_fbck.unknown_type",
                        FT_BYTES, BASE_HEX, NULL, 0x0, "", HFILL
                }
        },
        {
                &hf_aas_fbck_req_data_type,
                {
-                       "Measurement Data Type", "wimax.aas_fbck_req.data_type", 
+                       "Measurement Data Type", "wmx.aas_fbck_req.data_type",
                        FT_UINT8, BASE_DEC, VALS(vals_data_types), OFDMA_AAS_FBCK_REQ_DATA_TYPE_MASK, "", HFILL
                }
        },
        {
                &hf_aas_fbck_req_reserved,
                {
-                       "Reserved", "wimax.aas_fbck_req.reserved", 
+                       "Reserved", "wmx.aas_fbck_req.reserved",
                        FT_UINT8, BASE_HEX, NULL, OFDMA_AAS_FBCK_REQ_FB_REQ_RESERVED_MASK, "", HFILL
                }
        },
        {
                &hf_aas_fbck_rsp_counter,
                {
-                       "Feedback Request Counter", "wimax.aas_fbck_rsp.counter", 
+                       "Feedback Request Counter", "wmx.aas_fbck_rsp.counter",
                        FT_UINT8, BASE_DEC, NULL, OFDMA_AAS_FBCK_REQ_FB_RSP_COUNTER_MASK, "", HFILL
                }
        },
        {
                &hf_aas_fbck_rsp_data_type,
                {
-                       "Measurement Data Type", "wimax.aas_fbck_rsp.data_type", 
+                       "Measurement Data Type", "wmx.aas_fbck_rsp.data_type",
                        FT_UINT8, BASE_DEC, VALS(vals_data_types), OFDMA_AAS_FBCK_RSP_DATA_TYPE_MASK, "", HFILL
                }
        },
        {
                &hf_aas_fbck_rsp_reserved,
                {
-                       "Reserved", "wimax.aas_fbck_rsp.reserved", 
+                       "Reserved", "wmx.aas_fbck_rsp.reserved",
                        FT_UINT8, BASE_HEX, NULL, OFDMA_AAS_FBCK_REQ_FB_RSP_RESERVED_MASK, "", HFILL
                }
        },
        {
                &hf_aas_fbck_rsp_resolution_0,
                {
-                       "Frequency Measurement Resolution", "wimax.aas_fbck_rsp.resolution", 
+                       "Frequency Measurement Resolution", "wmx.aas_fbck_rsp.resolution",
                        FT_UINT8, BASE_DEC, VALS(vals_resolutions_0), OFDMA_AAS_FBCK_REQ_FB_RSP_RESOLUTION_MASK, "", HFILL
                }
        },
        {
                &hf_aas_fbck_rsp_resolution_1,
                {
-                       "Frequency Measurement Resolution", "wimax.aas_fbck_rsp.resolution", 
+                       "Frequency Measurement Resolution", "wmx.aas_fbck_rsp.resolution",
                        FT_UINT8, BASE_DEC, VALS(vals_resolutions_1), OFDMA_AAS_FBCK_REQ_FB_RSP_RESOLUTION_MASK, "", HFILL
                }
        }
@@ -247,7 +247,7 @@ void proto_register_mac_mgmt_msg_aas_fbck(void)
                proto_mac_mgmt_msg_aas_fbck_decoder = proto_register_protocol (
                                                        "WiMax AAS-FEEDBACK/BEAM Messages", /* name */
                                                        "WiMax AAS-FEEDBACK/BEAM (aas)", /* short name */
-                                                       "aas" /* abbrev */
+                                                       "wmx.aas" /* abbrev */
                                                        );
 
                proto_register_field_array(proto_mac_mgmt_msg_aas_fbck_decoder, hf_aas_fbck, array_length(hf_aas_fbck));
index 0b00609395bfd005ad21fefc5580216ba7b0f7fb..e744aff9be0f12ad778e5158fff24d89f1fd7be7 100644 (file)
@@ -138,168 +138,168 @@ static hf_register_info hf[] =
        {
                &hf_arq_message_type,
                {
-                       "MAC Management Message Type", "wimax.macmgtmsgtype.arq",
+                       "MAC Management Message Type", "wmx.macmgtmsgtype.arq",
                        FT_UINT8, BASE_DEC, NULL, 0x0, "", HFILL
                }
        },
        {
                &hf_arq_ack_type,
                {
-                       "ACK Type", "wimax.arq.ack_type", 
+                       "ACK Type", "wmx.arq.ack_type",
                        FT_UINT8, BASE_DEC, VALS(vals_arq_ack_type), 0x60, "", HFILL
                }
        },
        {
                &hf_arq_bsn,
                {
-                       "BSN", "wimax.arq.bsn", 
+                       "BSN", "wmx.arq.bsn",
                        FT_UINT16, BASE_DEC, NULL, 0x1FFC, "", HFILL
                }
        },
        {
                &hf_arq_cid,
                {
-                       "Connection ID", "wimax.arq.cid", 
+                       "Connection ID", "wmx.arq.cid",
                        FT_UINT16, BASE_DEC, NULL, 0x00, "The ID of the connection being referenced", HFILL
                }
        },
        {
                &hf_arq_discard_bsn,
                {
-                       "BSN", "wimax.arq.discard_bsn", 
+                       "BSN", "wmx.arq.discard_bsn",
                        FT_UINT16, BASE_DEC, NULL, 0x07FF, "", HFILL
                }
        },
        {
                &hf_arq_discard_cid,
                {
-                       "Connection ID", "wimax.arq.discard_cid", 
+                       "Connection ID", "wmx.arq.discard_cid",
                        FT_UINT16, BASE_DEC, NULL, 0x00, "", HFILL
                }
        },
        {
                &hf_arq_discard_reserved,
                {
-                       "Reserved", "wimax.arq.discard_reserved", 
+                       "Reserved", "wmx.arq.discard_reserved",
                        FT_UINT8, BASE_DEC, NULL, 0xF8, "", HFILL
                }
        },
        {
                &hf_arq_last,
                {
-                       "LAST", "wimax.arq.last", 
+                       "LAST", "wmx.arq.last",
                        FT_BOOLEAN, 8, TFS(&tfs_arq_last), 0x80, "", HFILL
                }
        },
        {
                &hf_arq_num_ack_maps,
                {
-                       "Number of ACK Maps", "wimax.arq.num_maps", 
+                       "Number of ACK Maps", "wmx.arq.num_maps",
                        FT_UINT8, BASE_DEC, NULL, 0x03, "", HFILL
                }
        },
        {
                &hf_arq_reserved,
                {
-                       "Reserved", "wimax.arq.reserved", 
+                       "Reserved", "wmx.arq.reserved",
                        FT_UINT8, BASE_DEC, NULL, 0x01, "", HFILL
                }
        },
        {
                &hf_arq_reset_cid,
                {
-                       "Connection ID", "wimax.arq.reset_cid", 
+                       "Connection ID", "wmx.arq.reset_cid",
                        FT_UINT16, BASE_DEC, NULL, 0x00, "", HFILL
                }
        },
        {
                &hf_arq_reset_direction,
                {
-                       "Direction", "wimax.arq.reset_direction", 
+                       "Direction", "wmx.arq.reset_direction",
                        FT_UINT8, BASE_DEC, VALS(vals_arq_reset_direction), 0x30, "", HFILL
                }
        },
        {
                &hf_arq_reset_reserved,
                {
-                       "Reserved", "wimax.arq.reset_reserved", 
+                       "Reserved", "wmx.arq.reset_reserved",
                        FT_UINT8, BASE_DEC, NULL, 0x0F, "", HFILL
                }
        },
        {
                &hf_arq_reset_type,
                {
-                       "Type", "wimax.arq.reset_type", 
+                       "Type", "wmx.arq.reset_type",
                        FT_UINT8, BASE_DEC, VALS(vals_arq_reset_type), 0xC0, "", HFILL
                }
        },
        {
                &hf_arq_selective_map,
                {
-                       "Selective ACK Map", "wimax.arq.selective_map", 
+                       "Selective ACK Map", "wmx.arq.selective_map",
                        FT_UINT16, BASE_HEX, NULL, 0x0, "", HFILL
                }
        },
        {
                &hf_arq_0seq_ack_map,
                {
-                       "Sequence ACK Map", "wimax.arq.seq_ack_map", 
+                       "Sequence ACK Map", "wmx.arq.seq_ack_map",
                        FT_UINT8, BASE_HEX, NULL, 0x60, "", HFILL
                }
        },
        {
                &hf_arq_1seq_ack_map,
                {
-                       "Sequence ACK Map", "wimax.arq.seq_ack_map", 
+                       "Sequence ACK Map", "wmx.arq.seq_ack_map",
                        FT_UINT8, BASE_HEX, NULL, 0x70, "", HFILL
                }
        },
        {
                &hf_arq_seq_format,
                {
-                       "Sequence Format", "wimax.arq.seq_format", 
+                       "Sequence Format", "wmx.arq.seq_format",
                        FT_UINT8, BASE_DEC, NULL, 0x80, "", HFILL
                }
        },
        {
                &hf_arq_0seq1_len,
                {
-                       "Sequence 1 Length", "wimax.arq.seq1_len", 
+                       "Sequence 1 Length", "wmx.arq.seq1_len",
                        FT_UINT16, BASE_DEC, NULL, 0x1F80, "", HFILL
                }
        },
        {
                &hf_arq_0seq2_len,
                {
-                       "Sequence 2 Length", "wimax.arq.seq2_len", 
+                       "Sequence 2 Length", "wmx.arq.seq2_len",
                        FT_UINT16, BASE_DEC, NULL, 0x007E, "", HFILL
                }
        },
        {
                &hf_arq_1seq1_len,
                {
-                       "Sequence 1 Length", "wimax.arq.seq1_len", 
+                       "Sequence 1 Length", "wmx.arq.seq1_len",
                        FT_UINT8, BASE_DEC, NULL, 0x0F, "", HFILL
                }
        },
        {
                &hf_arq_1seq2_len,
                {
-                       "Sequence 2 Length", "wimax.arq.seq2_len", 
+                       "Sequence 2 Length", "wmx.arq.seq2_len",
                        FT_UINT8, BASE_DEC, NULL, 0xF0, "", HFILL
                }
        },
        {
                &hf_arq_1seq3_len,
                {
-                       "Sequence 3 Length", "wimax.arq.seq3_len", 
+                       "Sequence 3 Length", "wmx.arq.seq3_len",
                        FT_UINT8, BASE_DEC, NULL, 0x0F, "", HFILL
                }
        },
        {
                &hf_ack_type_reserved,
                {
-                       "Reserved", "wimax.ack_type.reserved", 
+                       "Reserved", "wmx.ack_type.reserved",
                        FT_UINT8, BASE_DEC, NULL, 0x03, "", HFILL
                }
        }
@@ -313,7 +313,7 @@ void proto_register_mac_mgmt_msg_arq_feedback(void)
                proto_mac_mgmt_msg_arq_feedback_decoder = proto_register_protocol (
                                                        "WiMax ARQ Feedback/Discard/Reset Messages", /* name */
                                                        "WiMax ARQ Feedback/Discard/Reset (arq)", /* short name */
-                                                       "arq" /* abbrev */
+                                                       "wmx.arq" /* abbrev */
                                                        );
 
                proto_register_field_array(proto_mac_mgmt_msg_arq_feedback_decoder, hf, array_length(hf));
index 398d616d95566bf06591103539f635a82538fb4f..3374e1ea5a262bc93983bdfdb46bb2815f863bd3 100644 (file)
@@ -64,42 +64,42 @@ static hf_register_info hf_clk_cmp[] =
        {
                &hf_clk_cmp_message_type,
                {
-                       "MAC Management Message Type", "wimax.macmgtmsgtype.clk_cmp",
+                       "MAC Management Message Type", "wmx.macmgtmsgtype.clk_cmp",
                        FT_UINT8, BASE_DEC, NULL, 0x0, "", HFILL
                }
        },
        {
                &hf_clk_cmp_clock_count,
                {
-                       "Clock Count", "wimax.clk_cmp.clock_count",
+                       "Clock Count", "wmx.clk_cmp.clock_count",
                        FT_UINT8, BASE_DEC, NULL, 0x0, "", HFILL
                }
        },
        {
                &hf_clk_cmp_clock_id,
                {
-                       "Clock ID", "wimax.clk_cmp.clock_id",
+                       "Clock ID", "wmx.clk_cmp.clock_id",
                        FT_UINT8, BASE_DEC, NULL, 0x0, "", HFILL
                }
        },
        {
                &hf_clk_cmp_comparision_value,
                {
-                       "Comparision Value", "wimax.clk_cmp.comparision_value",
+                       "Comparision Value", "wmx.clk_cmp.comparision_value",
                        FT_INT8, BASE_DEC, NULL, 0x0, "", HFILL
                }
        },
        {
                &hf_clk_cmp_invalid_tlv,
                {
-                       "Invalid TLV", "wimax.clk_cmp.invalid_tlv", 
+                       "Invalid TLV", "wmx.clk_cmp.invalid_tlv",
                        FT_BYTES, BASE_HEX, NULL, 0, "", HFILL
                }
        },
        {
                &hf_clk_cmp_seq_number,
                {
-                       "Sequence Number", "wimax.clk_cmp.seq_number",
+                       "Sequence Number", "wmx.clk_cmp.seq_number",
                        FT_UINT8, BASE_DEC, NULL, 0x0, "", HFILL
                }
        }
@@ -113,7 +113,7 @@ void proto_register_mac_mgmt_msg_clk_cmp(void)
                proto_mac_mgmt_msg_clk_cmp_decoder = proto_register_protocol (
                                                        "WiMax CLK-CMP Message", /* name */
                                                        "WiMax CLK-CMP (clk)", /* short name */
-                                                       "clk" /* abbrev */
+                                                       "wmx.clk" /* abbrev */
                                                        );
 
                proto_register_field_array(proto_mac_mgmt_msg_clk_cmp_decoder, hf_clk_cmp, array_length(hf_clk_cmp));
index 95b3a06877c6ca8384b23c398840c05778aba6a4..06b2f3d1679724d649a441d83d0304150ac9c0a2 100644 (file)
@@ -348,161 +348,161 @@ static hf_register_info hf[] =
        {
                &hf_dcd_message_type,
                {
-                       "MAC Management Message Type", "wimax.macmgtmsgtype.dcd",
+                       "MAC Management Message Type", "wmx.macmgtmsgtype.dcd",
                        FT_UINT8, BASE_DEC, NULL, 0x0, "", HFILL
                }
        },
         {
                &hf_dcd_tlv_t_33_asr,
                {
-                       "ASR (Anchor Switch Report) Slot Length (M) and Switching Period (L)", "wimax.dcd.asr", 
+                       "ASR (Anchor Switch Report) Slot Length (M) and Switching Period (L)", "wmx.dcd.asr",
                        FT_UINT8, BASE_HEX, NULL, 0x0, "", HFILL
                }
        },
         {
                &hf_dcd_tlv_t_33_asr_l,
                {
-                       "ASR Switching Period (L)", "wimax.dcd.asr.l", 
+                       "ASR Switching Period (L)", "wmx.dcd.asr.l",
                        FT_UINT8, BASE_DEC, NULL, 0x0f, "", HFILL
                }
        },
         {
                &hf_dcd_tlv_t_33_asr_m,
                {
-                       "ASR Slot Length (M)", "wimax.dcd.asr.m", 
+                       "ASR Slot Length (M)", "wmx.dcd.asr.m",
                        FT_UINT8, BASE_DEC, NULL, 0xf0, "", HFILL
                }
        },
        {
                &hf_dcd_bs_eirp,
                {
-                       "BS EIRP", "wimax.dcd.bs_eirp",
+                       "BS EIRP", "wmx.dcd.bs_eirp",
                        FT_INT16, BASE_DEC, NULL, 0x00, "", HFILL
                }
        },
        {
                &hf_dcd_bs_id,
                {
-                       "Base Station ID", "wimax.dcd.bs_id", 
+                       "Base Station ID", "wmx.dcd.bs_id",
                        FT_ETHER, BASE_HEX, NULL, 0x00, "", HFILL
                }
        },
         {
-               &hf_dcd_restart_count, 
+               &hf_dcd_restart_count,
                {
-                       "BS Restart Count", "wimax.dcd.bs_restart_count", 
+                       "BS Restart Count", "wmx.dcd.bs_restart_count",
                        FT_UINT8, BASE_DEC, NULL, 0x00, "", HFILL
                }
        },
        {
                &hf_dl_burst_diuc,
                {
-                       "DIUC", "wimax.dcd.burst.diuc", 
+                       "DIUC", "wmx.dcd.burst.diuc",
                        FT_UINT8, BASE_DEC, NULL, 0x0F, "", HFILL
                }
        },
        {
                &hf_dcd_burst_diuc_entry_threshold,
                {
-                       "DIUC Minimum Entry Threshold (in 0.25 dB units)", "wimax.dcd.burst.diuc_entry_threshold", 
+                       "DIUC Minimum Entry Threshold (in 0.25 dB units)", "wmx.dcd.burst.diuc_entry_threshold",
                        FT_FLOAT, BASE_DEC, NULL, 0x00, "", HFILL
                }
        },
        {
                &hf_dcd_burst_diuc_exit_threshold,
                {
-                       "DIUC Mandatory Exit Threshold (in 0.25 dB units)", "wimax.dcd.burst.diuc_exit_threshold", 
+                       "DIUC Mandatory Exit Threshold (in 0.25 dB units)", "wmx.dcd.burst.diuc_exit_threshold",
                        FT_FLOAT, BASE_DEC, NULL, 0x00, "", HFILL
                }
        },
        {
                &hf_dcd_burst_fec,
                {
-                       "FEC Code Type", "wimax.dcd.burst.fec", 
+                       "FEC Code Type", "wmx.dcd.burst.fec",
                        FT_UINT8, BASE_DEC, VALS(vals_dcd_burst_fec_ofdma), 0x00, "", HFILL
                }
        },
        {
                &hf_dcd_burst_freq,
                {
-                       "Frequency", "wimax.dcd.burst.freq", 
+                       "Frequency", "wmx.dcd.burst.freq",
                        FT_UINT8, BASE_DEC, NULL, 0x00, "", HFILL
                }
        },
        {
                &hf_dl_burst_reserved,
                {
-                       "Reserved", "wimax.dcd.burst.reserved", 
+                       "Reserved", "wmx.dcd.burst.reserved",
                        FT_UINT8, BASE_HEX, NULL, 0xF0, "", HFILL
                }
        },
        {
                &hf_dcd_burst_tcs,
                {
-                       "TCS", "wimax.dcd.burst.tcs", 
+                       "TCS", "wmx.dcd.burst.tcs",
                        FT_UINT8, BASE_DEC, VALS(vals_dcd_burst_tcs), 0x00, "", HFILL
                }
        },
        {
                &hf_dcd_channel_nr,
                {
-                       "Channel Nr", "wimax.dcd.channel_nr",
+                       "Channel Nr", "wmx.dcd.channel_nr",
                        FT_UINT8, BASE_DEC, NULL, 0x00, "", HFILL
                }
        },
        {
                &hf_dcd_config_change_count,
                {
-                       "Configuration Change Count", "wimax.dcd.config_change_count",
+                       "Configuration Change Count", "wmx.dcd.config_change_count",
                        FT_UINT8, BASE_DEC, NULL, 0x0, "", HFILL
                }
        },
         {
                &hf_dcd_tlv_t_21_default_rssi_and_cinr_averaging_parameter_physical_cinr_measurements,
                {
-                       "Default Averaging Parameter for Physical CINR Measurements (in multiples of 1/16)", "wimax.dcd.default_physical_cinr_meas_averaging_parameter", 
+                       "Default Averaging Parameter for Physical CINR Measurements (in multiples of 1/16)", "wmx.dcd.default_physical_cinr_meas_averaging_parameter",
                        FT_UINT8, BASE_HEX, NULL, 0xf0, "", HFILL
                }
        },
         {
                &hf_dcd_tlv_t_21_default_rssi_and_cinr_averaging_parameter,
                {
-                       "Default RSSI and CINR Averaging Parameter", "wimax.dcd.default_rssi_and_cinr_averaging_parameter", 
+                       "Default RSSI and CINR Averaging Parameter", "wmx.dcd.default_rssi_and_cinr_averaging_parameter",
                        FT_UINT8, BASE_HEX, NULL, 0x00, "", HFILL
                }
        },
         {
                &hf_dcd_tlv_t_21_default_rssi_and_cinr_averaging_parameter_rssi_measurements,
                {
-                       "Default Averaging Parameter for RSSI Measurements (in multiples of 1/16)", "wimax.dcd.default_rssi_meas_averaging_parameter", 
+                       "Default Averaging Parameter for RSSI Measurements (in multiples of 1/16)", "wmx.dcd.default_rssi_meas_averaging_parameter",
                        FT_UINT8, BASE_HEX, NULL, 0x0f, "", HFILL
                }
        },
         {
                &hf_dcd_tlv_t_22_dl_amc_allocated_physical_bands_bitmap,
                {
-                       "DL AMC Allocated Physical Bands Bitmap", "wimax.dcd.dl_amc_allocated_phy_bands_bitmap", 
+                       "DL AMC Allocated Physical Bands Bitmap", "wmx.dcd.dl_amc_allocated_phy_bands_bitmap",
                        FT_BYTES, BASE_HEX, NULL, 0x0, "", HFILL
                }
        },
        {
                &hf_dcd_dl_burst_profile_diuc,
                {
-                       "DIUC", "wimax.dcd.dl_burst_profile_diuc",
+                       "DIUC", "wmx.dcd.dl_burst_profile_diuc",
                        FT_UINT8, BASE_DEC, VALS(diuc_msgs), 0x0F, "", HFILL
                }
        },
        {
                &hf_dcd_dl_burst_profile_rsv,
                {
-                       "Reserved", "wimax.dcd.dl_burst_profile_rsv",
+                       "Reserved", "wmx.dcd.dl_burst_profile_rsv",
                        FT_UINT8, BASE_DEC, NULL, 0xF0, "", HFILL
                }
        },
        {
                &hf_dcd_downlink_channel_id,
                {
-                       "Reserved", "wimax.dcd.dl_channel_id",
+                       "Reserved", "wmx.dcd.dl_channel_id",
                        FT_UINT8, BASE_DEC, NULL, 0x0, "", HFILL
                }
        },
@@ -516,49 +516,49 @@ static hf_register_info hf[] =
         {
                &hf_dcd_tlv_t_34_dl_region_definition,
                {
-                       "DL Region Definition", "wimax.dcd.dl_region_definition", 
+                       "DL Region Definition", "wmx.dcd.dl_region_definition",
                        FT_BYTES, BASE_HEX, NULL, 0x00, "", HFILL
                }
        },
         {
                &hf_dcd_tlv_t_34_dl_region_definition_num_region,
                {
-                       "Number of Regions", "wimax.dcd.dl_region_definition.num_region", 
+                       "Number of Regions", "wmx.dcd.dl_region_definition.num_region",
                        FT_UINT8, BASE_DEC, NULL, 0xFC, "", HFILL
                }
        },
         {
                &hf_dcd_tlv_t_34_dl_region_definition_num_subchannels,
                {
-                       "Number of Subchannels", "wimax.dcd.dl_region_definition.num_subchannels", 
+                       "Number of Subchannels", "wmx.dcd.dl_region_definition.num_subchannels",
                        FT_UINT8, BASE_HEX, NULL, 0x00, "", HFILL
                }
        },
         {
                &hf_dcd_tlv_t_34_dl_region_definition_num_symbols,
                {
-                       "Number of OFDMA Symbols", "wimax.dcd.dl_region_definition.num_symbols", 
+                       "Number of OFDMA Symbols", "wmx.dcd.dl_region_definition.num_symbols",
                        FT_UINT8, BASE_HEX, NULL, 0x00, "", HFILL
                }
        },
         {
                &hf_dcd_tlv_t_34_dl_region_definition_reserved,
                {
-                       "Reserved", "wimax.dcd.dl_region_definition.reserved", 
+                       "Reserved", "wmx.dcd.dl_region_definition.reserved",
                        FT_UINT8, BASE_DEC, NULL, 0x03, "", HFILL
                }
        },
         {
                &hf_dcd_tlv_t_34_dl_region_definition_subchannel_offset,
                {
-                       "Subchannel Offset", "wimax.dcd.dl_region_definition.subchannel_offset", 
+                       "Subchannel Offset", "wmx.dcd.dl_region_definition.subchannel_offset",
                        FT_UINT8, BASE_HEX, NULL, 0x00, "", HFILL
                }
        },
         {
                &hf_dcd_tlv_t_34_dl_region_definition_symbol_offset,
                {
-                       "OFDMA Symbol Offset", "wimax.dcd.dl_region_definition.symbol_offset", 
+                       "OFDMA Symbol Offset", "wmx.dcd.dl_region_definition.symbol_offset",
                        FT_UINT8, BASE_HEX, NULL, 0x00, "", HFILL
                }
        },
@@ -566,7 +566,7 @@ static hf_register_info hf[] =
         {
                &hf_dcd_eirxp,
                {
-                       "EIRXP (IR, max)", "wimax.dcd.eirxp", 
+                       "EIRXP (IR, max)", "wmx.dcd.eirxp",
                        FT_INT16, BASE_DEC, NULL, 0x00, "", HFILL
                }
        },
@@ -574,35 +574,35 @@ static hf_register_info hf[] =
        {
                &hf_dcd_frame_duration,
                {
-                       "Frame Duration", "wimax.dcd.frame_duration",
+                       "Frame Duration", "wmx.dcd.frame_duration",
                        FT_UINT32, BASE_HEX, NULL, 0x00, "", HFILL
                }
        },
        {
                &hf_dcd_frame_duration_code,
                {
-                       "Frame Duration Code", "wimax.dcd.frame_duration_code", 
+                       "Frame Duration Code", "wmx.dcd.frame_duration_code",
                        FT_UINT8, BASE_HEX, VALS(vals_dcd_frame_duration), 0x00, "", HFILL
                }
        },
        {
                &hf_dcd_frame_nr,
                {
-                       "Frame Number", "wimax.dcd.frame_nr", 
+                       "Frame Number", "wmx.dcd.frame_nr",
                        FT_UINT24, BASE_DEC, NULL, 0x00, "", HFILL
                }
        },
        {
                &hf_dcd_frequency,
                {
-                       "Downlink Center Frequency", "wimax.dcd.frequency", 
+                       "Downlink Center Frequency", "wmx.dcd.frequency",
                        FT_UINT32, BASE_DEC, NULL, 0x00, "", HFILL
                }
        },
         {
                &hf_dcd_tlv_t_31_h_add_threshold,
                {
-                       "H_add Threshold", "wimax.dcd.h_add_threshold", 
+                       "H_add Threshold", "wmx.dcd.h_add_threshold",
                        FT_UINT8, BASE_DEC, NULL, 0x0, "", HFILL
                }
        },
@@ -610,7 +610,7 @@ static hf_register_info hf[] =
        {
                &hf_dcd_h_arq_ack_delay,
                {
-                       "H-ARQ ACK Delay for DL Burst", "wimax.dcd.h_arq_ack_delay_dl_burst", 
+                       "H-ARQ ACK Delay for DL Burst", "wmx.dcd.h_arq_ack_delay_dl_burst",
                        FT_UINT8, BASE_DEC, NULL, 0x00, "", HFILL
                }
        },
@@ -618,7 +618,7 @@ static hf_register_info hf[] =
         {
                &hf_dcd_h_arq_ack_delay,
                {
-                       "H-ARQ ACK Delay for UL Burst", "wimax.dcd.h_arq_ack_delay_ul_burst", 
+                       "H-ARQ ACK Delay for UL Burst", "wmx.dcd.h_arq_ack_delay_ul_burst",
                        FT_UINT8, BASE_DEC, NULL, 0x00, "", HFILL
                }
        },
@@ -626,126 +626,126 @@ static hf_register_info hf[] =
         {
                &hf_dcd_tlv_t_32_h_delete_threshold,
                {
-                       "H_delete Threshold", "wimax.dcd.h_delete_threshold", 
+                       "H_delete Threshold", "wmx.dcd.h_delete_threshold",
                        FT_UINT8, BASE_DEC, NULL, 0x0, "", HFILL
                }
        },
         {
                &hf_dcd_tlv_t_50_ho_type_support,
                {
-                       "HO Type Support", "wimax.dcd.ho_type_support", 
+                       "HO Type Support", "wmx.dcd.ho_type_support",
                        FT_UINT8, BASE_HEX, NULL, 0x00, "", HFILL
                }
        },
         {
                &hf_dcd_tlv_t_50_ho_type_support_fbss_ho,
                {
-                       "FBSS HO", "wimax.dcd.ho_type_support.fbss_ho", 
+                       "FBSS HO", "wmx.dcd.ho_type_support.fbss_ho",
                        FT_UINT8, BASE_HEX, VALS(tfs_support), 0x20, "", HFILL
                }
        },
         {
                &hf_dcd_tlv_t_50_ho_type_support_ho,
                {
-                       "HO", "wimax.dcd.ho_type_support.ho", 
+                       "HO", "wmx.dcd.ho_type_support.ho",
                        FT_UINT8, BASE_HEX, VALS(tfs_support), 0x80, "", HFILL
                }
        },
         {
                &hf_dcd_tlv_t_50_ho_type_support_mdho,
                {
-                       "MDHO", "wimax.dcd.ho_type_support.mdho", 
+                       "MDHO", "wmx.dcd.ho_type_support.mdho",
                        FT_UINT8, BASE_HEX, VALS(tfs_support), 0x40, "", HFILL
                }
        },
         {
                &hf_dcd_tlv_t_50_ho_type_support_reserved,
                {
-                       "Reserved", "wimax.dcd.ho_type_support.reserved", 
+                       "Reserved", "wmx.dcd.ho_type_support.reserved",
                        FT_UINT8, BASE_HEX, NULL, 0x1f, "", HFILL
                }
        },
         {
                &hf_dcd_tlv_t_51_hysteresis_margin,
                {
-                       "Hysteresis Margin", "wimax.dcd.hysteresis_margin", 
+                       "Hysteresis Margin", "wmx.dcd.hysteresis_margin",
                        FT_UINT8, BASE_DEC, NULL, 0x0, "", HFILL
                }
        },
        {
                &hf_dcd_invalid_tlv,
                {
-                       "Invalid TLV", "wimax.dcd.invalid_tlv", 
+                       "Invalid TLV", "wmx.dcd.invalid_tlv",
                        FT_BYTES, BASE_HEX, NULL, 0, "", HFILL
                }
        },
        {
                &hf_dcd_mac_version,
                {
-                       "MAC Version", "wimax.dcd.mac_version", 
+                       "MAC Version", "wmx.dcd.mac_version",
                        FT_UINT8, BASE_DEC, VALS(vals_dcd_mac_version), 0x00, "", HFILL
                }
        },
         {
                &hf_dcd_tlv_t_20_maximum_retransmission,
                {
-                       "Maximum Retransmission", "wimax.dcd.maximum_retransmission", 
+                       "Maximum Retransmission", "wmx.dcd.maximum_retransmission",
                        FT_UINT8, BASE_DEC, NULL, 0x00, "", HFILL
                }
        },
         {
                &hf_dcd_tlv_t_60_noise_interference,
                {
-                       "Noise and Interference", "wimax.dcd.noise_interference", 
+                       "Noise and Interference", "wmx.dcd.noise_interference",
                        FT_UINT8, BASE_HEX, NULL, 0x0, "", HFILL
                }
        },
         {
                &hf_dcd_tlv_t_35_paging_group_id,
                {
-                       "Paging Group ID", "wimax.dcd.paging_group_id", 
+                       "Paging Group ID", "wmx.dcd.paging_group_id",
                        FT_UINT16, BASE_HEX, NULL, 0x0, "", HFILL
                }
        },
        {
                &hf_dcd_tlv_t_36_tusc1_permutation_active_subchannels_bitmap,
                {
-                       "TUSC1 permutation active subchannels bitmap", "wimax.dcd.tusc1",
+                       "TUSC1 permutation active subchannels bitmap", "wmx.dcd.tusc1",
                        FT_UINT16, BASE_HEX, NULL, 0xFF80, "", HFILL
                }
        },
        {
                &hf_dcd_tlv_t_37_tusc2_permutation_active_subchannels_bitmap,
                {
-                       "TUSC2 permutation active subchannels bitmap", "wimax.dcd.tusc2",
+                       "TUSC2 permutation active subchannels bitmap", "wmx.dcd.tusc2",
                        FT_UINT16, BASE_HEX, NULL, 0xFFF8, "", HFILL
                }
        },
         {
                &hf_dcd_tlv_t_45_paging_interval_length,
                {
-                       "Paging Interval Length", "wimax.dcd.paging_interval_length", 
+                       "Paging Interval Length", "wmx.dcd.paging_interval_length",
                        FT_UINT8, BASE_DEC, NULL, 0x0, "", HFILL
                }
        },
         {
                &hf_dcd_tlv_t_19_permutation_type_for_broadcast_regions_in_harq_zone,
                {
-                       "Permutation Type for Broadcast Region in HARQ Zone", "wimax.dcd.permutation_type_broadcast_region_in_harq_zone", 
+                       "Permutation Type for Broadcast Region in HARQ Zone", "wmx.dcd.permutation_type_broadcast_region_in_harq_zone",
                        FT_UINT8, BASE_DEC, VALS(vals_dcd_permutation_type), 0x00, "", HFILL
                }
        },
        {
                &hf_dcd_phy_type,
                {
-                       "PHY Type", "wimax.dcd.phy_type",
+                       "PHY Type", "wmx.dcd.phy_type",
                        FT_UINT8, BASE_HEX, NULL, 0x00, "", HFILL
                }
        },
        {
                &hf_dcd_power_adjustment,
                {
-                       "Power Adjustment Rule", "wimax.dcd.power_adjustment",
+                       "Power Adjustment Rule", "wmx.dcd.power_adjustment",
                        FT_UINT8, BASE_HEX, VALS(vals_dcd_power_adjustmnt), 0x00, "", HFILL
                }
        },
@@ -753,7 +753,7 @@ static hf_register_info hf[] =
        {
                &hf_dcd_rss,
                {
-                       "RSS (IR, max)", "wimax.dcd.rss", 
+                       "RSS (IR, max)", "wmx.dcd.rss",
                        FT_INT16, BASE_DEC, NULL, 0x00, "", HFILL
                }
        },
@@ -761,7 +761,7 @@ static hf_register_info hf[] =
        {
                &hf_dcd_rtg,
                {
-                       "RTG", "wimax.dcd.rtg", 
+                       "RTG", "wmx.dcd.rtg",
                        FT_UINT8, BASE_HEX, NULL, 0x00, "", HFILL
                }
        },
@@ -769,7 +769,7 @@ static hf_register_info hf[] =
        {
                &hf_dcd_size_cqich_id,
                {
-                       "Size of CQICH-ID Field", "wimax.dcd.size_cqich_id", 
+                       "Size of CQICH-ID Field", "wmx.dcd.size_cqich_id",
                        FT_UINT8, BASE_DEC, VALS(vals_dcd_size_of_cqich_id), 0x00, "", HFILL
                }
        },
@@ -777,70 +777,70 @@ static hf_register_info hf[] =
        {
                &hf_dcd_channel_switch_frame_nr,
                {
-                       "Channel Switch Frame Number", "wimax.dcd.switch_frame", 
+                       "Channel Switch Frame Number", "wmx.dcd.switch_frame",
                        FT_UINT24, BASE_DEC, NULL, 0x00, "", HFILL
                }
        },
         {
                &hf_dcd_tlv_t_52_time_to_trigger_duration,
                {
-                       "Time to Trigger Duration", "wimax.dcd.time_trigger_duration", 
+                       "Time to Trigger Duration", "wmx.dcd.time_trigger_duration",
                        FT_UINT8, BASE_DEC, NULL, 0x0, "", HFILL
                }
        },
         {
                &hf_dcd_tlv_t_543_trigger_averaging_duration,
                {
-                       "Trigger Averaging Duration", "wimax.dcd.trigger_averaging_duration", 
+                       "Trigger Averaging Duration", "wmx.dcd.trigger_averaging_duration",
                        FT_UINT8, BASE_DEC, NULL, 0x0, "", HFILL
                }
        },
         {
                &hf_dcd_tlv_t_542_trigger_value,
                {
-                       "Trigger Value", "wimax.dcd.trigger_value", 
+                       "Trigger Value", "wmx.dcd.trigger_value",
                        FT_UINT8, BASE_DEC, NULL, 0x0, "", HFILL
                }
        },
        {
                &hf_dcd_ttg,
                {
-                       "TTG", "wimax.dcd.ttg", 
+                       "TTG", "wmx.dcd.ttg",
                        FT_UINT16, BASE_HEX, NULL, 0x00, "", HFILL
                }
        },
         {
                &hf_dcd_tlv_t_541_type_function_action,
                {
-                       "Type/Function/Action", "wimax.dcd.type_function_action", 
+                       "Type/Function/Action", "wmx.dcd.type_function_action",
                        FT_UINT8, BASE_HEX, NULL, 0x0, "", HFILL
                }
        },
         {
                &hf_dcd_tlv_t_541_action,
                {
-                       "Action", "wimax.dcd.type_function_action.action", 
+                       "Action", "wmx.dcd.type_function_action.action",
                        FT_UINT8, BASE_HEX, VALS(vals_dcd_action), 0x7, "", HFILL
                }
        },
         {
                &hf_dcd_tlv_t_541_function,
                {
-                       "Function", "wimax.dcd.type_function_action.function", 
+                       "Function", "wmx.dcd.type_function_action.function",
                        FT_UINT8, BASE_HEX, VALS(vals_dcd_function), 0x38, "", HFILL
                }
        },
         {
                &hf_dcd_tlv_t_541_type,
                {
-                       "Type", "wimax.dcd.type_function_action.type", 
+                       "Type", "wmx.dcd.type_function_action.type",
                        FT_UINT8, BASE_HEX, VALS(vals_dcd_type), 0xC0, "", HFILL
                }
        },
        {
                &hf_dcd_unknown_type,
                {
-                       "Unknown DCD Type", "wimax.dcd.unknown_tlv_value",
+                       "Unknown DCD Type", "wmx.dcd.unknown_tlv_value",
                        FT_BYTES, BASE_HEX, NULL, 0x0, "", HFILL
                }
        }
@@ -854,7 +854,7 @@ void proto_register_mac_mgmt_msg_dcd(void)
                proto_mac_mgmt_msg_dcd_decoder = proto_register_protocol (
                                                        "WiMax DCD/UCD Messages", /* name */
                                                        "WiMax DCD/UCD (cd)", /* short name */
-                                                       "cd" /* abbrev */
+                                                       "wmx.cd" /* abbrev */
                                                        );
 
                proto_register_field_array(proto_mac_mgmt_msg_dcd_decoder, hf, array_length(hf));
index 67d0413ffb1bda37c5e91b49bad1d94844acfbf1..c7d202739a1d5e1ba2dee301d4da9ab5fef536b3 100644 (file)
@@ -332,112 +332,112 @@ static hf_register_info hf[] =
     {
            &hf_dlmap_message_type,
            {
-                   "MAC Management Message Type", "wimax.macmgtmsgtype.dlmap", 
+                   "MAC Management Message Type", "wmx.macmgtmsgtype.dlmap",
                    FT_UINT8, BASE_DEC, NULL, 0x0, "", HFILL
            }
     },
     {
            &hf_dlmap_bsid,
            {
-                   "Base Station ID", "wimax.dlmap.bsid", 
+                   "Base Station ID", "wmx.dlmap.bsid",
                    FT_BYTES, BASE_HEX, NULL, 0x0, "", HFILL
            }
     },
     {
            &hf_dlmap_dcd,
            {
-                   "DCD Count", "wimax.dlmap.dcd", 
+                   "DCD Count", "wmx.dlmap.dcd",
                    FT_UINT8, BASE_DEC, NULL, 0x0, "", HFILL
            }
     },
     {
            &hf_dlmap_fch_expected,
            {
-                   "FCH Expected", "wimax.dlmap.fch_expected", 
+                   "FCH Expected", "wmx.dlmap.fch_expected",
                    FT_UINT16, BASE_DEC, NULL, 0x0, "", HFILL
            }
     },
     {
            &hf_dlmap_ie,
            {
-                   "DL-MAP IE", "wimax.dlmap.ie", 
+                   "DL-MAP IE", "wmx.dlmap.ie",
                    FT_UINT8, BASE_DEC, NULL, 0x0, "", HFILL
            }
     },
     {
            &hf_dlmap_ie_boosting,
            {
-                   "Boosting", "wimax.dlmap.ie.boosting", 
+                   "Boosting", "wmx.dlmap.ie.boosting",
                    FT_UINT32, BASE_DEC, VALS(boost_msgs), 0x00038000, "", HFILL
            }
     },
     {
            &hf_dlmap_ie_boosting2,
            {
-                   "Boosting", "wimax.dlmap.ie.boosting", 
+                   "Boosting", "wmx.dlmap.ie.boosting",
                    FT_UINT32, BASE_DEC, VALS(boost_msgs), 0x0000E000, "", HFILL
            }
     },
     {
            &hf_dlmap_ie_cid,
            {
-                   "CID", "wimax.dlmap.ie.cid", 
+                   "CID", "wmx.dlmap.ie.cid",
                    FT_UINT16, BASE_DEC, NULL, 0x0, "", HFILL
            }
     },
     {
            &hf_dlmap_ie_diuc,
            {
-                   "DIUC", "wimax.dlmap.ie.diuc", 
+                   "DIUC", "wmx.dlmap.ie.diuc",
                    FT_UINT8, BASE_DEC, NULL, 0x0, "", HFILL
            }
     },
     {
            &hf_dlmap_ie_ncid,
            {
-                   "N_CID", "wimax.dlmap.ie.ncid", 
+                   "N_CID", "wmx.dlmap.ie.ncid",
                    FT_UINT8, BASE_DEC, NULL, 0x0, "", HFILL
            }
     },
     {
            &hf_dlmap_ie_numsub,
            {
-                   "Number of Subchannels", "wimax.dlmap.ie.numsub", 
+                   "Number of Subchannels", "wmx.dlmap.ie.numsub",
                    FT_UINT32, BASE_DEC, NULL, 0x000000FC, "", HFILL
            }
     },
     {
            &hf_dlmap_ie_numsym,
            {
-                   "Number of OFDMA Symbols", "wimax.dlmap.ie.numsym", 
+                   "Number of OFDMA Symbols", "wmx.dlmap.ie.numsym",
                    FT_UINT32, BASE_DEC, NULL, 0x00007F00, "", HFILL
            }
     },
     {
            &hf_dlmap_ie_numsub2,
            {
-                   "Number of Subchannels", "wimax.dlmap.ie.numsub", 
+                   "Number of Subchannels", "wmx.dlmap.ie.numsub",
                    FT_UINT32, BASE_DEC, NULL, 0x000000FC, "", HFILL
            }
     },
     {
            &hf_dlmap_ie_numsym2,
            {
-                   "Number of OFDMA Symbols", "wimax.dlmap.ie.numsym", 
+                   "Number of OFDMA Symbols", "wmx.dlmap.ie.numsym",
                    FT_UINT32, BASE_DEC, NULL, 0x00001F00, "", HFILL
            }
     },
     {
            &hf_dlmap_ie_offsub,
            {
-                   "Subchannel Offset", "wimax.dlmap.ie.offsub", 
+                   "Subchannel Offset", "wmx.dlmap.ie.offsub",
                    FT_UINT32, BASE_DEC, NULL, 0x00FC0000, "", HFILL
            }
     },
     {
            &hf_dlmap_ie_offsym,
            {
-                   "OFDMA Symbol Offset", "wimax.dlmap.ie.offsym", 
+                   "OFDMA Symbol Offset", "wmx.dlmap.ie.offsym",
                    FT_UINT32, BASE_DEC, NULL, 0xFF000000, "", HFILL
            }
     },
@@ -445,168 +445,168 @@ static hf_register_info hf[] =
     {
            &hf_dlmap_ie_offsub2,
            {
-                   "Subchannel Offset", "wimax.dlmap.ie.offsub", 
+                   "Subchannel Offset", "wmx.dlmap.ie.offsub",
                    FT_UINT32, BASE_DEC, NULL, 0x00FF0000, "", HFILL
            }
     },
     {
            &hf_dlmap_ie_offsym2,
            {
-                   "OFDMA Symbol Offset", "wimax.dlmap.ie.offsym", 
+                   "OFDMA Symbol Offset", "wmx.dlmap.ie.offsym",
                    FT_UINT32, BASE_DEC, NULL, 0xFF000000, "", HFILL
            }
     },
     {
            &hf_dlmap_ie_rep,
            {
-                   "Repetition Coding Indication", "wimax.dlmap.ie.rep", 
+                   "Repetition Coding Indication", "wmx.dlmap.ie.rep",
                    FT_UINT32, BASE_DEC, VALS(rep_msgs), 0x00000003, "", HFILL
            }
     },
     {
            &hf_dlmap_ie_rep2,
            {
-                   "Repetition Coding Indication", "wimax.dlmap.ie.rep", 
+                   "Repetition Coding Indication", "wmx.dlmap.ie.rep",
                    FT_UINT32, BASE_DEC, VALS(rep_msgs), 0x00000003, "", HFILL
            }
     },
     {
            &hf_dlmap_ofdma_sym,
            {
-                   "Num OFDMA Symbols", "wimax.dlmap.ofdma_sym", 
+                   "Num OFDMA Symbols", "wmx.dlmap.ofdma_sym",
                    FT_UINT8, BASE_DEC, NULL, 0x0, "", HFILL
            }
     },
     {
            &hf_dlmap_phy_fdur,
            {
-                   "Frame Duration Code", "wimax.dlmap.phy_fdur", 
+                   "Frame Duration Code", "wmx.dlmap.phy_fdur",
                    FT_UINT8, BASE_HEX, NULL, 0x00, "", HFILL
            }
     },
     {
            &hf_dlmap_phy_fnum,
            {
-                   "Frame Number", "wimax.dlmap.phy_fnum", 
+                   "Frame Number", "wmx.dlmap.phy_fnum",
                    FT_UINT24, BASE_DEC, NULL, 0x0, "", HFILL
            }
     },
     {
            &hf_dlmapc_compr,
            {
-                   "Compressed map indicator", "wimax.dlmapc.compr", 
+                   "Compressed map indicator", "wmx.dlmapc.compr",
                    FT_UINT16, BASE_DEC, NULL, 0xe000, "", HFILL
            }
     },
     {
            &hf_dlmapc_count,
            {
-                   "DL IE Count", "wimax.dlmapc.count", 
+                   "DL IE Count", "wmx.dlmapc.count",
                    FT_UINT8, BASE_DEC, NULL, 0x0, "", HFILL
            }
     },
     {
            &hf_dlmapc_len,
            {
-                   "Map message length", "wimax.dlmapc.len", 
+                   "Map message length", "wmx.dlmapc.len",
                    FT_UINT16, BASE_DEC, NULL, 0x07FF, "", HFILL
            }
     },
     {
            &hf_dlmapc_opid,
            {
-                   "Operator ID", "wimax.dlmapc.opid", 
+                   "Operator ID", "wmx.dlmapc.opid",
                    FT_UINT8, BASE_DEC, NULL, 0x0, "", HFILL
            }
     },
     {
            &hf_dlmapc_rsv,
            {
-                   "Reserved", "wimax.dlmapc.rsv", 
+                   "Reserved", "wmx.dlmapc.rsv",
                    FT_UINT16, BASE_DEC, NULL, 0x0800, "", HFILL
            }
     },
     {
            &hf_dlmapc_secid,
            {
-                   "Sector ID", "wimax.dlmapc.secid", 
+                   "Sector ID", "wmx.dlmapc.secid",
                    FT_UINT8, BASE_DEC, NULL, 0x0, "", HFILL
            }
     },
     {
            &hf_dlmapc_sync,
            {
-                   "PHY Synchronization Field", "wimax.dlmapc.sync", 
+                   "PHY Synchronization Field", "wmx.dlmapc.sync",
                    FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL
            }
     },
     {
            &hf_dlmapc_ulmap,
            {
-                   "UL-MAP appended", "wimax.dlmapc.ulmap", 
+                   "UL-MAP appended", "wmx.dlmapc.ulmap",
                    FT_UINT16, BASE_DEC, NULL, 0x1000, "", HFILL
            }
     },
     {
            &hf_dlmap_xie_diuc,
            {
-                   "Extended DIUC", "wimax.dlmapc.xie_diuc", 
+                   "Extended DIUC", "wmx.dlmapc.xie_diuc",
                    FT_UINT8, BASE_DEC, NULL, 0x0, "", HFILL
            }
     },
     {
            &hf_dlmap_xie_len,
            {
-                   "Length", "wimax.dlmapc.xie_len", 
+                   "Length", "wmx.dlmapc.xie_len",
                    FT_UINT8, BASE_DEC, NULL, 0x0, "", HFILL
            }
     },
     {
            &hf_109x_cmi,
            {
-                   "SUB-DL-UL-MAP map indicator", "wimax.dlul.cmi", 
+                   "SUB-DL-UL-MAP map indicator", "wmx.dlul.cmi",
                    FT_UINT16, BASE_DEC, NULL, 0xE000, "", HFILL
            }
     },
     {
            &hf_109x_dl,
            {
-                   "DL HARQ ACK offset", "wimax.dlul.dl", 
+                   "DL HARQ ACK offset", "wmx.dlul.dl",
                    FT_UINT8, BASE_DEC, NULL, 0x0, "", HFILL
            }
     },
     {
            &hf_109x_dlie,
            {
-                   "DL IE Count", "wimax.dlul.dlie", 
+                   "DL IE Count", "wmx.dlul.dlie",
                    FT_UINT8, BASE_DEC, NULL, 0x0, "", HFILL
            }
     },
     {
            &hf_109x_haoi,
            {
-                   "HARQ ACK offset indicator", "wimax.dlul.haoi", 
+                   "HARQ ACK offset indicator", "wmx.dlul.haoi",
                    FT_UINT16, BASE_DEC, NULL, 0x0001, "", HFILL
            }
     },
     {
            &hf_109x_len,
            {
-                   "Map message length - The length is limited to 735 bytes at most", "wimax.dlul.len", 
+                   "Map message length - The length is limited to 735 bytes at most", "wmx.dlul.len",
                    FT_UINT16, BASE_DEC, NULL, 0x1FF8, "", HFILL
            }
     },
     {
            &hf_109x_rcid,
            {
-                   "RCID_Type", "wimax.dlul.rcid", 
+                   "RCID_Type", "wmx.dlul.rcid",
                    FT_UINT16, BASE_DEC, NULL, 0x0006, "", HFILL
            }
     },
     {
            &hf_109x_subofs,
            {
-                   "Subchannel offset", "wimax.dlul.subofs", 
+                   "Subchannel offset", "wmx.dlul.subofs",
                    FT_UINT8, BASE_DEC, NULL, 0xFE, "", HFILL
            }
     },
@@ -615,63 +615,63 @@ static hf_register_info hf[] =
            {
                    "OFDMA Symbol offset of subsequent sub-bursts "
                    "in this Sub-DL-UL-MAP message with reference to "
-                   "the start of UL sub-frame.", "wimax.dlul.symofs", 
+                   "the start of UL sub-frame.", "wmx.dlul.symofs",
                    FT_UINT8, BASE_DEC, NULL, 0x0, "", HFILL
            }
     },
     {
            &hf_109x_rsv,
            {
-                   "Reserved", "wimax.dlul.rsv", 
+                   "Reserved", "wmx.dlul.rsv",
                    FT_UINT8, BASE_DEC, NULL, 0x01, "", HFILL
            }
     },
     {
            &hf_109x_ul,
            {
-                   "UL HARQ ACK offset", "wimax.dlul.ul", 
+                   "UL HARQ ACK offset", "wmx.dlul.ul",
                    FT_UINT8, BASE_DEC, NULL, 0x0, "", HFILL
            }
     },
     {
            &hf_308a_cmi,
            {
-                   "Compressed map indicator", "wimax.dlmap.reduced_aas_private.cmi", 
+                   "Compressed map indicator", "wmx.dlmap.reduced_aas_private.cmi",
                    FT_UINT8, BASE_DEC, NULL, 0xe0, "", HFILL
            }
     },
     {
            &hf_308a_mult,
            {
-                   "Multiple IE", "wimax.dlmap.reduced_aas_private.mult", 
+                   "Multiple IE", "wmx.dlmap.reduced_aas_private.mult",
                    FT_UINT8, BASE_DEC, NULL, 0x02, "", HFILL
            }
     },
     {
            &hf_308a_rsv,
            {
-                   "Reserved", "wimax.dlmap.reduced_aas_private.rsv", 
+                   "Reserved", "wmx.dlmap.reduced_aas_private.rsv",
                    FT_UINT8, BASE_DEC, NULL, 0x01, "", HFILL
            }
     },
     {
            &hf_308a_type,
            {
-                   "Compressed Map Type", "wimax.dlmap.reduced_aas_private.type", 
+                   "Compressed Map Type", "wmx.dlmap.reduced_aas_private.type",
                    FT_UINT8, BASE_DEC, NULL, 0x0d, "", HFILL
            }
     },
     {
            &hf_308a_ulmap,
            {
-                   "UL-MAP appended", "wimax.dlmap.reduced_aas_private.ulmap", 
+                   "UL-MAP appended", "wmx.dlmap.reduced_aas_private.ulmap",
                    FT_UINT8, BASE_DEC, NULL, 0x10, "", HFILL
            }
     },
     {
            &hf_mac_header_compress_dlmap_crc,
            {
-                   "CRC", "wimax.compress_dlmap_crc", 
+                   "CRC", "wmx.compress_dlmap_crc",
                    FT_UINT32, BASE_HEX, NULL, 0x0, "", HFILL
            }
     }
@@ -1004,7 +1004,7 @@ gint DL_HARQ_IR_CC_sub_burst_IE(proto_tree *diuc_tree, const guint8 *bufptr, gin
            XBIT(data, 2, "Repetition Coding Indication");
            XBIT(data, 2, "Reserved");
         }
-       
+
        XBIT(data, 4, "ACID");
        XBIT(data, 1, "AI_SN");
        XBIT(data, 2, "SPID");
@@ -1636,7 +1636,7 @@ gint Closed_loop_MIMO_DL_Enhanced_IE(proto_tree *diuc_tree, const guint8 *bufptr
     gint data;
     proto_item *ti = NULL;
     proto_tree *tree = NULL;
-    
+
     nib = offset;
 
     ti = proto_tree_add_text(diuc_tree, tvb, NIBHI(offset, length), "CL_MIMO_DL_Enhanced_IE");
@@ -1801,7 +1801,7 @@ gint STC_Zone_IE(proto_tree *diuc_tree, const guint8 *bufptr, gint offset, gint
     gint data;
     proto_item *ti = NULL;
     proto_tree *tree = NULL;
-    
+
     bit = NIB_TO_BIT(offset);
 
     ti = proto_tree_add_text(diuc_tree, tvb, NIBHI(offset, length), "STC_Zone_IE");
@@ -1809,7 +1809,7 @@ gint STC_Zone_IE(proto_tree *diuc_tree, const guint8 *bufptr, gint offset, gint
 
     XBIT(data,  4, "Extended DIUC");
     XBIT(data,  4, "Length");
-    
+
     XBIT(data, 8, "OFDMA Symbol Offset");
     XBIT(data, 2, "Permutations");
     XBIT(data, 1, "Use All SC indicator");
@@ -1844,7 +1844,7 @@ gint AAS_DL_IE(proto_tree *diuc_tree, const guint8 *bufptr, gint offset, gint le
 
     XBIT(data,  4, "Extended DIUC");
     XBIT(data,  4, "Length");
-    
+
     XBIT(data, 8, "OFDMA Symbol Offset");
     XBIT(data, 3, "Permutation");
     XBIT(data, 6, "DL_PermBase");
@@ -1866,7 +1866,7 @@ gint Data_location_in_another_BS_IE(proto_tree *diuc_tree, const guint8 *bufptr,
     gint data;
     proto_item *ti = NULL;
     proto_tree *tree = NULL;
-    
+
     bit = NIB_TO_BIT(offset);
 
     ti = proto_tree_add_text(diuc_tree, tvb, NIBHI(offset, length), "Data location in another BS IE");
@@ -1874,7 +1874,7 @@ gint Data_location_in_another_BS_IE(proto_tree *diuc_tree, const guint8 *bufptr,
 
     XBIT(data,  4, "Extended DIUC");
     XBIT(data,  4, "Length");
-    
+
     XBIT(data, 2, "Segment");
     XBIT(data, 6, "Used subchannels");
     XBIT(data, 4, "DIUC");
@@ -2058,7 +2058,7 @@ gint Broadcast_Control_Pointer_IE(proto_tree *diuc_tree, const guint8 *bufptr, g
 
     XBIT(data,  4, "Extended DIUC");
     XBIT(data,  4, "Length");
-    
+
     XBIT(data,  7, "DCD_UCD Transmission Frame");
     XBIT(skip,  1, "Skip Broadcast_System_Update");
     if (skip == 0) {
@@ -2118,7 +2118,7 @@ gint PUSC_ASCA_Alloc_IE(proto_tree *diuc_tree, const guint8 *bufptr, gint offset
 
     ti = proto_tree_add_text(diuc_tree, tvb, NIBHI(offset, length), "PUSC_ASCA_Alloc_IE");
     tree = proto_item_add_subtree(ti, ett_286z);
-    
+
     XBIT(data,  4, "Extended DIUC");
     XBIT(data,  4, "Length");
     XBIT(data,  4, "DIUC");
@@ -2179,7 +2179,7 @@ gint UL_interference_and_noise_level_IE(proto_tree *diuc_tree, const guint8 *buf
     if (bitmap & 0x80) {
        XNIB(data, 2, "MIMO region NI");
     }
-    
+
     return nib;
 }
 
@@ -2197,7 +2197,7 @@ void proto_register_mac_mgmt_msg_dlmap(void)
        proto_mac_mgmt_msg_dlmap_decoder = proto_register_protocol (
                                                "WiMax DLMAP/ULMAP Messages", /* name */
                                                "WiMax DLMAP/ULMAP (map)", /* short name */
-                                               "map" /* abbrev */
+                                               "wmx.map" /* abbrev */
                                                );
 
        proto_register_field_array(proto_mac_mgmt_msg_dlmap_decoder, hf, array_length(hf));
@@ -2381,7 +2381,7 @@ gint dissect_dlmap_ie(proto_tree *ie_tree, const guint8 *bufptr, gint offset, gi
         data = 0;
         papr = 0;
         ie_len = 9;
-        
+
         /* TODO: alt_format = 1 if (Permutation == 0x11) and (AMC type is 2x3 or 1x6) */
 
         /* precalculate IE len for correct highlighting */
index c6c6484febd8114a96fa3df22fa709aebff14ba5..af1cff7e105a004bbf20b02ae616db849dbb5c8f 100644 (file)
@@ -152,175 +152,175 @@ static hf_register_info hf[] =
        {
                &hf_dreg_consider_paging_pref,
                {
-                       "Consider Paging Preference of each Service Flow in resource retention", "wimax.dreg.consider_paging_preference",
+                       "Consider Paging Preference of each Service Flow in resource retention", "wmx.dreg.consider_paging_preference",
                        FT_UINT8, BASE_DEC, NULL, 0x80, "", HFILL
                }
        },
        {
                &hf_dreg_invalid_tlv,
                {
-                       "Invalid TLV", "wimax.dreg.invalid_tlv", 
+                       "Invalid TLV", "wmx.dreg.invalid_tlv",
                        FT_BYTES, BASE_HEX, NULL, 0, "", HFILL
                }
        },
        {
                &hf_mac_hash_skip_threshold,
                {
-                       "MAC Hash Skip Threshold", "wimax.dreg.mac_hash_skip_threshold",
+                       "MAC Hash Skip Threshold", "wmx.dreg.mac_hash_skip_threshold",
                        FT_UINT16, BASE_DEC, NULL, 0x0, "", HFILL
                }
        },
        {
                &hf_paging_controller_id,
                {
-                       "Paging Controller ID", "wimax.dreg.paging_controller_id",
+                       "Paging Controller ID", "wmx.dreg.paging_controller_id",
                        FT_ETHER, BASE_DEC, NULL, 0x0, "", HFILL
                }
        },
        {
                &hf_dreg_paging_cycle,
                {
-                       "PAGING CYCLE", "wimax.dreg.paging_cycle",
+                       "PAGING CYCLE", "wmx.dreg.paging_cycle",
                        FT_UINT16, BASE_DEC, NULL, 0x0, "", HFILL
                }
        },
        {
                &hf_dreg_paging_cycle_request,
                {
-                       "Paging Cycle Request", "wimax.dreg.paging_cycle_request",
+                       "Paging Cycle Request", "wmx.dreg.paging_cycle_request",
                        FT_UINT16, BASE_DEC, NULL, 0x0, "", HFILL
                }
        },
        {
                &hf_dreg_paging_group_id,
                {
-                       "Paging-group-ID", "wimax.dreg.paging_group_id",
+                       "Paging-group-ID", "wmx.dreg.paging_group_id",
                        FT_UINT16, BASE_DEC, NULL, 0x0, "", HFILL
                }
        },
        {
                &hf_dreg_paging_offset,
                {
-                       "PAGING OFFSET", "wimax.dreg.paging_offset",
+                       "PAGING OFFSET", "wmx.dreg.paging_offset",
                        FT_UINT8, BASE_DEC, NULL, 0x0, "", HFILL
                }
        },
        {
                &hf_dreg_req_duration,
                {
-                       "REQ-duration (Waiting value for the DREG-REQ message re-transmission in frames)", "wimax.dreg.req_duration",
+                       "REQ-duration (Waiting value for the DREG-REQ message re-transmission in frames)", "wmx.dreg.req_duration",
                        FT_UINT8, BASE_DEC, NULL, 0x0, "", HFILL
                }
        },
        {
                &hf_dreg_retain_ms_service_full_service,
                {
-                       "Retain MS service and operation information associated with Full service", "wimax.dreg.retain_ms_full_service",
+                       "Retain MS service and operation information associated with Full service", "wmx.dreg.retain_ms_full_service",
                        FT_UINT8, BASE_DEC, NULL, 0x40, "", HFILL
                }
        },
        {
                &hf_dreg_retain_ms_service_network_address,
                {
-                       "Retain MS service and operational information associated with Network Address", "wimax.dreg.retain_ms_service_network_address",
+                       "Retain MS service and operational information associated with Network Address", "wmx.dreg.retain_ms_service_network_address",
                        FT_UINT8, BASE_DEC, NULL, 0x08, "", HFILL
                }
        },
        {
                &hf_dreg_retain_ms_service_pkm,
                {
-                       "Retain MS service and operational information associated with PKM-REQ/RSP", "wimax.dreg.retain_ms_service_pkm",
+                       "Retain MS service and operational information associated with PKM-REQ/RSP", "wmx.dreg.retain_ms_service_pkm",
                        FT_UINT8, BASE_DEC, NULL, 0x02, "", HFILL
                }
        },
        {
                &hf_dreg_retain_ms_service_reg,
                {
-                       "Retain MS service and operational information associated with REG-REQ/RSP", "wimax.dreg.retain_ms_service_reg",
+                       "Retain MS service and operational information associated with REG-REQ/RSP", "wmx.dreg.retain_ms_service_reg",
                        FT_UINT8, BASE_DEC, NULL, 0x04, "", HFILL
                }
        },
        {
                &hf_dreg_retain_ms_service_sbc,
                {
-                       "Retain MS service and operational information associated with SBC-REQ/RSP", "wimax.dreg.retain_ms_service_sbc",
+                       "Retain MS service and operational information associated with SBC-REQ/RSP", "wmx.dreg.retain_ms_service_sbc",
                        FT_UINT8, BASE_DEC, NULL, 0x01, "", HFILL
                }
        },
        {
                &hf_dreg_retain_ms_service_tftp,
                {
-                       "Retain MS service and operational information associated with TFTP messages", "wimax.dreg.retain_ms_service_tftp",
+                       "Retain MS service and operational information associated with TFTP messages", "wmx.dreg.retain_ms_service_tftp",
                        FT_UINT8, BASE_DEC, NULL, 0x20, "", HFILL
                }
        },
        {
                &hf_dreg_retain_ms_service_tod,
                {
-                       "Retain MS service and operational information associated with Time of Day", "wimax.dreg.retain_ms_service_tod",
+                       "Retain MS service and operational information associated with Time of Day", "wmx.dreg.retain_ms_service_tod",
                        FT_UINT8, BASE_DEC, NULL, 0x10, "", HFILL
                }
        },
        {
                &hf_dreg_cmd_message_type,
                {
-                       "MAC Management Message Type", "wimax.macmgtmsgtype.dreg_cmd",
+                       "MAC Management Message Type", "wmx.macmgtmsgtype.dreg_cmd",
                        FT_UINT8, BASE_DEC, NULL, 0x0, "", HFILL
                }
        },
        {
                &hf_dreg_cmd_action,
                {
-                       "DREG-CMD Action code", "wimax.dreg_cmd.action",
+                       "DREG-CMD Action code", "wmx.dreg_cmd.action",
                        FT_UINT8, BASE_DEC, VALS(vals_dreg_cmd_action), 0x07, "", HFILL
                }
        },
        {
                &hf_dreg_cmd_action_cor2,
                {
-                       "DREG-CMD Action code", "wimax.dreg_cmd.action",
+                       "DREG-CMD Action code", "wmx.dreg_cmd.action",
                        FT_UINT8, BASE_DEC, VALS(vals_dreg_cmd_action_cor2), 0x07, "", HFILL
                }
        },
        {
                &hf_dreg_cmd_reserved,
                {
-                       "Reserved", "wimax.dreg_cmd.action_reserved",
+                       "Reserved", "wmx.dreg_cmd.action_reserved",
                        FT_UINT8, BASE_DEC, NULL, 0xF8, "", HFILL
                }
        },
        {
                &hf_dreg_req_message_type,
                {
-                       "MAC Management Message Type", "wimax.macmgtmsgtype.dreg_req",
+                       "MAC Management Message Type", "wmx.macmgtmsgtype.dreg_req",
                        FT_UINT8, BASE_DEC, NULL, 0x0, "", HFILL
                }
        },
        {
                &hf_dreg_req_action,
                {
-                       "DREG-REQ Action code", "wimax.dreg_req.action",
+                       "DREG-REQ Action code", "wmx.dreg_req.action",
                        FT_UINT8, BASE_DEC, VALS(vals_dreg_req_code), 0x03, "", HFILL
                }
        },
        {
                &hf_dreg_req_reserved,
                {
-                       "Reserved", "wimax.dreg_req.action_reserved",
+                       "Reserved", "wmx.dreg_req.action_reserved",
                        FT_UINT8, BASE_DEC, NULL, 0xFC, "", HFILL
                }
        },
        {
                &hf_tlv_value,
                {
-                       "Value", "wimax.dreg.unknown_tlv_value", 
+                       "Value", "wmx.dreg.unknown_tlv_value",
                        FT_BYTES, BASE_NONE, NULL, 0x00, "", HFILL
                }
        },
        {
                &hf_ack_type_reserved,
                {
-                       "Reserved", "wimax.ack_type_reserved", 
+                       "Reserved", "wmx.ack_type_reserved",
                        FT_UINT8, BASE_DEC, NULL, 0x03, "", HFILL
                }
        }
@@ -377,7 +377,7 @@ void proto_register_mac_mgmt_msg_dreg_req(void)
                proto_mac_mgmt_msg_dreg_req_decoder = proto_register_protocol (
                                                        "WiMax DREG-REQ/CMD Messages", /* name */
                                                        "WiMax DREG-REQ/CMD (dreg)", /* short name */
-                                                       "dreg" /* abbrev */
+                                                       "wmx.dreg" /* abbrev */
                                                        );
 
                proto_register_field_array(proto_mac_mgmt_msg_dreg_req_decoder, hf, array_length(hf));
index 280b1871847095c98e905c797b2e476d9d188313..da782ff6766a6271feb6afb6f17eef8947277762 100644 (file)
@@ -83,35 +83,35 @@ static hf_register_info hf[] =
        {
                &hf_dsa_ack_message_type,
                {
-                       "MAC Management Message Type", "wimax.macmgtmsgtype.dsa_ack",
+                       "MAC Management Message Type", "wmx.macmgtmsgtype.dsa_ack",
                        FT_UINT8, BASE_DEC, NULL, 0x0, "", HFILL
                }
        },
        {
                &hf_dsa_req_message_type,
                {
-                       "MAC Management Message Type", "wimax.macmgtmsgtype.dsa_req",
+                       "MAC Management Message Type", "wmx.macmgtmsgtype.dsa_req",
                        FT_UINT8, BASE_DEC, NULL, 0x0, "", HFILL
                }
        },
        {
                &hf_dsa_rsp_message_type,
                {
-                       "MAC Management Message Type", "wimax.macmgtmsgtype.dsa_rsp",
+                       "MAC Management Message Type", "wmx.macmgtmsgtype.dsa_rsp",
                        FT_UINT8, BASE_DEC, NULL, 0x0, "", HFILL
                }
        },
        {
                &hf_dsa_confirmation_code,
-               { 
-                       "Confirmation code", "wimax.dsa.confirmation_code", 
+               {
+                       "Confirmation code", "wmx.dsa.confirmation_code",
                        FT_UINT8, BASE_HEX, NULL, 0x0, "", HFILL
                }
        },
        {
                &hf_dsa_transaction_id,
-               { 
-                       "Transaction ID", "wimax.dsa.transaction_id", 
+               {
+                       "Transaction ID", "wmx.dsa.transaction_id",
                        FT_UINT16, BASE_HEX, NULL, 0x0, "", HFILL
                }
        }
@@ -125,7 +125,7 @@ void proto_register_mac_mgmt_msg_dsa(void)
                proto_mac_mgmt_msg_dsa_decoder = proto_register_protocol (
                                                        "WiMax DSA/C/D Messages", /* name */
                                                        "WiMax DSA/C/D (ds)", /* short name */
-                                                       "ds" /* abbrev */
+                                                       "wmx.ds" /* abbrev */
                                                        );
 
                proto_register_field_array(proto_mac_mgmt_msg_dsa_decoder, hf, array_length(hf));
index 0723030609b0c4330ec24a9b3670a47027960c35..2bd82553472986c300ebc9d8af58628f110cb7bd 100644 (file)
@@ -83,35 +83,35 @@ static hf_register_info hf[] =
        {
                &hf_dsc_ack_message_type,
                {
-                       "MAC Management Message Type", "wimax.macmgtmsgtype.dsc_ack",
+                       "MAC Management Message Type", "wmx.macmgtmsgtype.dsc_ack",
                        FT_UINT8, BASE_DEC, NULL, 0x0, "", HFILL
                }
        },
        {
                &hf_dsc_req_message_type,
                {
-                       "MAC Management Message Type", "wimax.macmgtmsgtype.dsc_req",
+                       "MAC Management Message Type", "wmx.macmgtmsgtype.dsc_req",
                        FT_UINT8, BASE_DEC, NULL, 0x0, "", HFILL
                }
        },
        {
                &hf_dsc_rsp_message_type,
                {
-                       "MAC Management Message Type", "wimax.macmgtmsgtype.dsc_rsp",
+                       "MAC Management Message Type", "wmx.macmgtmsgtype.dsc_rsp",
                        FT_UINT8, BASE_DEC, NULL, 0x0, "", HFILL
                }
        },
        {
                &hf_dsc_confirmation_code,
                {
-                       "Confirmation code", "wimax.dsc.confirmation_code",
+                       "Confirmation code", "wmx.dsc.confirmation_code",
                        FT_UINT8, BASE_DEC, NULL, 0x0, "", HFILL
                }
        },
        {
                &hf_dsc_transaction_id,
                {
-                       "Transaction ID", "wimax.dsc.transaction_id",
+                       "Transaction ID", "wmx.dsc.transaction_id",
                        FT_UINT16, BASE_DEC, NULL, 0x0, "", HFILL
                }
        }
index 1bc2ace73c5cec905e4a0554f9da96f1defc4b46..c38f1e78e470444f50153905774d18c436abd4c8 100644 (file)
@@ -89,35 +89,35 @@ static hf_register_info hf[] =
        {
                &hf_dsd_req_message_type,
                {
-                       "MAC Management Message Type", "wimax.macmgtmsgtype.dsd_req", 
+                       "MAC Management Message Type", "wmx.macmgtmsgtype.dsd_req", 
                        FT_UINT8, BASE_DEC, NULL, 0x0, "", HFILL
                }
        },
        {
                &hf_dsd_rsp_message_type,
                {
-                       "MAC Management Message Type", "wimax.macmgtmsgtype.dsd_rsp", 
+                       "MAC Management Message Type", "wmx.macmgtmsgtype.dsd_rsp", 
                        FT_BYTES, BASE_HEX, NULL, 0, "", HFILL
                }
        },
        {
                &hf_dsd_confirmation_code,
                {
-                       "Confirmation code", "wimax.dsd.confirmation_code", 
+                       "Confirmation code", "wmx.dsd.confirmation_code", 
                        FT_UINT8, BASE_HEX, NULL, 0x0, "", HFILL
                }
        },
        {
                &hf_dsd_service_flow_id,
                {
-                       "Service Flow ID", "wimax.dsd.service_flow_id", 
+                       "Service Flow ID", "wmx.dsd.service_flow_id", 
                        FT_UINT32, BASE_HEX, NULL, 0x0, "", HFILL
                }
        },
        {
                &hf_dsd_transaction_id,
                {
-                       "Transaction ID", "wimax.dsd.transaction_id", 
+                       "Transaction ID", "wmx.dsd.transaction_id", 
                        FT_UINT16, BASE_HEX, NULL, 0x0, "", HFILL
                }
        }
index a61cc901000a909f901d1427c528c9cdbf945cf6..d2f76428f089145fc157a97d60587979b4558fbc 100644 (file)
@@ -58,15 +58,15 @@ static hf_register_info hf_dsx_rvd[] =
 {
        {
                &hf_dsx_rvd_message_type,
-               {"MAC Management Message Type", "wimax.macmgtmsgtype.dsx_rvd", FT_UINT8, BASE_DEC, NULL, 0x0, "", HFILL}
+               {"MAC Management Message Type", "wmx.macmgtmsgtype.dsx_rvd", FT_UINT8, BASE_DEC, NULL, 0x0, "", HFILL}
        },
        {
                &hf_dsx_rvd_confirmation_code,
-               { "Confirmation code", "wimax.dsx_rvd.confirmation_code", FT_UINT8, BASE_HEX, NULL, 0x0, "", HFILL}
+               { "Confirmation code", "wmx.dsx_rvd.confirmation_code", FT_UINT8, BASE_HEX, NULL, 0x0, "", HFILL}
        },
        {
                &hf_dsx_rvd_transaction_id,
-               { "Transaction ID", "wimax.dsx_rvd.transaction_id", FT_UINT16, BASE_HEX, NULL, 0x0, "", HFILL}
+               { "Transaction ID", "wmx.dsx_rvd.transaction_id", FT_UINT16, BASE_HEX, NULL, 0x0, "", HFILL}
        }
 };
 
@@ -78,7 +78,7 @@ void proto_register_mac_mgmt_msg_dsx_rvd(void)
                proto_mac_mgmt_msg_dsx_rvd_decoder = proto_register_protocol (
                                                        "WiMax DSX-RVD Message", /* name */
                                                        "WiMax DSX-RVD (dsx)", /* short name */
-                                                       "dsx" /* abbrev */
+                                                       "wmx.dsx" /* abbrev */
                                                        );
 
                proto_register_field_array(proto_mac_mgmt_msg_dsx_rvd_decoder, hf_dsx_rvd, array_length(hf_dsx_rvd));
index 46d888aa10d883e4e1c81746c6e01a6ec3f8af76..06b9b5fc7476ca97c0caa5a7f4320fa26c59a116 100644 (file)
@@ -70,7 +70,7 @@ static hf_register_info hf[] =
        {
                &hf_fpc_message_type,
                {
-                       "MAC Management Message Type", "wimax.macmgtmsgtype.fpc",
+                       "MAC Management Message Type", "wmx.macmgtmsgtype.fpc",
                        FT_UINT8, BASE_DEC, NULL, 0x0,
                        "", HFILL
                }
@@ -78,35 +78,35 @@ static hf_register_info hf[] =
        {
                &hf_fpc_basic_cid,
                {
-                       "Basic CID", "wimax.fpc.basic_cid",
+                       "Basic CID", "wmx.fpc.basic_cid",
                        FT_UINT16, BASE_DEC, NULL, 0x0, "", HFILL
                }
        },
        {
                &hf_fpc_invalid_tlv,
                {
-                       "Invalid TLV", "wimax.fpc.invalid_tlv", 
+                       "Invalid TLV", "wmx.fpc.invalid_tlv",
                        FT_BYTES, BASE_HEX, NULL, 0, "", HFILL
                }
        },
        {
                &hf_fpc_number_of_stations,
                {
-                       "Number of stations", "wimax.fpc.number_stations",
+                       "Number of stations", "wmx.fpc.number_stations",
                        FT_UINT8, BASE_DEC, NULL, 0x0, "", HFILL
                }
        },
        {
                &hf_fpc_power_adjust,
                {
-                       "Power Adjust.  Signed change in power level (incr of 0.25dB) that the SS shall apply to its current power setting", "wimax.fpc.power_adjust",
+                       "Power Adjust.  Signed change in power level (incr of 0.25dB) that the SS shall apply to its current power setting", "wmx.fpc.power_adjust",
                        FT_FLOAT, BASE_DEC, NULL, 0x0, "", HFILL
                }
        },
        {
                &hf_fpc_power_measurement_frame,
                {
-                       "Power measurement frame.  The 8 LSB of the frame number in which the BS measured the power corrections referred to in the message", "wimax.fpc.power_measurement_frame",
+                       "Power measurement frame.  The 8 LSB of the frame number in which the BS measured the power corrections referred to in the message", "wmx.fpc.power_measurement_frame",
                        FT_INT8, BASE_DEC, NULL, 0x0, "", HFILL
                }
        }
@@ -120,7 +120,7 @@ void proto_register_mac_mgmt_msg_fpc(void)
                proto_mac_mgmt_msg_fpc_decoder = proto_register_protocol (
                                                        "WiMax FPC Message", /* name */
                                                        "WiMax FPC (fpc)", /* short name */
-                                                       "fpc" /* abbrev */
+                                                       "wmx.fpc" /* abbrev */
                                                        );
 
                proto_register_field_array(proto_mac_mgmt_msg_fpc_decoder, hf, array_length(hf));
@@ -161,7 +161,7 @@ void dissect_mac_mgmt_msg_fpc_decoder(tvbuff_t *tvb, packet_info *pinfo _U_, pro
                offset ++;
                /* display the Number of stations */
                proto_tree_add_item(fpc_tree, hf_fpc_number_of_stations, tvb, offset, 1, FALSE);
-               
+
                number_stations = tvb_get_guint8(tvb, offset);
                offset++;
                for (i = 0; i < number_stations; i++ ) {
index 25138a429d4f2a4fdd7d36463cafd185b36c76a6..3995fe968c99a49e131954fb0ef5de1ca92ec46e 100644 (file)
@@ -105,19 +105,19 @@ static hf_register_info hf_pkm[] =
 {
        {
                &hf_pkm_msg_code,
-               {"Code", "wimax.pkm.msg_code",FT_UINT8, BASE_DEC, VALS(vals_pkm_msg_code),0x0, "", HFILL}
+               {"Code", "wmx.pkm.msg_code",FT_UINT8, BASE_DEC, VALS(vals_pkm_msg_code),0x0, "", HFILL}
        },
        {
                &hf_pkm_msg_pkm_id,
-               {"PKM Identifier", "wimax.pkm.msg_pkm_identifier",FT_UINT8, BASE_DEC, NULL, 0x0, "", HFILL}
+               {"PKM Identifier", "wmx.pkm.msg_pkm_identifier",FT_UINT8, BASE_DEC, NULL, 0x0, "", HFILL}
        },
        {
                &hf_pkm_req_message_type,
-               {"MAC Management Message Type", "wimax.macmgtmsgtype.pkm_req", FT_UINT8, BASE_DEC, NULL, 0x0, "", HFILL}
+               {"MAC Management Message Type", "wmx.macmgtmsgtype.pkm_req", FT_UINT8, BASE_DEC, NULL, 0x0, "", HFILL}
        },
        {
                &hf_pkm_rsp_message_type,
-               {"MAC Management Message Type", "wimax.macmgtmsgtype.pkm_rsp", FT_UINT8, BASE_DEC, NULL, 0x0, "", HFILL}
+               {"MAC Management Message Type", "wmx.macmgtmsgtype.pkm_rsp", FT_UINT8, BASE_DEC, NULL, 0x0, "", HFILL}
        }
 };
 
@@ -129,7 +129,7 @@ void proto_register_mac_mgmt_msg_pkm(void)
                proto_mac_mgmt_msg_pkm_decoder = proto_register_protocol (
                                                        "WiMax PKM-REQ/RSP Messages", /* name */
                                                        "WiMax PKM-REQ/RSP (pkm)", /* short name */
-                                                       "pkm" /* abbrev */
+                                                       "wmx.pkm" /* abbrev */
                                                        );
 
                proto_register_field_array(proto_mac_mgmt_msg_pkm_decoder, hf_pkm, array_length(hf_pkm));
index 31fa62cdf7a51298979169b85a2fadf382b72332..2a5b061101a953724494b6112fcd7c61905d568c 100644 (file)
@@ -101,70 +101,70 @@ static hf_register_info hf[] =
        {
                &hf_pmc_req_message_type,
                {
-                       "MAC Management Message Type", "wimax.macmgtmsgtype.pmc_req",
+                       "MAC Management Message Type", "wmx.macmgtmsgtype.pmc_req",
                        FT_UINT8, BASE_DEC, NULL, 0x0, "", HFILL
                }
        },
        {
                &hf_pmc_req_confirmation,
                {
-                       "Confirmation", "wimax.pmc_req.confirmation",
+                       "Confirmation", "wmx.pmc_req.confirmation",
                        FT_UINT16, BASE_DEC, VALS(vals_pmc_req_confirmation), 0x0020, "", HFILL
                }
        },
        {
                &hf_pmc_req_pwr_control_mode_change,
                {
-                       "Power control mode change", "wimax.pmc_req.power_control_mode",
+                       "Power control mode change", "wmx.pmc_req.power_control_mode",
                        FT_UINT16, BASE_DEC, VALS(vals_pmc_req_pwr), 0xC000, "", HFILL
                }
        },
        {
                &hf_pmc_req_pwr_control_mode_change_cor2,
                {
-                       "Power control mode change", "wimax.pmc_req.power_control_mode",
+                       "Power control mode change", "wmx.pmc_req.power_control_mode",
                        FT_UINT16, BASE_DEC, VALS(vals_pmc_req_pwr_cor2), 0xC000, "", HFILL
                }
        },
        {
                &hf_pmc_req_reserved,
                {
-                       "Reserved", "wimax.pmc_req.reserved",
+                       "Reserved", "wmx.pmc_req.reserved",
                        FT_UINT16, BASE_DEC, NULL, 0x001F, "", HFILL
                }
        },
        {
                &hf_pmc_req_tx_power_level,
                {
-                       "UL Tx power level for the burst that carries this header (11.1.1). When the Tx power is different from slot to slot, the maximum value is reported", "wimax.pmc_req.ul_tx_power_level",
+                       "UL Tx power level for the burst that carries this header (11.1.1). When the Tx power is different from slot to slot, the maximum value is reported", "wmx.pmc_req.ul_tx_power_level",
                        FT_UINT16, BASE_DEC, NULL, 0x3FC0, "", HFILL
                }
        },
        {
                &hf_pmc_rsp_message_type,
                {
-                       "MAC Management Message Type", "wimax.macmgtmsgtype.pmc_rsp",
+                       "MAC Management Message Type", "wmx.macmgtmsgtype.pmc_rsp",
                        FT_UINT8, BASE_DEC, NULL, 0x0, "", HFILL
                }
        },
        {
                &hf_pmc_rsp_offset_BS_per_MS,
                {
-                       "Offset_BS per MS.  Signed change in power level (incr of 0.25 dB) that the MS shall apply to the open loop power control formula in 8.4.10.3.2", "wimax.pmc_rsp.offset_BS_per_MS",
+                       "Offset_BS per MS.  Signed change in power level (incr of 0.25 dB) that the MS shall apply to the open loop power control formula in 8.4.10.3.2", "wmx.pmc_rsp.offset_BS_per_MS",
                        FT_FLOAT, BASE_DEC, NULL, 0x0, "", HFILL
                }
        },
        {
                &hf_pmc_rsp_power_adjust,
                {
-                       "Power adjust.  Signed change in power level (incr of 0.25 dB) the MS shall apply to its current transmission power. When subchannelization is employed, the SS shall interpret as a required change to the Tx power density", "wimax.pmc_rsp.power_adjust",
+                       "Power adjust.  Signed change in power level (incr of 0.25 dB) the MS shall apply to its current transmission power. When subchannelization is employed, the SS shall interpret as a required change to the Tx power density", "wmx.pmc_rsp.power_adjust",
                        FT_FLOAT, BASE_DEC, NULL, 0x0, "", HFILL
                }
        },
        {
                &hf_pmc_rsp_start_frame,
                {
-                       "Start frame.  Apply mode change from current frame when 6 LSBs of frame match this", "wimax.pmc_rsp.start_frame",
+                       "Start frame.  Apply mode change from current frame when 6 LSBs of frame match this", "wmx.pmc_rsp.start_frame",
                        FT_UINT16, BASE_HEX, NULL, 0x3F00, "", HFILL
                }
        }
@@ -178,7 +178,7 @@ void proto_register_mac_mgmt_msg_pmc_req(void)
                proto_mac_mgmt_msg_pmc_req_decoder = proto_register_protocol (
                                                        "WiMax PMC-REQ/RSP Messages", /* name */
                                                        "WiMax PMC-REQ/RSP (pmc)", /* short name */
-                                                       "pmc" /* abbrev */
+                                                       "wmx.pmc" /* abbrev */
                                                        );
 
                proto_register_field_array(proto_mac_mgmt_msg_pmc_req_decoder, hf, array_length(hf));
index 054a58b00834b078d08da7cbfeaa07d147a5ff37..83cbd72ba8da568d991dbcf0b8dc753d15862cca 100644 (file)
@@ -74,14 +74,14 @@ static hf_register_info hf[] =
        {
                &hf_prc_lt_ctrl_message_type,
                {
-                       "MAC Management Message Type", "wimax.macmgtmsgtype.prc_lt_ctrl",
+                       "MAC Management Message Type", "wmx.macmgtmsgtype.prc_lt_ctrl",
                        FT_UINT8, BASE_DEC, NULL, 0x0, "", HFILL
                }
        },
        {
                &hf_prc_lt_ctrl_invalid_tlv,
                {
-                       "Invalid TLV", "wimax.prc_lt_ctrl.invalid_tlv",
+                       "Invalid TLV", "wmx.prc_lt_ctrl.invalid_tlv",
                        FT_BYTES, BASE_HEX, NULL, 0, "", HFILL
                }
        },
@@ -111,7 +111,7 @@ void proto_register_mac_mgmt_msg_prc_lt_ctrl(void)
                proto_mac_mgmt_msg_prc_lt_ctrl_decoder = proto_register_protocol (
                                                        "WiMax PRC-LT-CTRL Message", /* name */
                                                        "WiMax PRC-LT-CTRL (prc)", /* short name */
-                                                       "prc" /* abbrev */
+                                                       "wmx.prc" /* abbrev */
                                                        );
 
                proto_register_field_array(proto_mac_mgmt_msg_prc_lt_ctrl_decoder, hf, array_length(hf));
@@ -152,7 +152,7 @@ void dissect_mac_mgmt_msg_prc_lt_ctrl_decoder(tvbuff_t *tvb, packet_info *pinfo
                /* display whether to Setup or Tear-down the
                 * long-term MIMO precoding delay */
                proto_tree_add_item(prc_lt_ctrl_tree, hf_prc_lt_ctrl_precoding, tvb, offset, 1, FALSE);
-               
+
                /* display the Precoding Delay */
                proto_tree_add_item(prc_lt_ctrl_tree, hf_prc_lt_ctrl_precoding_delay, tvb, offset, 1, FALSE);
        }
index 06f7d08d738d2ed9076dc3b5869a7e2ec5e4323d..6938e549fff0dfff19446330950196b231f018de 100644 (file)
@@ -224,112 +224,112 @@ static hf_register_info hf[] =
        {
                &hf_reg_method_for_allocating_ip_addr_sec_mgmt_conn_dhcp,
                {
-                       "DHCP", "wimax.reg.alloc_sec_mgmt_dhcp",
+                       "DHCP", "wmx.reg.alloc_sec_mgmt_dhcp",
                        FT_BOOLEAN, 8, TFS(&tfs_supported), 0x01, "", HFILL
                }
        },
        {
                &hf_reg_method_for_allocating_ip_addr_sec_mgmt_conn_dhcpv6,
                {
-                       "DHCPv6", "wimax.reg.alloc_sec_mgmt_dhcpv6",
+                       "DHCPv6", "wmx.reg.alloc_sec_mgmt_dhcpv6",
                        FT_BOOLEAN, 8, TFS(&tfs_supported), 0x04, "", HFILL
                }
        },
        {
                &hf_reg_method_for_allocating_ip_addr_sec_mgmt_conn_ipv6,
                {
-                       "IPv6 Stateless Address Autoconfiguration", "wimax.reg.alloc_sec_mgmt_ipv6",
+                       "IPv6 Stateless Address Autoconfiguration", "wmx.reg.alloc_sec_mgmt_ipv6",
                        FT_BOOLEAN, 8, TFS(&tfs_supported), 0x08, "", HFILL
                }
        },
        {
                &hf_reg_method_for_allocating_ip_addr_sec_mgmt_conn_mobile_ipv4,
                {
-                       "Mobile IPv4", "wimax.reg.alloc_sec_mgmt_mobile_ipv4",
+                       "Mobile IPv4", "wmx.reg.alloc_sec_mgmt_mobile_ipv4",
                        FT_BOOLEAN, 8, TFS(&tfs_supported), 0x02, "", HFILL
                }
        },
        {
                &hf_reg_method_for_allocating_ip_addr_sec_mgmt_conn_rsvd,
                {
-                       "Reserved", "wimax.reg.alloc_sec_mgmt_rsvd",
+                       "Reserved", "wmx.reg.alloc_sec_mgmt_rsvd",
                        FT_UINT8, BASE_DEC, NULL, 0xF0, "", HFILL
                }
        },
        {
                &hf_reg_arq,
                {
-                       "ARQ support", "wimax.reg.arq",
+                       "ARQ support", "wmx.reg.arq",
                        FT_BOOLEAN, 8, TFS(&tfs_supported), 0x0, "", HFILL
                }
        },
        {
                &hf_reg_tlv_t_40_arq_ack_type_cumulative_ack_entry,
                {
-                       "Cumulative ACK entry", "wimax.reg.arq_ack_type_cumulative_ack_entry",
+                       "Cumulative ACK entry", "wmx.reg.arq_ack_type_cumulative_ack_entry",
                        FT_UINT8, BASE_DEC, NULL, 0x2, "", HFILL
                }
        },
        {
                &hf_reg_tlv_t_40_arq_ack_type_cumulative_ack_with_block_sequence_ack,
                {
-                       "Cumulative ACK with Block Sequence ACK", "wimax.reg.arq_ack_type_cumulative_ack_with_block_sequence_ack",
+                       "Cumulative ACK with Block Sequence ACK", "wmx.reg.arq_ack_type_cumulative_ack_with_block_sequence_ack",
                        FT_UINT8, BASE_DEC, NULL, 0x8, "", HFILL
                }
        },
        {
                &hf_reg_tlv_t_40_arq_ack_type_cumulative_with_selective_ack_entry,
                {
-                       "Cumulative with Selective ACK entry", "wimax.reg.arq_ack_type_cumulative_with_selective_ack_entry",
+                       "Cumulative with Selective ACK entry", "wmx.reg.arq_ack_type_cumulative_with_selective_ack_entry",
                        FT_UINT8, BASE_DEC, NULL, 0x4, "", HFILL
                }
        },
        {
                &hf_reg_tlv_t_40_arq_ack_type_reserved,
                {
-                       "Reserved", "wimax.reg.arq_ack_type_reserved",
+                       "Reserved", "wmx.reg.arq_ack_type_reserved",
                        FT_UINT8, BASE_DEC, NULL, 0xf0, "", HFILL
                }
        },
        {
                &hf_reg_tlv_t_40_arq_ack_type_selective_ack_entry,
                {
-                       "Selective ACK entry", "wimax.reg.arq_ack_type_selective_ack_entry",
+                       "Selective ACK entry", "wmx.reg.arq_ack_type_selective_ack_entry",
                        FT_UINT8, BASE_DEC, NULL, 0x1, "", HFILL
                }
        },
        {
                &hf_reg_tlv_t_43_bandwidth_request_cinr_report_header_support,
                {
-                       "Bandwidth request and CINR report header support", "wimax.reg.bandwidth_request_cinr_report_header_support",
+                       "Bandwidth request and CINR report header support", "wmx.reg.bandwidth_request_cinr_report_header_support",
                        FT_UINT24, BASE_DEC, VALS(tfs_support), 0x2, "", HFILL
                }
        },
        {
                &hf_reg_tlv_t_43_bandwidth_request_ul_sleep_control_header_support,
                {
-                       "Bandwidth request and uplink sleep control header support", "wimax.reg.bandwidth_request_ul_sleep_control_header_support",
+                       "Bandwidth request and uplink sleep control header support", "wmx.reg.bandwidth_request_ul_sleep_control_header_support",
                        FT_UINT24, BASE_DEC, VALS(tfs_support), 0x10, "", HFILL
                }
        },
        {
                &hf_reg_tlv_t_43_cqich_allocation_request_header_support,
                {
-                       "CQICH Allocation Request header support", "wimax.reg.cqich_allocation_request_header_support",
+                       "CQICH Allocation Request header support", "wmx.reg.cqich_allocation_request_header_support",
                        FT_UINT24, BASE_DEC, VALS(tfs_support), 0x4, "", HFILL
                }
        },
        {
                &hf_reg_tlv_t_43_dl_sleep_control_extended_subheader,
                {
-                       "Downlink sleep control extended subheader", "wimax.reg.dl_sleep_control_extended_subheader",
+                       "Downlink sleep control extended subheader", "wmx.reg.dl_sleep_control_extended_subheader",
                        FT_UINT24, BASE_DEC, VALS(tfs_support), 0x800, "", HFILL
                }
        },
        {
                &hf_reg_dsx_flow_control,
                {
-                       "DSx flow control", "wimax.reg.dsx_flow_control",
+                       "DSx flow control", "wmx.reg.dsx_flow_control",
                        FT_UINT8, BASE_DEC, NULL, 0x0, "", HFILL
                }
        },
@@ -337,98 +337,98 @@ static hf_register_info hf[] =
        {
                &hf_reg_encap_802_1q_2,
                {
-                       "Packet, 802.1Q VLAN", "wimax.reg.encap_802_1q",
+                       "Packet, 802.1Q VLAN", "wmx.reg.encap_802_1q",
                        FT_UINT16, BASE_HEX, NULL, 0x0010, "", HFILL
                }
        },
        {
                &hf_reg_encap_802_3_2,
                {
-                       "Packet, 802.3/Ethernet", "wimax.reg.encap_802_3",
+                       "Packet, 802.3/Ethernet", "wmx.reg.encap_802_3",
                        FT_UINT16, BASE_HEX, NULL, 0x00000008, "", HFILL
                }
        },
        {
                &hf_reg_encap_atm_2,
                {
-                       "ATM", "wimax.reg.encap_atm",
+                       "ATM", "wmx.reg.encap_atm",
                        FT_UINT16, BASE_HEX, NULL, 0x00000001, "", HFILL
                }
        },
        {
                &hf_reg_encap_ipv4_2,
                {
-                       "Packet, IPv4", "wimax.reg.encap_ipv4",
+                       "Packet, IPv4", "wmx.reg.encap_ipv4",
                        FT_UINT16, BASE_HEX, NULL, 0x00000002, "", HFILL
                }
        },
        {
                &hf_reg_encap_ipv6_2,
                {
-                       "Packet, IPv6", "wimax.reg.encap_ipv6",
+                       "Packet, IPv6", "wmx.reg.encap_ipv6",
                        FT_UINT16, BASE_HEX, NULL, 0x00000004, "", HFILL
                }
        },
        {
                &hf_reg_encap_ipv4_802_1q_2,
                {
-                       "Packet, IPv4 over 802.1Q VLAN", "wimax.reg.encap_ipv4_802_1q",
+                       "Packet, IPv4 over 802.1Q VLAN", "wmx.reg.encap_ipv4_802_1q",
                        FT_UINT16, BASE_HEX, NULL, 0x00000080, "", HFILL
                }
        },
        {
                &hf_reg_encap_ipv4_802_3_2,
                {
-                       "Packet, IPv4 over 802.3/Ethernet", "wimax.reg.encap_ipv4_802_3",
+                       "Packet, IPv4 over 802.3/Ethernet", "wmx.reg.encap_ipv4_802_3",
                        FT_UINT16, BASE_HEX, NULL, 0x00000020, "", HFILL
                }
        },
        {
                &hf_reg_encap_ipv6_802_1q_2,
                {
-                       "Packet, IPv6 over 802.1Q VLAN", "wimax.reg.encap_ipv6_802_1q",
+                       "Packet, IPv6 over 802.1Q VLAN", "wmx.reg.encap_ipv6_802_1q",
                        FT_UINT16, BASE_HEX, NULL, 0x00000100, "", HFILL
                }
        },
        {
                &hf_reg_encap_ipv6_802_3_2,
                {
-                       "Packet, IPv6 over 802.3/Ethernet", "wimax.reg.encap_ipv6_802_3",
+                       "Packet, IPv6 over 802.3/Ethernet", "wmx.reg.encap_ipv6_802_3",
                        FT_UINT16, BASE_HEX, NULL, 0x00000040, "", HFILL
                }
        },
        {
                &hf_reg_encap_packet_8023_ethernet_and_ecrtp_header_compression_2,
                {
-                       "Packet, 802.3/Ethernet (with optional 802.1Q VLAN tags) and ECRTP header compression", "wimax.reg.encap_packet_802_3_ethernet_and_ecrtp_header_compression",
+                       "Packet, 802.3/Ethernet (with optional 802.1Q VLAN tags) and ECRTP header compression", "wmx.reg.encap_packet_802_3_ethernet_and_ecrtp_header_compression",
                        FT_UINT16, BASE_HEX, NULL, 0x00000400, "", HFILL
                }
        },
        {
                &hf_reg_encap_packet_8023_ethernet_and_rohc_header_compression_2,
                {
-                       "Packet, 802.3/Ethernet (with optional 802.1Q VLAN tags) and ROHC header compression", "wimax.reg.encap_packet_802_3_ethernet_and_rohc_header_compression",
+                       "Packet, 802.3/Ethernet (with optional 802.1Q VLAN tags) and ROHC header compression", "wmx.reg.encap_packet_802_3_ethernet_and_rohc_header_compression",
                        FT_UINT16, BASE_HEX, NULL, 0x00000200, "", HFILL
                }
        },
        {
                &hf_reg_encap_packet_ip_ecrtp_header_compression_2,
                {
-                       "Packet, IP (v4 or v6) with ECRTP header compression", "wimax.reg.encap_packet_ip_ecrtp_header_compression",
+                       "Packet, IP (v4 or v6) with ECRTP header compression", "wmx.reg.encap_packet_ip_ecrtp_header_compression",
                        FT_UINT16, BASE_HEX, NULL, 0x00001000, "", HFILL
                }
        },
        {
                &hf_reg_encap_packet_ip_rohc_header_compression_2,
                {
-                       "Packet, IP (v4 or v6) with ROHC header compression", "wimax.reg.encap_packet_ip_rohc_header_compression",
+                       "Packet, IP (v4 or v6) with ROHC header compression", "wmx.reg.encap_packet_ip_rohc_header_compression",
                        FT_UINT16, BASE_HEX, NULL, 0x00000800, "", HFILL
                }
        },
        {
                &hf_reg_encap_rsvd_2,
                {
-                       "Reserved", "wimax.reg.encap_rsvd", 
+                       "Reserved", "wmx.reg.encap_rsvd",
                        FT_UINT16, BASE_HEX, NULL, 0x0000E000, "", HFILL
                }
        },
@@ -436,112 +436,112 @@ static hf_register_info hf[] =
        {
                &hf_reg_encap_802_1q_4,
                {
-                       "Packet, 802.1Q VLAN", "wimax.reg.encap_802_1q",
+                       "Packet, 802.1Q VLAN", "wmx.reg.encap_802_1q",
                        FT_UINT32, BASE_HEX, NULL, 0x0010, "", HFILL
                }
        },
        {
                &hf_reg_encap_802_3_4,
                {
-                       "Packet, 802.3/Ethernet", "wimax.reg.encap_802_3",
+                       "Packet, 802.3/Ethernet", "wmx.reg.encap_802_3",
                        FT_UINT32, BASE_HEX, NULL, 0x00000008, "", HFILL
                }
        },
        {
                &hf_reg_encap_atm_4,
                {
-                       "ATM", "wimax.reg.encap_atm",
+                       "ATM", "wmx.reg.encap_atm",
                        FT_UINT32, BASE_HEX, NULL, 0x00000001, "", HFILL
                }
        },
        {
                &hf_reg_encap_ipv4_4,
                {
-                       "Packet, IPv4", "wimax.reg.encap_ipv4",
+                       "Packet, IPv4", "wmx.reg.encap_ipv4",
                        FT_UINT32, BASE_HEX, NULL, 0x00000002, "", HFILL
                }
        },
        {
                &hf_reg_encap_ipv4_802_1q_4,
                {
-                       "Packet, IPv4 over 802.1Q VLAN", "wimax.reg.encap_ipv4_802_1q",
+                       "Packet, IPv4 over 802.1Q VLAN", "wmx.reg.encap_ipv4_802_1q",
                        FT_UINT32, BASE_HEX, NULL, 0x00000080, "", HFILL
                }
        },
        {
                &hf_reg_encap_ipv4_802_3_4,
                {
-                       "Packet, IPv4 over 802.3/Ethernet", "wimax.reg.encap_ipv4_802_3",
+                       "Packet, IPv4 over 802.3/Ethernet", "wmx.reg.encap_ipv4_802_3",
                        FT_UINT32, BASE_HEX, NULL, 0x00000020, "", HFILL
                }
        },
        {
                &hf_reg_encap_ipv6_4,
                {
-                       "Packet, IPv6", "wimax.reg.encap_ipv6",
+                       "Packet, IPv6", "wmx.reg.encap_ipv6",
                        FT_UINT32, BASE_HEX, NULL, 0x00000004, "", HFILL
                }
        },
        {
                &hf_reg_encap_ipv6_802_1q_4,
                {
-                       "Packet, IPv6 over 802.1Q VLAN", "wimax.reg.encap_ipv6_802_1q",
+                       "Packet, IPv6 over 802.1Q VLAN", "wmx.reg.encap_ipv6_802_1q",
                        FT_UINT32, BASE_HEX, NULL, 0x00000100, "", HFILL
                }
        },
        {
                &hf_reg_encap_ipv6_802_3_4,
                {
-                       "Packet, IPv6 over 802.3/Ethernet", "wimax.reg.encap_ipv6_802_3",
+                       "Packet, IPv6 over 802.3/Ethernet", "wmx.reg.encap_ipv6_802_3",
                        FT_UINT32, BASE_HEX, NULL, 0x00000040, "", HFILL
                }
        },
        {
                &hf_reg_encap_packet_8023_ethernet_and_ecrtp_header_compression_4,
                {
-                       "Packet, 802.3/Ethernet (with optional 802.1Q VLAN tags) and ECRTP header compression", "wimax.reg.encap_packet_802_3_ethernet_and_ecrtp_header_compression",
+                       "Packet, 802.3/Ethernet (with optional 802.1Q VLAN tags) and ECRTP header compression", "wmx.reg.encap_packet_802_3_ethernet_and_ecrtp_header_compression",
                        FT_UINT32, BASE_HEX, NULL, 0x00000400, "", HFILL
                }
        },
        {
                &hf_reg_encap_packet_8023_ethernet_and_rohc_header_compression_4,
                {
-                       "Packet, 802.3/Ethernet (with optional 802.1Q VLAN tags) and ROHC header compression", "wimax.reg.encap_packet_802_3_ethernet_and_rohc_header_compression",
+                       "Packet, 802.3/Ethernet (with optional 802.1Q VLAN tags) and ROHC header compression", "wmx.reg.encap_packet_802_3_ethernet_and_rohc_header_compression",
                        FT_UINT32, BASE_HEX, NULL, 0x00000200, "", HFILL
                }
        },
        {
                &hf_reg_encap_packet_ip_ecrtp_header_compression_4,
                {
-                       "Packet, IP (v4 or v6) with ECRTP header compression", "wimax.reg.encap_packet_ip_ecrtp_header_compression",
+                       "Packet, IP (v4 or v6) with ECRTP header compression", "wmx.reg.encap_packet_ip_ecrtp_header_compression",
                        FT_UINT32, BASE_HEX, NULL, 0x00001000, "", HFILL
                }
        },
        {
                &hf_reg_encap_packet_ip_rohc_header_compression_4,
                {
-                       "Packet, IP (v4 or v6) with ROHC header compression", "wimax.reg.encap_packet_ip_rohc_header_compression",
+                       "Packet, IP (v4 or v6) with ROHC header compression", "wmx.reg.encap_packet_ip_rohc_header_compression",
                        FT_UINT32, BASE_HEX, NULL, 0x00000800, "", HFILL
                }
        },
        {
                &hf_reg_encap_rsvd_4,
                {
-                       "Reserved", "wimax.reg.encap_rsvd",
+                       "Reserved", "wmx.reg.encap_rsvd",
                        FT_UINT32, BASE_HEX, NULL, 0xFFFFE000, "", HFILL
                }
        },
        {
                &hf_reg_tlv_t_22_mac_extended_rtps_support,
                {
-                       "MAC extended rtPS support", "wimax.reg.ext_rtps_support",
+                       "MAC extended rtPS support", "wmx.reg.ext_rtps_support",
                        FT_BOOLEAN, 8, TFS(&tfs_supported), 0x01, "", HFILL
                }
        },
        {
                &hf_reg_tlv_t_27_handover_fbss_mdho_dl_rf_monitoring_maps,
                {
-                       "FBSS/MDHO DL RF Combining with monitoring MAPs from active BSs", "wimax.reg.fbss_mdho_dl_rf_combining",
+                       "FBSS/MDHO DL RF Combining with monitoring MAPs from active BSs", "wmx.reg.fbss_mdho_dl_rf_combining",
                        FT_BOOLEAN, 8, TFS(&tfs_supported), 0x02, "", HFILL
                }
        },
@@ -556,357 +556,357 @@ static hf_register_info hf[] =
        {
                &hf_reg_tlv_t_27_handover_fbss_mdho_ho_disable,
                {
-                       "MDHO/FBSS HO. BS ignore all other bits when set to 1", "wimax.reg.fbss_mdho_ho_disable",
+                       "MDHO/FBSS HO. BS ignore all other bits when set to 1", "wmx.reg.fbss_mdho_ho_disable",
                        FT_BOOLEAN, 8, TFS(&tfs_reg_fbss_mdho_ho_disable), 0x01, "", HFILL
                }
        },
        {
                &hf_reg_tlv_t_43_feedback_header_support,
                {
-                       "Feedback header support", "wimax.reg.feedback_header_support",
+                       "Feedback header support", "wmx.reg.feedback_header_support",
                        FT_UINT24, BASE_DEC, VALS(tfs_support), 0x40, "", HFILL
                }
        },
        {
                &hf_reg_tlv_t_43_feedback_request_extended_subheader,
                {
-                       "Feedback request extended subheader", "wimax.reg.feedback_request_extended_subheader",
+                       "Feedback request extended subheader", "wmx.reg.feedback_request_extended_subheader",
                        FT_UINT24, BASE_DEC, VALS(tfs_support), 0x1000, "", HFILL
                }
        },
        {
                &hf_reg_tlv_t_46_handover_indication_readiness_timer,
                {
-                       "Handover indication readiness timer", "wimax.reg.handover_indication_readiness_timer",
+                       "Handover indication readiness timer", "wmx.reg.handover_indication_readiness_timer",
                        FT_UINT8, BASE_DEC, NULL, 0x0, "", HFILL
                }
        },
        {
                &hf_reg_tlv_t_27_handover_reserved,
                {
-                       "Reserved", "wimax.reg.handover_reserved",
+                       "Reserved", "wmx.reg.handover_reserved",
                        FT_UINT8, BASE_DEC, NULL, 0xE0, "", HFILL
                }
        },
        {
                &hf_reg_tlv_t_41_ho_connections_param_processing_time,
                {
-                       "MS HO connections parameters processing time", "wimax.reg.ho_connections_param_processing_time",
+                       "MS HO connections parameters processing time", "wmx.reg.ho_connections_param_processing_time",
                        FT_UINT8, BASE_DEC, NULL, 0x0, "", HFILL
                }
        },
        {
                &hf_reg_tlv_t_29_ho_process_opt_ms_timer,
                {
-                       "HO Process Optimization MS Timer", "wimax.reg.ho_process_opt_ms_timer",
+                       "HO Process Optimization MS Timer", "wmx.reg.ho_process_opt_ms_timer",
                        FT_UINT8, BASE_DEC, NULL, 0x0, "", HFILL
                }
        },
        {
                &hf_reg_tlv_t_42_ho_tek_processing_time,
                {
-                       "MS HO TEK processing time", "wimax.reg.ho_tek_processing_time",
+                       "MS HO TEK processing time", "wmx.reg.ho_tek_processing_time",
                        FT_UINT8, BASE_DEC, NULL, 0x0, "", HFILL
                }
        },
        {
                &hf_idle_mode_timeout,
                {
-                       "Idle Mode Timeout", "wimax.reg.idle_mode_timeout",
+                       "Idle Mode Timeout", "wmx.reg.idle_mode_timeout",
                        FT_UINT16, BASE_DEC, NULL, 0x0, "", HFILL
                }
        },
        {
                &hf_reg_ip_mgmt_mode,
                {
-                       "IP management mode", "wimax.reg.ip_mgmt_mode",
+                       "IP management mode", "wmx.reg.ip_mgmt_mode",
                        FT_BOOLEAN, 8, TFS(&tfs_reg_ip_mgmt_mode), 0x0, "", HFILL
                }
        },
        {
                &hf_reg_ip_version,
                {
-                       "IP version", "wimax.reg.ip_version",
+                       "IP version", "wmx.reg.ip_version",
                        FT_UINT8, BASE_HEX, VALS(vals_reg_ip_version), 0x0, "", HFILL
                }
        },
        {
                &hf_reg_mac_address,
                {
-                       "MAC Address of the SS", "wimax.reg.mac_address",
+                       "MAC Address of the SS", "wmx.reg.mac_address",
                        FT_ETHER, BASE_DEC, NULL, 0x0, "", HFILL
                }
        },
        {
                &hf_reg_mac_crc_support,
                {
-                       "MAC CRC", "wimax.reg.mac_crc_support",
+                       "MAC CRC", "wmx.reg.mac_crc_support",
                        FT_BOOLEAN, 8, TFS(&tfs_mac_crc_support), 0x0, "", HFILL
                }
        },
        {
                &hf_reg_max_classifiers,
                {
-                       "Maximum number of classification rules", "wimax.reg.max_classifiers",
+                       "Maximum number of classification rules", "wmx.reg.max_classifiers",
                        FT_UINT16, BASE_DEC, NULL, 0x0, "", HFILL
                }
        },
        {
                &hf_reg_tlv_t_23_max_num_bursts_concurrently_to_the_ms,
                {
-                       "Maximum number of bursts transmitted concurrently to the MS", "wimax.reg.max_num_bursts_to_ms",
+                       "Maximum number of bursts transmitted concurrently to the MS", "wmx.reg.max_num_bursts_to_ms",
                        FT_UINT8, BASE_DEC, NULL, 0x0, "", HFILL
                }
        },
        {
                &hf_reg_mca_flow_control,
                {
-                       "MCA flow control", "wimax.reg.mca_flow_control",
+                       "MCA flow control", "wmx.reg.mca_flow_control",
                        FT_UINT8, BASE_DEC, NULL, 0x0, "", HFILL
                }
        },
        {
                &hf_reg_mcast_polling_cids,
                {
-                       "Multicast polling group CID support", "wimax.reg.mcast_polling_cids",
+                       "Multicast polling group CID support", "wmx.reg.mcast_polling_cids",
                        FT_UINT8, BASE_DEC, NULL, 0x0, "", HFILL
                }
        },
        {
                &hf_reg_tlv_t_27_handover_mdho_ul_multiple,
                {
-                       "MDHO UL Multiple transmission", "wimax.reg.mdh_ul_multiple",
+                       "MDHO UL Multiple transmission", "wmx.reg.mdh_ul_multiple",
                        FT_BOOLEAN, 8, TFS(&tfs_supported), 0x10, "", HFILL
                }
        },
        {
                &hf_reg_tlv_t_27_handover_mdho_dl_monitoring_maps,
                {
-                       "MDHO DL soft combining with monitoring MAPs from active BSs", "wimax.reg.mdho_dl_monitor_maps",
+                       "MDHO DL soft combining with monitoring MAPs from active BSs", "wmx.reg.mdho_dl_monitor_maps",
                        FT_BOOLEAN, 8, TFS(&tfs_supported), 0x08, "", HFILL
                }
        },
        {
                &hf_reg_tlv_t_27_handover_mdho_dl_monitoring_single_map,
                {
-                       "MDHO DL soft Combining with monitoring single MAP from anchor BS", "wimax.reg.mdho_dl_monitor_single_map",
+                       "MDHO DL soft Combining with monitoring single MAP from anchor BS", "wmx.reg.mdho_dl_monitor_single_map",
                        FT_BOOLEAN, 8, TFS(&tfs_supported), 0x04, "", HFILL
                }
        },
        {
                &hf_reg_tlv_t_43_mimo_mode_feedback_extended_subheader,
                {
-                       "MIMO mode feedback request extended subheader", "wimax.reg.mimo_mode_feedback_request_extended_subheader",
+                       "MIMO mode feedback request extended subheader", "wmx.reg.mimo_mode_feedback_request_extended_subheader",
                        FT_UINT24, BASE_DEC, VALS(tfs_support), 0x2000, "", HFILL
                }
        },
        {
                &hf_reg_tlv_t_43_mini_feedback_extended_subheader,
                {
-                       "Mini-feedback extended subheader", "wimax.reg.mini_feedback_extended_subheader",
+                       "Mini-feedback extended subheader", "wmx.reg.mini_feedback_extended_subheader",
                        FT_UINT24, BASE_DEC, VALS(tfs_support), 0x8000, "", HFILL
                }
        },
        {
                &hf_reg_tlv_t_31_mobility_handover,
                {
-                       "Mobility (handover)", "wimax.reg.mobility_handover",
+                       "Mobility (handover)", "wmx.reg.mobility_handover",
                        FT_BOOLEAN, 8, TFS(&tfs_supported), 0x01, "", HFILL
                }
        },
        {
                &hf_reg_tlv_t_31_mobility_idle_mode,
                {
-                       "Idle mode", "wimax.reg.mobility_idle_mode",
+                       "Idle mode", "wmx.reg.mobility_idle_mode",
                        FT_BOOLEAN, 8, TFS(&tfs_supported), 0x04, "", HFILL
                }
        },
        {
                &hf_reg_tlv_t_31_mobility_sleep_mode,
                {
-                       "Sleep mode", "wimax.reg.mobility_sleep_mode",
+                       "Sleep mode", "wmx.reg.mobility_sleep_mode",
                        FT_BOOLEAN, 8, TFS(&tfs_supported), 0x02, "", HFILL
                }
        },
        {
                &hf_reg_num_dl_trans_cid,
                {
-                       "Number of Downlink transport CIDs the SS can support", "wimax.reg.dl_cids_supported",
+                       "Number of Downlink transport CIDs the SS can support", "wmx.reg.dl_cids_supported",
                        FT_UINT16, BASE_DEC, NULL, 0x0, "", HFILL
                }
        },
        {
                &hf_reg_tlv_t_21_packing_support,
                {
-                       "Packing support", "wimax.reg.packing.support",
+                       "Packing support", "wmx.reg.packing.support",
                        FT_BOOLEAN, 8, TFS(&tfs_supported), 0x01, "", HFILL
                }
        },
        {
                &hf_reg_tlv_t_43_pdu_sn_long_extended_subheader,
                {
-                       "PDU SN (long) extended subheader", "wimax.reg.pdu_sn_long_extended_subheader",
+                       "PDU SN (long) extended subheader", "wmx.reg.pdu_sn_long_extended_subheader",
                        FT_UINT24, BASE_DEC, VALS(tfs_support), 0x40000, "", HFILL
                }
        },
        {
                &hf_reg_tlv_t_43_pdu_sn_short_extended_subheader,
                {
-                       "PDU SN (short) extended subheader", "wimax.reg.pdu_sn_short_extended_subheader",
+                       "PDU SN (short) extended subheader", "wmx.reg.pdu_sn_short_extended_subheader",
                        FT_UINT24, BASE_DEC, VALS(tfs_support), 0x20000, "", HFILL
                }
        },
        {
                &hf_reg_phs,
                {
-                       "PHS support", "wimax.reg.phs",
+                       "PHS support", "wmx.reg.phs",
                        FT_UINT8, BASE_DEC, VALS(vals_reg_phs_support), 0x0, "", HFILL
                }
        },
        {
                &hf_reg_tlv_t_43_phy_channel_report_header_support,
                {
-                       "PHY channel report header support", "wimax.reg.phy_channel_report_header_support",
+                       "PHY channel report header support", "wmx.reg.phy_channel_report_header_support",
                        FT_UINT24, BASE_DEC, VALS(tfs_support), 0x8, "", HFILL
                }
        },
        {
                &hf_reg_tlv_t_43_reserved,
                {
-                       "Reserved", "wimax.reg.reserved",
+                       "Reserved", "wmx.reg.reserved",
                        FT_UINT24, BASE_DEC, NULL, 0xf80000, "", HFILL
                }
        },
        {
                &hf_reg_tlv_t_43_sdu_sn_extended_subheader_support_and_parameter,
                {
-                       "SDU_SN extended subheader support", "wimax.reg.sdu_sn_extended_subheader_support",
+                       "SDU_SN extended subheader support", "wmx.reg.sdu_sn_extended_subheader_support",
                        FT_UINT24, BASE_DEC, VALS(tfs_support), 0x80, "", HFILL
                }
        },
        {
                &hf_reg_tlv_t_43_sdu_sn_parameter,
                {
-                       "SDU_SN parameter", "wimax.reg.sdu_sn_parameter",
+                       "SDU_SN parameter", "wmx.reg.sdu_sn_parameter",
                        FT_UINT24, BASE_DEC, NULL, 0x700, "", HFILL
                }
        },
        {
                &hf_reg_tlv_t_43_sn_report_header_support,
                {
-                       "SN report header support", "wimax.reg.sn_report_header_support",
+                       "SN report header support", "wmx.reg.sn_report_header_support",
                        FT_UINT24, BASE_DEC, VALS(tfs_support), 0x20, "", HFILL
                }
        },
        {
                &hf_reg_tlv_t_43_sn_request_extended_subheader,
                {
-                       "SN request extended subheader", "wimax.reg.sn_request_extended_subheader",
+                       "SN request extended subheader", "wmx.reg.sn_request_extended_subheader",
                        FT_UINT24, BASE_DEC, VALS(tfs_support), 0x10000, "", HFILL
                }
        },
        {
                &hf_reg_ss_mgmt_support,
                {
-                       "SS management support", "wimax.reg.ss_mgmt_support",
+                       "SS management support", "wmx.reg.ss_mgmt_support",
                        FT_BOOLEAN, 8, TFS(&tfs_reg_ss_mgmt_support), 0x0, "", HFILL
                }
        },
        {
                &hf_reg_ul_cids,
                {
-                       "Number of Uplink transport CIDs the SS can support", "wimax.reg.ul_cids_supported",
+                       "Number of Uplink transport CIDs the SS can support", "wmx.reg.ul_cids_supported",
                        FT_UINT16, BASE_DEC, NULL, 0x0, "", HFILL
                }
        },
        {
                &hf_reg_tlv_t_43_ul_tx_power_report_extended_subheader,
                {
-                       "UL Tx power report extended subheader", "wimax.reg.ul_tx_power_report_extended_subheader",
+                       "UL Tx power report extended subheader", "wmx.reg.ul_tx_power_report_extended_subheader",
                        FT_UINT24, BASE_DEC, VALS(tfs_support), 0x4000, "", HFILL
                }
        },
        {
                &hf_tlv_type,
                {
-                       "Unknown TLV Type", "wimax.reg.unknown_tlv_type", 
+                       "Unknown TLV Type", "wmx.reg.unknown_tlv_type",
                        FT_BYTES, BASE_NONE, NULL, 0x00, "", HFILL
                }
        },
        {
                &hf_reg_req_message_type,
                {
-                       "MAC Management Message Type", "wimax.macmgtmsgtype.reg_req",
+                       "MAC Management Message Type", "wmx.macmgtmsgtype.reg_req",
                        FT_UINT8, BASE_DEC, NULL, 0x0, "", HFILL
                }
        },
        {
                &hf_reg_invalid_tlv,
                {
-                       "Invalid TLV", "wimax.reg_req.invalid_tlv", 
+                       "Invalid TLV", "wmx.reg_req.invalid_tlv",
                        FT_BYTES, BASE_HEX, NULL, 0, "", HFILL
                }
        },
        {
                &hf_reg_tlv_t_20_1_max_mac_level_data_per_dl_frame,
                {
-                       "Maximum MAC level DL data per frame", "wimax.reg_req.max_mac_dl_data",
+                       "Maximum MAC level DL data per frame", "wmx.reg_req.max_mac_dl_data",
                        FT_UINT16, BASE_DEC, NULL, 0x0, "", HFILL
                }
        },
        {
                &hf_reg_tlv_t_20_2_max_mac_level_data_per_ul_frame,
                {
-                       "Maximum MAC level UL data per frame", "wimax.reg_req.max_mac_ul_data",
+                       "Maximum MAC level UL data per frame", "wmx.reg_req.max_mac_ul_data",
                        FT_UINT16, BASE_DEC, NULL, 0x0, "", HFILL
                }
        },
        {
                &hf_reg_req_min_time_for_inter_fa,
                {
-                       "Minimum time for inter-FA HO, default=3", "wimax.reg_req.min_time_for_inter_fa",
+                       "Minimum time for inter-FA HO, default=3", "wmx.reg_req.min_time_for_inter_fa",
                        FT_UINT8, BASE_HEX, NULL, 0xF0, "", HFILL
                }
        },
        {
                &hf_reg_req_min_time_for_intra_fa,
                {
-                       "Minimum time for intra-FA HO, default=2", "wimax.reg_req.min_time_for_intra_fa",
+                       "Minimum time for intra-FA HO, default=2", "wmx.reg_req.min_time_for_intra_fa",
                        FT_UINT8, BASE_HEX, NULL, 0x0F, "", HFILL
                }
        },
        {
                &hf_reg_req_tlv_t_45_ms_periodic_ranging_timer,
                {
-                       "MS periodic ranging timer information", "wimax.reg_req.ms_periodic_ranging_timer_info",
+                       "MS periodic ranging timer information", "wmx.reg_req.ms_periodic_ranging_timer_info",
                        FT_UINT8, BASE_DEC, NULL, 0x0, "", HFILL
                }
        },
        {       /* IPv4 Mask */
                &hf_ms_previous_ip_address_v4,
                {
-                       "MS Previous IP address", "wimax.reg_req.ms_prev_ip_addr_v4",
+                       "MS Previous IP address", "wmx.reg_req.ms_prev_ip_addr_v4",
                        FT_IPv4, BASE_NONE, NULL, 0x0, "", HFILL
                }
        },
        {       /* IPv6 Source Address */
                &hf_ms_previous_ip_address_v6,
                {
-                       "MS Previous IP address", "wimax.reg_req.ms_prev_ip_addr_v6",
+                       "MS Previous IP address", "wmx.reg_req.ms_prev_ip_addr_v6",
                        FT_IPv6, BASE_NONE, NULL, 0x0, "", HFILL
                }
        },
        {
                &hf_reg_req_secondary_mgmt_cid,
                {
-                       "Secondary Management CID", "wimax.reg_req.secondary_mgmt_cid",
+                       "Secondary Management CID", "wmx.reg_req.secondary_mgmt_cid",
                        FT_UINT16, BASE_DEC, NULL, 0x0, "", HFILL
                }
        },
        {
                &hf_reg_req_tlv_t_32_sleep_mode_recovery_time,
                {
-                       "Frames required for the MS to switch from sleep to awake-mode", "wimax.reg_req.sleep_recovery",
+                       "Frames required for the MS to switch from sleep to awake-mode", "wmx.reg_req.sleep_recovery",
                        FT_UINT8, BASE_DEC, NULL, 0x0, "", HFILL
                }
        }
@@ -1210,7 +1210,7 @@ void proto_register_mac_mgmt_msg_reg_req(void)
                proto_mac_mgmt_msg_reg_req_decoder = proto_register_protocol (
                                                        "WiMax REG-REQ/RSP Messages", /* name */
                                                        "WiMax REG-REQ/RSP (reg)", /* short name */
-                                                       "reg" /* abbrev */
+                                                       "wmx.reg" /* abbrev */
                                                        );
 
                proto_register_field_array(proto_mac_mgmt_msg_reg_req_decoder, hf, array_length(hf));
index 886fd5bde91ba5155eed7a5b17640cf5ca285fd8..20d5a5a6a1b62205e4b279140482e4351afc5bf1 100644 (file)
@@ -96,63 +96,63 @@ static hf_register_info hf[] =
        {
                &hf_reg_rsp_message_type,
                {
-                       "MAC Management Message Type", "wimax.macmgtmsgtype.reg_rsp",
+                       "MAC Management Message Type", "wmx.macmgtmsgtype.reg_rsp",
                        FT_UINT8, BASE_DEC, NULL, 0x0, "", HFILL
                }
        },
        {
                &hf_reg_invalid_tlv,
                {
-                       "Invalid TLV", "wimax.reg_rsp.invalid_tlv", 
+                       "Invalid TLV", "wmx.reg_rsp.invalid_tlv", 
                        FT_BYTES, BASE_HEX, NULL, 0, "", HFILL
                }
        },
        {
                &hf_reg_rsp_new_cid_after_ho,
                {
-                       "New CID after handover to new BS", "wimax.reg_rsp.new_cid_after_ho",
+                       "New CID after handover to new BS", "wmx.reg_rsp.new_cid_after_ho",
                        FT_UINT16, BASE_DEC, NULL, 0x0, "", HFILL
                }
        },
        {
                &hf_reg_rsp_status,
                {
-                       "Response", "wimax.reg_rsp.response", 
+                       "Response", "wmx.reg_rsp.response", 
                        FT_UINT8, BASE_HEX, VALS(vals_reg_rsp_status), 0x0, "", HFILL
                }
        },
        {
                &hf_reg_rsp_secondary_mgmt_cid,
                {
-                       "Secondary Management CID", "wimax.reg_rsp.secondary_mgmt_cid",
+                       "Secondary Management CID", "wmx.reg_rsp.secondary_mgmt_cid",
                        FT_UINT16, BASE_DEC, NULL, 0x0, "", HFILL
                }
        },
        {
                &hf_reg_rsp_service_flow_id,
                {
-                       "Service flow ID", "wimax.reg_rsp.service_flow_id",
+                       "Service flow ID", "wmx.reg_rsp.service_flow_id",
                        FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL
                }
        },
        {
                &hf_reg_rsp_system_resource_retain_time,
                {
-                       "System Resource Retain Time", "wimax.reg_rsp.system_resource_retain_time",
+                       "System Resource Retain Time", "wmx.reg_rsp.system_resource_retain_time",
                        FT_UINT16, BASE_DEC, NULL, 0x0, "", HFILL
                }
        },
        {
                &hf_tlv_type,
                {
-                       "Unknown TLV Type", "wimax.reg_rsp.unknown_tlv_type", 
+                       "Unknown TLV Type", "wmx.reg_rsp.unknown_tlv_type", 
                        FT_BYTES, BASE_NONE, NULL, 0x00, "", HFILL
                }
        },
        {
                &hf_tlv_value,
                {
-                       "Value", "wimax.reg_rsp.tlv_value", 
+                       "Value", "wmx.reg_rsp.tlv_value", 
                        FT_BYTES, BASE_NONE, NULL, 0x00, "", HFILL
                }
        }
index b836555c8d72c8c0f983f6a6909229bac3caae33..585bc98a6343f7b2768a53abd415093ece425468 100644 (file)
@@ -276,476 +276,476 @@ static hf_register_info hf_rep[] =
        {
                &hf_rep_invalid_tlv,
                {
-                       "Invalid TLV", "wimax.rep.invalid_tlv",
+                       "Invalid TLV", "wmx.rep.invalid_tlv",
                        FT_BYTES, BASE_HEX, NULL, 0, "", HFILL
                }
        },
        {
                &hf_rep_req_message_type,
                {
-                       "MAC Management Message Type", "wimax.macmgtmsgtype.rep_req",
+                       "MAC Management Message Type", "wmx.macmgtmsgtype.rep_req",
                        FT_UINT8, BASE_DEC, NULL, 0x0, "", HFILL
                }
        },
        {       /* type 1.2 */
                &hf_rep_req_channel_number,
                {
-                       "Channel Number", "wimax.rep_req.channel_number",
+                       "Channel Number", "wmx.rep_req.channel_number",
                        FT_UINT8, BASE_DEC, NULL, 0x0, "", HFILL
                }
        },
        {       /* type 1.8 */
                &hf_rep_req_channel_selectivity_report,
                {
-                       "Channel Selectivity Report", "wimax.rep_req.channel_selectivity_report",
+                       "Channel Selectivity Report", "wmx.rep_req.channel_selectivity_report",
                        FT_BYTES, BASE_HEX, NULL, 0x0, "", HFILL
                }
        },
        {
                &hf_rep_req_channel_selectivity_rep_bit0,
                {
-                       "Include Frequency Selectivity Report", "wimax.rep_req.channel_selectivity_report.bit0",
+                       "Include Frequency Selectivity Report", "wmx.rep_req.channel_selectivity_report.bit0",
                        FT_BOOLEAN, 8, NULL, REP_REQ_CHANNEL_SELECTIVITY_REPORT_BIT0, "", HFILL
                }
        },
        {
                &hf_rep_req_channel_selectivity_rep_bit1_7,
                {
-                       "Reserved", "wimax.rep_req.channel_selectivity_report.bit1_7",
+                       "Reserved", "wmx.rep_req.channel_selectivity_report.bit1_7",
                        FT_UINT8, BASE_HEX, NULL, REP_REQ_CHANNEL_SELECTIVITY_REPORT_BIT1_7, "", HFILL
                }
        },
        {       /* type 1.3 */
                &hf_rep_req_channel_type_request,
                {
-                       "Channel Type Request", "wimax.rep_req.channel_type.request",
+                       "Channel Type Request", "wmx.rep_req.channel_type.request",
                        FT_UINT8, BASE_DEC, VALS(vals_channel_types), 0x03, "", HFILL
                }
        },
        {
                &hf_rep_req_channel_type_reserved,
                {
-                       "Reserved", "wimax.rep_req.channel_type.reserved",
+                       "Reserved", "wmx.rep_req.channel_type.reserved",
                        FT_UINT8, BASE_HEX, NULL, 0xFC, "", HFILL
                }
        },
        {       /* type 1.7 */
                &hf_rep_req_preamble_effective_cinr_request,
                {
-                       "Preamble Effective CINR Request", "wimax.rep_req.preamble_effective_cinr_request",
+                       "Preamble Effective CINR Request", "wmx.rep_req.preamble_effective_cinr_request",
                        FT_BYTES, BASE_HEX, NULL, 0x0, "", HFILL
                }
        },
        {
                &hf_rep_req_preamble_effective_cinr_req_bit0_1,
                {
-                       "Type Of Preamble Physical CINR Measurement", "wimax.rep_req.preamble_effective_cinr_request.bit0_1",
+                       "Type Of Preamble Physical CINR Measurement", "wmx.rep_req.preamble_effective_cinr_request.bit0_1",
                        FT_UINT8, BASE_DEC, VALS(vals_type_of_measurements), REP_REQ_PREAMBLE_EFFECTIVE_CINR_REQUEST_BIT0_1, "", HFILL
                }
        },
        {
                &hf_rep_req_preamble_effective_cinr_req_bit2_7,
                {
-                       "Reserved", "wimax.rep_req.preamble_effective_cinr_request.bit2_7",
+                       "Reserved", "wmx.rep_req.preamble_effective_cinr_request.bit2_7",
                        FT_UINT8, BASE_HEX, NULL, REP_REQ_PREAMBLE_EFFECTIVE_CINR_REQUEST_BIT2_7, "", HFILL
                }
        },
        {       /* type 1.5 */
                &hf_rep_req_preamble_phy_cinr_request,
                {
-                       "Preamble Physical CINR Request", "wimax.rep_req.preamble_phy_cinr_request",
+                       "Preamble Physical CINR Request", "wmx.rep_req.preamble_phy_cinr_request",
                        FT_BYTES, BASE_HEX, NULL, 0x0, "", HFILL
                }
        },
        {
                &hf_rep_req_preamble_phy_cinr_req_bit0_1,
                {
-                       "Type Of Preamble Physical CINR Measurement", "wimax.rep_req.preamble_phy_cinr_request.bit0_1",
+                       "Type Of Preamble Physical CINR Measurement", "wmx.rep_req.preamble_phy_cinr_request.bit0_1",
                        FT_UINT8, BASE_DEC, VALS(vals_type_of_measurements), REP_REQ_PREAMBLE_PHY_CINR_REQUEST_BIT0_1, "", HFILL
                }
        },
        {
                &hf_rep_req_preamble_phy_cinr_req_bit2_5,
                {
-                       "Alpha (ave) in multiples of 1/16", "wimax.rep_req.preamble_phy_cinr_request.bit2_5",
+                       "Alpha (ave) in multiples of 1/16", "wmx.rep_req.preamble_phy_cinr_request.bit2_5",
                        FT_UINT8, BASE_DEC, NULL, REP_REQ_PREAMBLE_PHY_CINR_REQUEST_BIT2_5, "", HFILL
                }
        },
        {
                &hf_rep_req_preamble_phy_cinr_req_bit6,
                {
-                       "CINR Report Type", "wimax.rep_req.preamble_phy_cinr_request.bit6",
+                       "CINR Report Type", "wmx.rep_req.preamble_phy_cinr_request.bit6",
                        FT_UINT8, BASE_DEC, VALS(vals_cinr_report_types), REP_REQ_PREAMBLE_PHY_CINR_REQUEST_BIT6, "", HFILL
                }
        },
        {
                &hf_rep_req_preamble_phy_cinr_req_bit7,
                {
-                       "Reserved", "wimax.rep_req.preamble_phy_cinr_request.bit7",
+                       "Reserved", "wmx.rep_req.preamble_phy_cinr_request.bit7",
                        FT_UINT8, BASE_HEX, NULL, REP_REQ_PREAMBLE_PHY_CINR_REQUEST_BIT7, "", HFILL
                }
        },
        {       /* report request */
                &hf_rep_req_report_request,
                {
-                       "Report Request", "wimax.rep_req.report_request",
+                       "Report Request", "wmx.rep_req.report_request",
                        FT_BYTES, BASE_HEX, NULL, 0x0, "", HFILL
                }
        },
        {       /* type 1.1 */
                &hf_rep_req_report_type,
                {
-                       "Report Type", "wimax.rep_req.report_type",
+                       "Report Type", "wmx.rep_req.report_type",
                        FT_UINT8, BASE_HEX, NULL, 0x0, "", HFILL
                }
        },
        {
                &hf_rep_req_rep_type_bit0,
                {
-                       "Include DFS Basic Report", "wimax.rep_req.report_type.bit0",
+                       "Include DFS Basic Report", "wmx.rep_req.report_type.bit0",
                        FT_BOOLEAN, 8, NULL, REP_REQ_REPORT_TYPE_BIT0, "", HFILL
                }
        },
        {
                &hf_rep_req_rep_type_bit1,
                {
-                       "Include CINR Report", "wimax.rep_req.report_type.bit1",
+                       "Include CINR Report", "wmx.rep_req.report_type.bit1",
                        FT_BOOLEAN, 8, NULL, REP_REQ_REPORT_TYPE_BIT1, "", HFILL
                }
        },
        {
                &hf_rep_req_rep_type_bit2,
                {
-                       "Include RSSI Report", "wimax.rep_req.report_type.bit2",
+                       "Include RSSI Report", "wmx.rep_req.report_type.bit2",
                        FT_BOOLEAN, 8, NULL, REP_REQ_REPORT_TYPE_BIT2, "", HFILL
                }
        },
        {
                &hf_rep_req_rep_type_bit3_6,
                {
-                       "Alpha (ave) in multiples of 1/32", "wimax.rep_req.report_type.bit3_6",
+                       "Alpha (ave) in multiples of 1/32", "wmx.rep_req.report_type.bit3_6",
                        FT_UINT8, BASE_DEC, NULL, REP_REQ_REPORT_TYPE_BIT3_6, "", HFILL
                }
        },
        {
                &hf_rep_req_rep_type_bit7,
                {
-                       "Include Current Transmit Power Report", "wimax.rep_req.report_type.bit7",
+                       "Include Current Transmit Power Report", "wmx.rep_req.report_type.bit7",
                        FT_BOOLEAN, 8, NULL, REP_REQ_REPORT_TYPE_BIT7, "", HFILL
                }
        },
        {
                &hf_rep_rsp_preamble_effective_cinr_rep_cqich_id,
                {
-                       "The 4 least significant bits of CQICH_ID", "wimax.rep_req.zone_spec_effective_cinr_report.cqich_id_4",
+                       "The 4 least significant bits of CQICH_ID", "wmx.rep_req.zone_spec_effective_cinr_report.cqich_id_4",
                        FT_UINT8, BASE_HEX, NULL, REP_RSP_ZONE_SPEC_EFFECTIVE_CINR_CQICH_ID_4_MASK, "", HFILL
                }
        },
        {
                &hf_rep_rsp_zone_spec_effective_cinr_rep_cqich_id,
                {
-                       "The 3 least significant bits of CQICH_ID", "wimax.rep_req.zone_spec_effective_cinr_report.cqich_id",
+                       "The 3 least significant bits of CQICH_ID", "wmx.rep_req.zone_spec_effective_cinr_report.cqich_id",
                        FT_UINT8, BASE_HEX, NULL, REP_RSP_ZONE_SPEC_EFFECTIVE_CINR_CQICH_ID_MASK, "", HFILL
                }
        },
        {
                &hf_rep_rsp_zone_spec_effective_cinr_rep_effective_cinr,
                {
-                       "Effective CINR", "wimax.rep_req.zone_spec_effective_cinr_report.effective_cinr",
+                       "Effective CINR", "wmx.rep_req.zone_spec_effective_cinr_report.effective_cinr",
                        FT_UINT8, BASE_DEC, NULL, REP_RSP_ZONE_SPEC_EFFECTIVE_CINR_EFFECTIVE_CINR_MASK, "", HFILL
                }
        },
        {
                &hf_rep_rsp_zone_spec_effective_cinr_rep_report_type,
                {
-                       "Effective CINR Report", "wimax.rep_req.zone_spec_effective_cinr_report.report_type",
+                       "Effective CINR Report", "wmx.rep_req.zone_spec_effective_cinr_report.report_type",
                        FT_UINT8, BASE_DEC, VALS(vals_data_cinr_measurements), REP_RSP_ZONE_SPEC_EFFECTIVE_CINR_REPORT_TYPE_MASK, "", HFILL
                }
        },
        {       /* type 1.6 */
                &hf_rep_req_zone_spec_effective_cinr_request,
                {
-                       "Zone-specific Effective CINR Request", "wimax.rep_req.zone_spec_effective_cinr_request",
+                       "Zone-specific Effective CINR Request", "wmx.rep_req.zone_spec_effective_cinr_request",
                        FT_BYTES, BASE_HEX, NULL, 0x0, "", HFILL
                }
        },
        {
                &hf_rep_req_zone_spec_effective_cinr_req_bit0_2,
                {
-                       "Type Of Zone On Which CINR Is To Be Reported", "wimax.rep_req.zone_spec_effective_cinr_request.bit0_2",
+                       "Type Of Zone On Which CINR Is To Be Reported", "wmx.rep_req.zone_spec_effective_cinr_request.bit0_2",
                        FT_UINT16, BASE_HEX, VALS(vals_type_of_zones), REP_REQ_TYPE_OF_ZONE_REQUEST_16_BIT0_2, "", HFILL
                }
        },
        {
                &hf_rep_req_zone_spec_effective_cinr_req_bit3,
                {
-                       "STC Zone", "wimax.rep_req.zone_spec_effective_cinr_request.bit3",
+                       "STC Zone", "wmx.rep_req.zone_spec_effective_cinr_request.bit3",
                        FT_BOOLEAN, 16, NULL, REP_REQ_TYPE_OF_ZONE_REQUEST_16_BIT3, "", HFILL
                }
        },
        {
                &hf_rep_req_zone_spec_effective_cinr_req_bit4,
                {
-                       "AAS Zone", "wimax.rep_req.zone_spec_effective_cinr_request.bit4",
+                       "AAS Zone", "wmx.rep_req.zone_spec_effective_cinr_request.bit4",
                        FT_BOOLEAN, 16, NULL, REP_REQ_TYPE_OF_ZONE_REQUEST_16_BIT4, "", HFILL
                }
        },
        {
                &hf_rep_req_zone_spec_effective_cinr_req_bit5_6,
                {
-                       "PRBS ID", "wimax.rep_req.zone_spec_effective_cinr_request.bit5_6",
+                       "PRBS ID", "wmx.rep_req.zone_spec_effective_cinr_request.bit5_6",
                        FT_UINT16, BASE_HEX, NULL, REP_REQ_TYPE_OF_ZONE_REQUEST_16_BIT5_6, "", HFILL
                }
        },
        {
                &hf_rep_req_zone_spec_effective_cinr_req_bit7,
                {
-                       "CINR Measurement Report", "wimax.rep_req.zone_spec_effective_cinr_request.bit7",
+                       "CINR Measurement Report", "wmx.rep_req.zone_spec_effective_cinr_request.bit7",
                        FT_UINT16, BASE_HEX, VALS(vals_data_cinr_measurements), REP_REQ_TYPE_OF_ZONE_REQUEST_16_BIT7, "", HFILL
                }
        },
        {
                &hf_rep_req_zone_spec_effective_cinr_req_bit8_13,
                {
-                       "PUSC Major Group Map", "wimax.rep_req.zone_spec_effective_cinr_request.bit8_13",
+                       "PUSC Major Group Map", "wmx.rep_req.zone_spec_effective_cinr_request.bit8_13",
                        FT_UINT16, BASE_HEX, NULL, REP_REQ_TYPE_OF_ZONE_REQUEST_16_BIT8_13, "", HFILL
                }
        },
        {
                &hf_rep_req_zone_spec_effective_cinr_req_bit14_15,
                {
-                       "Reserved", "wimax.rep_req.zone_spec_effective_cinr_request.bit14_15",
+                       "Reserved", "wmx.rep_req.zone_spec_effective_cinr_request.bit14_15",
                        FT_UINT16, BASE_HEX, NULL, REP_REQ_TYPE_OF_ZONE_REQUEST_16_BIT14_15, "", HFILL
                }
        },
        {       /* second byte */
                &hf_rep_rsp_zone_spec_phy_cinr_rep_deviation,
                {
-                       "Standard Deviation of CINR", "wimax.rep_req.zone_spec_phy_cinr_report.deviation",
+                       "Standard Deviation of CINR", "wmx.rep_req.zone_spec_phy_cinr_report.deviation",
                        FT_UINT8, BASE_DEC, NULL, REP_RSP_ZONE_SPEC_PHY_CINR_DEVIATION_MASK, "", HFILL
                }
        },
        {       /* first byte */
                &hf_rep_rsp_zone_spec_phy_cinr_rep_mean,
                {
-                       "Mean of Physical CINR", "wimax.rep_req.zone_spec_phy_cinr_report.mean",
+                       "Mean of Physical CINR", "wmx.rep_req.zone_spec_phy_cinr_report.mean",
                        FT_UINT8, BASE_DEC, NULL, REP_RSP_ZONE_SPEC_PHY_CINR_MEAN_MASK, "", HFILL
                }
        },
        {
                &hf_rep_rsp_zone_spec_phy_cinr_rep_report_type,
                {
-                       "CINR Report Type", "wimax.rep_req.zone_spec_phy_cinr_report.report_type",
+                       "CINR Report Type", "wmx.rep_req.zone_spec_phy_cinr_report.report_type",
                        FT_UINT8, BASE_DEC, VALS(vals_data_cinr_measurements), REP_RSP_ZONE_SPEC_PHY_CINR_REP_TYPE_MASK, "", HFILL
                }
        },
        {
                &hf_rep_rsp_zone_spec_phy_cinr_rep_reserved1,
                {
-                       "Reserved", "wimax.rep_req.zone_spec_phy_cinr_report.reserved1",
+                       "Reserved", "wmx.rep_req.zone_spec_phy_cinr_report.reserved1",
                        FT_UINT8, BASE_HEX, NULL, REP_RSP_ZONE_SPEC_PHY_CINR_RSV1_MASK, "", HFILL
                }
        },
        {
                &hf_rep_rsp_zone_spec_phy_cinr_rep_reserved2,
                {
-                       "Reserved", "wimax.rep_req.zone_spec_phy_cinr_report.reserved2",
+                       "Reserved", "wmx.rep_req.zone_spec_phy_cinr_report.reserved2",
                        FT_UINT8, BASE_HEX, NULL, REP_RSP_ZONE_SPEC_PHY_CINR_RSV2_MASK, "", HFILL
                }
        },
        {       /* type 1.4 */
                &hf_rep_req_zone_spec_phy_cinr_request,
                {
-                       "Zone-specific Physical CINR Request", "wimax.rep_req.zone_spec_phy_cinr_request",
+                       "Zone-specific Physical CINR Request", "wmx.rep_req.zone_spec_phy_cinr_request",
                        FT_BYTES, BASE_HEX, NULL, 0x0, "", HFILL
                }
        },
        {
                &hf_rep_req_zone_spec_phy_cinr_req_bit0_2,
                {
-                       "Type Of Zone On Which CINR Is To Be Reported", "wimax.rep_req.zone_spec_phy_cinr_request.bit0_2",
+                       "Type Of Zone On Which CINR Is To Be Reported", "wmx.rep_req.zone_spec_phy_cinr_request.bit0_2",
                        FT_UINT24, BASE_HEX, VALS(vals_type_of_zones), REP_REQ_TYPE_OF_ZONE_REQUEST_BIT0_2, "", HFILL
                }
        },
        {
                &hf_rep_req_zone_spec_phy_cinr_req_bit3,
                {
-                       "STC Zone", "wimax.rep_req.zone_spec_phy_cinr_request.bit3",
+                       "STC Zone", "wmx.rep_req.zone_spec_phy_cinr_request.bit3",
                        FT_BOOLEAN, 24, NULL, REP_REQ_TYPE_OF_ZONE_REQUEST_BIT3, "", HFILL
                }
        },
        {
                &hf_rep_req_zone_spec_phy_cinr_req_bit4,
                {
-                       "AAS Zone", "wimax.rep_req.zone_spec_phy_cinr_request.bit4",
+                       "AAS Zone", "wmx.rep_req.zone_spec_phy_cinr_request.bit4",
                        FT_BOOLEAN, 24, NULL, REP_REQ_TYPE_OF_ZONE_REQUEST_BIT4, "", HFILL
                }
        },
        {
                &hf_rep_req_zone_spec_phy_cinr_req_bit5_6,
                {
-                       "PRBS ID", "wimax.rep_req.zone_spec_phy_cinr_request.bit5_6",
+                       "PRBS ID", "wmx.rep_req.zone_spec_phy_cinr_request.bit5_6",
                        FT_UINT24, BASE_HEX, NULL, REP_REQ_TYPE_OF_ZONE_REQUEST_BIT5_6, "", HFILL
                }
        },
        {
                &hf_rep_req_zone_spec_phy_cinr_req_bit7,
                {
-                       "CINR Measurement Report", "wimax.rep_req.zone_spec_phy_cinr_request.bit7",
+                       "CINR Measurement Report", "wmx.rep_req.zone_spec_phy_cinr_request.bit7",
                        FT_UINT24, BASE_HEX, VALS(vals_data_cinr_measurements), REP_REQ_TYPE_OF_ZONE_REQUEST_BIT7, "", HFILL
                }
        },
        {
                &hf_rep_req_zone_spec_phy_cinr_req_bit8_13,
                {
-                       "PUSC Major Group Map", "wimax.rep_req.zone_spec_phy_cinr_request.bit8_13",
+                       "PUSC Major Group Map", "wmx.rep_req.zone_spec_phy_cinr_request.bit8_13",
                        FT_UINT24, BASE_HEX, NULL, REP_REQ_TYPE_OF_ZONE_REQUEST_BIT8_13, "", HFILL
                }
        },
        {
                &hf_rep_req_zone_spec_phy_cinr_req_bit14_17,
                {
-                       "Alpha (ave) in multiples of 1/16", "wimax.rep_req.zone_spec_phy_cinr_request.bit14_17",
+                       "Alpha (ave) in multiples of 1/16", "wmx.rep_req.zone_spec_phy_cinr_request.bit14_17",
                        FT_UINT24, BASE_DEC, NULL, REP_REQ_TYPE_OF_ZONE_REQUEST_BIT14_17, "", HFILL
                }
        },
        {
                &hf_rep_req_zone_spec_phy_cinr_req_bit18,
                {
-                       "CINR Report Type", "wimax.rep_req.zone_spec_phy_cinr_request.bit18",
+                       "CINR Report Type", "wmx.rep_req.zone_spec_phy_cinr_request.bit18",
                        FT_UINT24, BASE_HEX, VALS(vals_cinr_report_types), REP_REQ_TYPE_OF_ZONE_REQUEST_BIT18, "", HFILL
                }
        },
        {
                &hf_rep_req_zone_spec_phy_cinr_req_bit19_23,
                {
-                       "Reserved", "wimax.rep_req.zone_spec_phy_cinr_request.bit19_23",
+                       "Reserved", "wmx.rep_req.zone_spec_phy_cinr_request.bit19_23",
                        FT_UINT24, BASE_HEX, NULL, REP_REQ_TYPE_OF_ZONE_REQUEST_BIT19_23, "", HFILL
                }
        },
        {
                &hf_rep_rsp_message_type,
                {
-                       "MAC Management Message Type", "wimax.macmgtmsgtype.rep_rsp",
+                       "MAC Management Message Type", "wmx.macmgtmsgtype.rep_rsp",
                        FT_UINT8, BASE_DEC, NULL, 0x0, "", HFILL
                }
        },
        {       /* 6.3 */
                &hf_rep_rsp_channel_selectivity_report,
                {
-                       "Channel Selectivity Report", "wimax.rep_rsp.channel_selectivity_report",
+                       "Channel Selectivity Report", "wmx.rep_rsp.channel_selectivity_report",
                        FT_BYTES, BASE_HEX, NULL, 0x0, "", HFILL
                }
        },
        {
                &hf_rep_rsp_channel_selectivity_rep_frequency_a,
                {
-                       "Frequency Selectivity Report a", "wimax.rep_rsp.channel_selectivity_report.frequency_a",
+                       "Frequency Selectivity Report a", "wmx.rep_rsp.channel_selectivity_report.frequency_a",
                        FT_UINT8, BASE_HEX, NULL, 0x0, "", HFILL
                }
        },
        {
                &hf_rep_rsp_channel_selectivity_rep_frequency_b,
                {
-                       "Frequency Selectivity Report b", "wimax.rep_rsp.channel_selectivity_report.frequency_b",
+                       "Frequency Selectivity Report b", "wmx.rep_rsp.channel_selectivity_report.frequency_b",
                        FT_UINT8, BASE_HEX, NULL, 0x0, "", HFILL
                }
        },
        {
                &hf_rep_rsp_channel_selectivity_rep_frequency_c,
                {
-                       "Frequency Selectivity Report c", "wimax.rep_rsp.channel_selectivity_report.frequency_c",
+                       "Frequency Selectivity Report c", "wmx.rep_rsp.channel_selectivity_report.frequency_c",
                        FT_UINT8, BASE_HEX, NULL, 0x0, "", HFILL
                }
        },
        {
                &hf_rep_rsp_channel_type_report,
                {
-                       "Channel Type Report", "wimax.rep_rsp.channel_type_report",
+                       "Channel Type Report", "wmx.rep_rsp.channel_type_report",
                        FT_BYTES, BASE_HEX, NULL, 0x0, "", HFILL
                }
        },
        {
                &hf_rep_rsp_channel_type_band_amc,
                {
-                       "Band AMC", "wimax.rep_rsp.channel_type_report.band_amc",
+                       "Band AMC", "wmx.rep_rsp.channel_type_report.band_amc",
                        FT_UINT32, BASE_HEX, NULL, 0x0, "", HFILL
                }
        },
        {
                &hf_rep_rsp_channel_type_enhanced_band_amc,
                {
-                       "Enhanced Band AMC", "wimax.rep_rsp.channel_type_report.enhanced_band_amc",
+                       "Enhanced Band AMC", "wmx.rep_rsp.channel_type_report.enhanced_band_amc",
                        FT_BYTES, BASE_HEX, NULL, 0x0, "", HFILL
                }
        },
        {
                &hf_rep_rsp_channel_type_safety_channel,
                {
-                       "Safety Channel", "wimax.rep_rsp.channel_type_report.safety_channel",
+                       "Safety Channel", "wmx.rep_rsp.channel_type_report.safety_channel",
                        FT_BYTES, BASE_HEX, NULL, 0x0, "", HFILL
                }
        },
        {
                &hf_rep_rsp_channel_type_sounding,
                {
-                       "Sounding", "wimax.rep_rsp.channel_type_report.sounding",
+                       "Sounding", "wmx.rep_rsp.channel_type_report.sounding",
                        FT_UINT8, BASE_HEX, NULL, 0x0, "", HFILL
                }
        },
        {
                &hf_rep_rsp_channel_type_subchannel,
                {
-                       "Normal Subchannel", "wimax.rep_rsp.channel_type_report.subchannel",
+                       "Normal Subchannel", "wmx.rep_rsp.channel_type_report.subchannel",
                        FT_UINT8, BASE_HEX, NULL, 0x0, "", HFILL
                }
        },
        {
                &hf_rep_rsp_preamble_effective_cinr_report,
                {
-                       "Preamble Effective CINR Report", "wimax.rep_rsp.preamble_effective_cinr_report",
+                       "Preamble Effective CINR Report", "wmx.rep_rsp.preamble_effective_cinr_report",
                        FT_BYTES, BASE_HEX, NULL, 0x0, "", HFILL
                }
        },
        {       /* 6.1 */
                &hf_rep_rsp_preamble_effective_cinr_rep_configuration_1,
                {
-                       "The Estimation Of Effective CINR Measured From Preamble For Frequency Reuse Configuration=1", "wimax.rep_rsp.preamble_effective_cinr_report.configuration_1",
+                       "The Estimation Of Effective CINR Measured From Preamble For Frequency Reuse Configuration=1", "wmx.rep_rsp.preamble_effective_cinr_report.configuration_1",
                        FT_BYTES, BASE_HEX, NULL, 0x0, "", HFILL
                }
        },
        {       /* 6.2 */
                &hf_rep_rsp_preamble_effective_cinr_rep_configuration_3,
                {
-                       "The Estimation Of Effective CINR Measured From Preamble For Frequency Reuse Configuration=3", "wimax.rep_rsp.preamble_effective_cinr_report.configuration_3",
+                       "The Estimation Of Effective CINR Measured From Preamble For Frequency Reuse Configuration=3", "wmx.rep_rsp.preamble_effective_cinr_report.configuration_3",
                        FT_BYTES, BASE_HEX, NULL, 0x0, "", HFILL
                }
        },
        {
                &hf_rep_rsp_preamble_phy_cinr_report,
                {
-                       "Preamble Physical CINR Report", "wimax.rep_rsp.preamble_phy_cinr_report",
+                       "Preamble Physical CINR Report", "wmx.rep_rsp.preamble_phy_cinr_report",
                        FT_BYTES, BASE_HEX, NULL, 0x0, "", HFILL
                }
        },
        {       /* 4.3 */
                &hf_rep_rsp_preamble_phy_cinr_rep_band_amc_zone,
                {
-                       "The Estimation Of Physical CINR Measured From Preamble For Band AMC Zone", "wimax.rep_rsp.preamble_phy_cinr_report.band_amc_zone",
+                       "The Estimation Of Physical CINR Measured From Preamble For Band AMC Zone", "wmx.rep_rsp.preamble_phy_cinr_report.band_amc_zone",
                        FT_BYTES, BASE_HEX, NULL, 0x0, "", HFILL
                }
        },
        {       /* 4.1 */
                &hf_rep_rsp_preamble_phy_cinr_rep_configuration_1,
                {
-                       "The Estimation Of Physical CINR Measured From Preamble For Frequency Reuse Configuration=1", "wimax.rep_rsp.preamble_phy_cinr_report.configuration_1",
+                       "The Estimation Of Physical CINR Measured From Preamble For Frequency Reuse Configuration=1", "wmx.rep_rsp.preamble_phy_cinr_report.configuration_1",
                        FT_BYTES, BASE_HEX, NULL, 0x0, "", HFILL
                }
        },
        {       /* 4.2 */
                &hf_rep_rsp_preamble_phy_cinr_rep_configuration_3,
                {
-                       "The Estimation Of Physical CINR Measured From Preamble For Frequency Reuse Configuration=3", "wimax.rep_rsp.preamble_phy_cinr_report.configuration_3",
+                       "The Estimation Of Physical CINR Measured From Preamble For Frequency Reuse Configuration=3", "wmx.rep_rsp.preamble_phy_cinr_report.configuration_3",
                        FT_BYTES, BASE_HEX, NULL, 0x0, "", HFILL
                }
        },
@@ -753,217 +753,217 @@ static hf_register_info hf_rep[] =
        {
                &hf_rep_rsp_report_type,
                {
-                       "Report Type", "wimax.rep_rsp.report_type",
+                       "Report Type", "wmx.rep_rsp.report_type",
                        FT_BYTES, BASE_HEX, NULL, 0x0, "", HFILL
                }
        },
        {
                &hf_rep_rsp_report_type_basic_report,
                {
-                       "Basic Report", "wimax.rep_rsp.report_type.basic_report",
+                       "Basic Report", "wmx.rep_rsp.report_type.basic_report",
                        FT_BYTES, BASE_HEX, NULL, 0x0, "", HFILL
                }
        },
        {
                &hf_rep_rsp_report_type_basic_report_bit0,
                {
-                       "Wireless HUMAN Detected", "wimax.rep_rsp.report_type.basic_report.bit0",
+                       "Wireless HUMAN Detected", "wmx.rep_rsp.report_type.basic_report.bit0",
                        FT_BOOLEAN, 8, NULL, REP_RSP_REPORT_TYPE_BASIC_REPORT_BIT0, "", HFILL
                }
        },
        {
                &hf_rep_rsp_report_type_basic_report_bit1,
                {
-                       "Unknown Transmission Detected", "wimax.rep_rsp.report_type.basic_report.bit1",
+                       "Unknown Transmission Detected", "wmx.rep_rsp.report_type.basic_report.bit1",
                        FT_BOOLEAN, 8, NULL, REP_RSP_REPORT_TYPE_BASIC_REPORT_BIT1, "", HFILL
                }
        },
        {
                &hf_rep_rsp_report_type_basic_report_bit2,
                {
-                       "Specific Spectrum User Detected", "wimax.rep_rsp.report_type.basic_report.bit2",
+                       "Specific Spectrum User Detected", "wmx.rep_rsp.report_type.basic_report.bit2",
                        FT_BOOLEAN, 8, NULL, REP_RSP_REPORT_TYPE_BASIC_REPORT_BIT2, "", HFILL
                }
        },
        {
                &hf_rep_rsp_report_type_basic_report_bit3,
                {
-                       "Channel Not Measured", "wimax.rep_rsp.report_type.basic_report.bit3",
+                       "Channel Not Measured", "wmx.rep_rsp.report_type.basic_report.bit3",
                        FT_BOOLEAN, 8, NULL, REP_RSP_REPORT_TYPE_BASIC_REPORT_BIT3, "", HFILL
                }
        },
        {
                &hf_rep_rsp_report_type_basic_report_reserved,
                {
-                       "Reserved", "wimax.rep_rsp.report_type.basic_report.reserved",
+                       "Reserved", "wmx.rep_rsp.report_type.basic_report.reserved",
                        FT_UINT8, BASE_HEX, NULL, REP_RSP_REPORT_TYPE_BASIC_REPORT_RSV, "", HFILL
                }
        },
        {
                &hf_rep_rsp_report_type_channel_number,
                {
-                       "Channel Number", "wimax.rep_rsp.report_type.channel_number",
+                       "Channel Number", "wmx.rep_rsp.report_type.channel_number",
                        FT_UINT8, BASE_DEC, NULL, 0x0, "", HFILL
                }
        },
        {
                &hf_rep_rsp_report_type_cinr_report,
                {
-                       "CINR Report", "wimax.rep_rsp.report_type.cinr_report",
+                       "CINR Report", "wmx.rep_rsp.report_type.cinr_report",
                        FT_BYTES, BASE_HEX, NULL, 0x0, "", HFILL
                }
        },
        {
                &hf_rep_rsp_report_type_cinr_report_deviation,
                {
-                       "CINR Standard Deviation", "wimax.rep_rsp.report_type.cinr_report_deviation",
+                       "CINR Standard Deviation", "wmx.rep_rsp.report_type.cinr_report_deviation",
                        FT_UINT8, BASE_DEC, NULL, 0x0, "", HFILL
                }
        },
        {
                &hf_rep_rsp_report_type_cinr_report_mean,
                {
-                       "CINR Mean", "wimax.rep_rsp.report_type.cinr_report_mean",
+                       "CINR Mean", "wmx.rep_rsp.report_type.cinr_report_mean",
                        FT_UINT8, BASE_DEC, NULL, 0x0, "", HFILL
                }
        },
        {
                &hf_rep_rsp_report_type_duration,
                {
-                       "Duration", "wimax.rep_rsp.report_type.duration",
+                       "Duration", "wmx.rep_rsp.report_type.duration",
                        FT_UINT24, BASE_HEX, NULL, 0x0, "", HFILL
                }
        },
        {
                &hf_rep_rsp_report_type_frame_number,
                {
-                       "Start Frame", "wimax.rep_rsp.report_type.frame_number",
+                       "Start Frame", "wmx.rep_rsp.report_type.frame_number",
                        FT_UINT16, BASE_DEC, NULL, 0x0, "", HFILL
                }
        },
        {
                &hf_rep_rsp_report_type_rssi_report,
                {
-                       "RSSI Report", "wimax.rep_rsp.report_type.rssi_report",
+                       "RSSI Report", "wmx.rep_rsp.report_type.rssi_report",
                        FT_BYTES, BASE_HEX, NULL, 0x0, "", HFILL
                }
        },
        {
                &hf_rep_rsp_report_type_rssi_report_deviation,
                {
-                       "RSSI Standard Deviation", "wimax.rep_rsp.report_type.rssi_report_deviation",
+                       "RSSI Standard Deviation", "wmx.rep_rsp.report_type.rssi_report_deviation",
                        FT_UINT8, BASE_DEC, NULL, 0x0, "", HFILL
                }
        },
        {
                &hf_rep_rsp_current_transmitted_power,
                {
-                       "Current Transmitted Power", "wimax.rep_rsp.current_transmitted_power",
+                       "Current Transmitted Power", "wmx.rep_rsp.current_transmitted_power",
                        FT_UINT8, BASE_DEC, NULL, 0x0, "", HFILL
                }
        },
        {
                &hf_rep_rsp_report_type_rssi_report_mean,
                {
-                       "RSSI Mean", "wimax.rep_rsp.report_type.rssi_report_mean",
+                       "RSSI Mean", "wmx.rep_rsp.report_type.rssi_report_mean",
                        FT_UINT8, BASE_DEC, NULL, 0x0, "", HFILL
                }
        },
        {
                &hf_rep_rsp_zone_spec_effective_cinr_report,
                {
-                       "Zone-specific Effective CINR Report", "wimax.rep_rsp.zone_spec_effective_cinr_report",
+                       "Zone-specific Effective CINR Report", "wmx.rep_rsp.zone_spec_effective_cinr_report",
                        FT_BYTES, BASE_HEX, NULL, 0x0, "", HFILL
                }
        },
        {       /* 5.5 */
                &hf_rep_rsp_zone_spec_effective_cinr_rep_amc_aas,
                {
-                       "AMC AAS Zone", "wimax.rep_rsp.zone_spec_effective_cinr_report.amc_aas",
+                       "AMC AAS Zone", "wmx.rep_rsp.zone_spec_effective_cinr_report.amc_aas",
                        FT_BYTES, BASE_HEX, NULL, 0x0, "", HFILL
                }
        },
        {       /* 5.3 */
                &hf_rep_rsp_zone_spec_effective_cinr_rep_fusc,
                {
-                       "FUSC Zone", "wimax.rep_rsp.zone_spec_effective_cinr_report.fusc",
+                       "FUSC Zone", "wmx.rep_rsp.zone_spec_effective_cinr_report.fusc",
                        FT_BYTES, BASE_HEX, NULL, 0x0, "", HFILL
                }
        },
        {       /* 5.4 */
                &hf_rep_rsp_zone_spec_effective_cinr_rep_optional_fusc,
                {
-                       "Optional FUSC Zone", "wimax.rep_rsp.zone_spec_effective_cinr_report.optional_fusc",
+                       "Optional FUSC Zone", "wmx.rep_rsp.zone_spec_effective_cinr_report.optional_fusc",
                        FT_BYTES, BASE_HEX, NULL, 0x0, "", HFILL
                }
        },
        {       /* 5.1 */
                &hf_rep_rsp_zone_spec_effective_cinr_rep_pusc_sc0,
                {
-                       "PUSC Zone (use all SC=0)", "wimax.rep_rsp.zone_spec_effective_cinr_report.pusc_sc0",
+                       "PUSC Zone (use all SC=0)", "wmx.rep_rsp.zone_spec_effective_cinr_report.pusc_sc0",
                        FT_BYTES, BASE_HEX, NULL, 0x0, "", HFILL
                }
        },
        {       /* 5.2 */
                &hf_rep_rsp_zone_spec_effective_cinr_rep_pusc_sc1,
                {
-                       "PUSC Zone (use all SC=1)", "wimax.rep_rsp.zone_spec_effective_cinr_report.pusc_sc1",
+                       "PUSC Zone (use all SC=1)", "wmx.rep_rsp.zone_spec_effective_cinr_report.pusc_sc1",
                        FT_BYTES, BASE_HEX, NULL, 0x0, "", HFILL
                }
        },
        {
                &hf_rep_rsp_zone_spec_phy_cinr_report,
                {
-                       "Zone-specific Physical CINR Report", "wimax.rep_rsp.zone_spec_phy_cinr_report",
+                       "Zone-specific Physical CINR Report", "wmx.rep_rsp.zone_spec_phy_cinr_report",
                        FT_BYTES, BASE_HEX, NULL, 0x0, "", HFILL
                }
        },
        {       /* 3.6 */
                &hf_rep_rsp_zone_spec_phy_cinr_rep_amc,
                {
-                       "AMC Zone", "wimax.rep_rsp.zone_spec_phy_cinr_report.amc",
+                       "AMC Zone", "wmx.rep_rsp.zone_spec_phy_cinr_report.amc",
                        FT_BYTES, BASE_HEX, NULL, 0x0, "", HFILL
                }
        },
        {       /* 3.3 */
                &hf_rep_rsp_zone_spec_phy_cinr_rep_fusc,
                {
-                       "FUSC Zone", "wimax.rep_rsp.zone_spec_phy_cinr_report.fusc",
+                       "FUSC Zone", "wmx.rep_rsp.zone_spec_phy_cinr_report.fusc",
                        FT_BYTES, BASE_HEX, NULL, 0x0, "", HFILL
                }
        },
        {       /* 3.4 */
                &hf_rep_rsp_zone_spec_phy_cinr_rep_optional_fusc,
                {
-                       "Optional FUSC Zone", "wimax.rep_rsp.zone_spec_phy_cinr_report.optional_fusc",
+                       "Optional FUSC Zone", "wmx.rep_rsp.zone_spec_phy_cinr_report.optional_fusc",
                        FT_BYTES, BASE_HEX, NULL, 0x0, "", HFILL
                }
        },
        {       /* 3.1 */
                &hf_rep_rsp_zone_spec_phy_cinr_rep_pusc_sc0,
                {
-                       "PUSC Zone (use all SC=0)", "wimax.rep_rsp.zone_spec_phy_cinr_report.pusc_sc0",
+                       "PUSC Zone (use all SC=0)", "wmx.rep_rsp.zone_spec_phy_cinr_report.pusc_sc0",
                        FT_BYTES, BASE_HEX, NULL, 0x0, "", HFILL
                }
        },
        {       /* 3.2 */
                &hf_rep_rsp_zone_spec_phy_cinr_rep_pusc_sc1,
                {
-                       "PUSC Zone (use all SC=1)", "wimax.rep_rsp.zone_spec_phy_cinr_report.pusc_sc1",
+                       "PUSC Zone (use all SC=1)", "wmx.rep_rsp.zone_spec_phy_cinr_report.pusc_sc1",
                        FT_BYTES, BASE_HEX, NULL, 0x0, "", HFILL
                }
        },
        {       /* 3.5 */
                &hf_rep_rsp_zone_spec_phy_cinr_rep_safety_channel,
                {
-                       "Safety Channel", "wimax.rep_rsp.zone_spec_phy_cinr_report.safety_channel",
+                       "Safety Channel", "wmx.rep_rsp.zone_spec_phy_cinr_report.safety_channel",
                        FT_BYTES, BASE_HEX, NULL, 0x0, "", HFILL
                }
        },
        {
                &hf_rep_unknown_type,
                {
-                       "Unknown TLV type", "wimax.rep.unknown_tlv_type",
+                       "Unknown TLV type", "wmx.rep.unknown_tlv_type",
                        FT_BYTES, BASE_HEX, NULL, 0x0, "", HFILL
                }
        }
@@ -977,7 +977,7 @@ void proto_register_mac_mgmt_msg_rep(void)
                proto_mac_mgmt_msg_rep_decoder = proto_register_protocol (
                                                        "WiMax REP-REQ/RSP Messages", /* name */
                                                        "WiMax REP-REQ/RSP (rep)", /* short name */
-                                                       "rep" /* abbrev */
+                                                       "wmx.rep" /* abbrev */
                                                        );
 
                proto_register_field_array(proto_mac_mgmt_msg_rep_decoder, hf_rep, array_length(hf_rep));
index 1d73a834587089a394d7b464edaa880249d16f36..a4711f5c144342f40f292893abeb967230de15e1 100644 (file)
@@ -68,15 +68,15 @@ static hf_register_info hf_res_cmd[] =
 {
        {
                &hf_res_cmd_message_type,
-               {"MAC Management Message Type", "wimax.macmgtmsgtype.res_cmd", FT_UINT8, BASE_DEC, NULL, 0x0, "", HFILL}
+               {"MAC Management Message Type", "wmx.macmgtmsgtype.res_cmd", FT_UINT8, BASE_DEC, NULL, 0x0, "", HFILL}
        },
        {
                &hf_res_cmd_invalid_tlv,
-               {"Invalid TLV", "wimax.res_cmd.invalid_tlv", FT_BYTES, BASE_HEX, NULL, 0, "", HFILL}
+               {"Invalid TLV", "wmx.res_cmd.invalid_tlv", FT_BYTES, BASE_HEX, NULL, 0, "", HFILL}
        },
        {
                &hf_res_cmd_unknown_type,
-               {"Unknown TLV type", "wimax.res_cmd.unknown_tlv_type", FT_BYTES, BASE_HEX, NULL, 0x0, "", HFILL}
+               {"Unknown TLV type", "wmx.res_cmd.unknown_tlv_type", FT_BYTES, BASE_HEX, NULL, 0x0, "", HFILL}
        }
 };
 
@@ -88,7 +88,7 @@ void proto_register_mac_mgmt_msg_res_cmd(void)
                proto_mac_mgmt_msg_res_cmd_decoder = proto_register_protocol (
                                                        "WiMax RES-CMD Message", /* name */
                                                        "WiMax RES-CMD (res)", /* short name */
-                                                       "res" /* abbrev */
+                                                       "wmx.res" /* abbrev */
                                                        );
 
                proto_register_field_array(proto_mac_mgmt_msg_res_cmd_decoder, hf_res_cmd, array_length(hf_res_cmd));
index 3f18c7f3b6d57811561b44be7e8d78c376b00290..1d26b97be8bb9f6d380cf35b4d64f28902479eea 100644 (file)
@@ -141,238 +141,238 @@ static hf_register_info hf[] =
        {
                &hf_rng_activation_of_power_saving_class,
                {
-                       "Activation of Power Saving Class (Types 1 and 2 only)", "wimax.rng.power_save.activate",
+                       "Activation of Power Saving Class (Types 1 and 2 only)", "wmx.rng.power_save.activate",
                        FT_BOOLEAN, 8, TFS(&tfs_rng_activate), 0x02, "", HFILL
                }
        },
        {
                &hf_rng_power_saving_class_id,
                {
-                       "Power Saving Class ID", "wimax.rng.power_save.class_id",
+                       "Power Saving Class ID", "wmx.rng.power_save.class_id",
                        FT_UINT8, BASE_DEC, NULL, 0x0, "", HFILL
                }
        },
        {
                &hf_rng_power_saving_class_type,
                {
-                       "Power Saving Class Type", "wimax.rng.power_save.class_type",
+                       "Power Saving Class Type", "wmx.rng.power_save.class_type",
                        FT_UINT8, BASE_DEC, NULL, 0x0, "", HFILL
                }
        },
        {
                &hf_rng_definition_of_power_saving_class_present,
                {
-                       "Definition of Power Saving Class present", "wimax.rng.power_save.definition_present",
+                       "Definition of Power Saving Class present", "wmx.rng.power_save.definition_present",
                        FT_UINT8, BASE_DEC, NULL, 0x01, "", HFILL
                }
        },
        {
                &hf_rng_power_saving_final_sleep_window_base,
                {
-                       "Final-sleep window base (measured in frames)", "wimax.rng.power_save.final_sleep_window_base",
+                       "Final-sleep window base (measured in frames)", "wmx.rng.power_save.final_sleep_window_base",
                        FT_UINT8, BASE_DEC, NULL, 0x0, "", HFILL
                }
        },
        {
                &hf_rng_power_saving_final_sleep_window_exp,
                {
-                       "Final-sleep window exponent (measured in frames)", "wimax.rng.power_save.final_sleep_window_exp",
+                       "Final-sleep window exponent (measured in frames)", "wmx.rng.power_save.final_sleep_window_exp",
                        FT_UINT8, BASE_DEC, NULL, 0x0, "", HFILL
                }
        },
        {
                &hf_rng_power_saving_first_sleep_window_frame,
                {
-                       "Start frame number for first sleep window", "wimax.rng.power_save.first_sleep_window_frame",
+                       "Start frame number for first sleep window", "wmx.rng.power_save.first_sleep_window_frame",
                        FT_UINT8, BASE_DEC, NULL, 0x0, "", HFILL
                }
        },
        {
                &hf_rng_power_saving_included_cid,
                {
-                       "CID of connection to be included into the Power Saving Class.", "wimax.rng.power_save.included_cid",
+                       "CID of connection to be included into the Power Saving Class.", "wmx.rng.power_save.included_cid",
                        FT_UINT16, BASE_DEC, NULL, 0x0, "", HFILL
                }
        },
        {
                &hf_rng_power_saving_initial_sleep_window,
                {
-                       "Initial-sleep window", "wimax.rng.power_save.initial_sleep_window",
+                       "Initial-sleep window", "wmx.rng.power_save.initial_sleep_window",
                        FT_UINT8, BASE_DEC, NULL, 0x0, "", HFILL
                }
        },
        {
                &hf_rng_power_saving_listening_window,
                {
-                       "Listening window duration (measured in frames)", "wimax.rng.power_save.listening_window",
+                       "Listening window duration (measured in frames)", "wmx.rng.power_save.listening_window",
                        FT_UINT8, BASE_DEC, NULL, 0x0, "", HFILL
                }
        },
        {
                &hf_rng_power_saving_mgmt_connection_direction,
                {
-                       "Direction for management connection added to Power Saving Class", "wimax.rng.power_save.mgmt_connection_direction",
+                       "Direction for management connection added to Power Saving Class", "wmx.rng.power_save.mgmt_connection_direction",
                        FT_UINT8, BASE_DEC, NULL, 0x0, "", HFILL
                }
        },
        {
                &hf_rng_power_saving_class_reserved,
                {
-                       "Reserved", "wimax.rng.power_save.reserved",
+                       "Reserved", "wmx.rng.power_save.reserved",
                        FT_UINT8, BASE_DEC, NULL, 0xF8, "", HFILL
                }
        },
        {
                &hf_rng_power_saving_slpid,
                {
-                       "SLPID assigned by the BS whenever an MS is instructed to enter sleep mode", "wimax.rng.power_save.slpid",
+                       "SLPID assigned by the BS whenever an MS is instructed to enter sleep mode", "wmx.rng.power_save.slpid",
                        FT_UINT8, BASE_DEC, NULL, 0x0, "", HFILL
                }
        },
        {
                &hf_rng_trf_ind_required,
                {
-                       "BS shall transmit at least one TRF-IND message during each listening window of the Power Saving Class", "wimax.rng.power_save.trf_ind_required",
+                       "BS shall transmit at least one TRF-IND message during each listening window of the Power Saving Class", "wmx.rng.power_save.trf_ind_required",
                        FT_BOOLEAN, 8, TFS(&tfs_rng_activate), 0x04, "", HFILL
                }
        },
        {
                &hf_rng_req_message_type,
                {
-                       "MAC Management Message Type", "wimax.macmgtmsgtype.rng_req",
+                       "MAC Management Message Type", "wmx.macmgtmsgtype.rng_req",
                        FT_UINT8, BASE_DEC, NULL, 0x0, "", HFILL
                }
        },
        {
                &hf_rng_req_aas_broadcast,
                {
-                       "AAS broadcast capability", "wimax.rng_req.aas_broadcast",
+                       "AAS broadcast capability", "wmx.rng_req.aas_broadcast",
                        FT_BOOLEAN, 8, TFS(&tfs_rng_req_aas_broadcast), 0x00, "", HFILL
                }
        },
        {
                &hf_rng_req_ranging_anomalies_max_power,
                {
-                       "Meaning", "wimax.rng_req.anomalies.max_power",
+                       "Meaning", "wmx.rng_req.anomalies.max_power",
                        FT_BOOLEAN, 8, TFS(&tfs_rng_max_power), 0x04, "", HFILL
                }
        },
        {
                &hf_rng_req_ranging_anomalies_min_power,
                {
-                       "Meaning", "wimax.rng_req.anomalies.min_power",
+                       "Meaning", "wmx.rng_req.anomalies.min_power",
                        FT_BOOLEAN, 8, TFS(&tfs_rng_min_power), 0x02, "", HFILL
                }
        },
        {
                &hf_rng_req_ranging_anomalies_timing_adj,
                {
-                       "Meaning", "wimax.rng_req.anomalies.timing_adj",
+                       "Meaning", "wmx.rng_req.anomalies.timing_adj",
                        FT_BOOLEAN, 8, TFS(&tfs_rng_timing_adj), 0x01, "", HFILL
                }
        },
        {
                &hf_rng_req_cmac_key_count,
                {
-                       "CMAC Key Count", "wimax.rng_req.cmac_key_count",
+                       "CMAC Key Count", "wmx.rng_req.cmac_key_count",
                        FT_UINT16, BASE_DEC, NULL, 0x00, "", HFILL
                }
        },
        {
                &hf_rng_req_dl_burst_profile_lsb_ccc,
                {
-                       "LSB of CCC of DCD associated with DIUC", "wimax.rng_req.dl_burst_profile.ccc",
+                       "LSB of CCC of DCD associated with DIUC", "wmx.rng_req.dl_burst_profile.ccc",
                        FT_UINT8, BASE_DEC, NULL, 0xF0, "", HFILL
                }
        },
        {
                &hf_rng_req_dl_burst_profile_diuc,
                {
-                       "DIUC", "wimax.rng_req.dl_burst_profile.diuc",
+                       "DIUC", "wmx.rng_req.dl_burst_profile.diuc",
                        FT_UINT8, BASE_DEC, NULL, 0x0F, "", HFILL
                }
        },
        {
                &hf_tlv_type,
                {
-                       "Unknown TLV Type", "wimax.rng_req.unknown_tlv_type",
+                       "Unknown TLV Type", "wmx.rng_req.unknown_tlv_type",
                        FT_BYTES, BASE_HEX, NULL, 0, "", HFILL
                }
        },
        {
                &hf_rng_invalid_tlv,
                {
-                       "Invalid TLV", "wimax.rng_req.invalid_tlv",
+                       "Invalid TLV", "wmx.rng_req.invalid_tlv",
                        FT_BYTES, BASE_HEX, NULL, 0, "", HFILL
                }
        },
        {
                &hf_rng_req_ho_id,
                {
-                       "ID from the target BS for use in initial ranging during MS handover to it", "wimax.rng_req.ho_id",
+                       "ID from the target BS for use in initial ranging during MS handover to it", "wmx.rng_req.ho_id",
                        FT_UINT8, BASE_DEC, NULL, 0x0, "", HFILL
                }
        },
        {
                &hf_rng_req_power_down_indicator,
                {
-                       "Power down Indicator", "wimax.rng_req.power_down_indicator",
+                       "Power down Indicator", "wmx.rng_req.power_down_indicator",
                        FT_UINT8, BASE_DEC, NULL, 0x00, "", HFILL
                }
        },
        {
                &hf_rng_req_ranging_purpose_ho_indication,
                {
-                       "MS HO indication", "wimax.rng_req.ranging_purpose.ho_indication",
+                       "MS HO indication", "wmx.rng_req.ranging_purpose.ho_indication",
                        FT_UINT8, BASE_DEC, NULL, 0x01, "", HFILL
                }
        },
        {
                &hf_rng_req_ranging_purpose_reserved,
                {
-                       "Reserved", "wimax.rng_req.ranging_purpose.reserved",
+                       "Reserved", "wmx.rng_req.ranging_purpose.reserved",
                        FT_UINT8, BASE_DEC, NULL, 0xFC, "", HFILL
                }
        },
        {
                &hf_rng_req_ranging_purpose_location_update_request,
                {
-                       "Location Update Request", "wimax.rng_req.ranging_purpose.loc_update_req",
+                       "Location Update Request", "wmx.rng_req.ranging_purpose.loc_update_req",
                        FT_UINT8, BASE_DEC, VALS(vals_rng_req_ranging_purpose_location_update_request), 0x02, "", HFILL
                }
        },
        {
                &hf_rng_req_repetition_coding_level,
                {
-                       "Repetition coding level", "wimax.rng_req.repetition_coding_level",
+                       "Repetition coding level", "wmx.rng_req.repetition_coding_level",
                        FT_UINT8, BASE_DEC, VALS(vals_rng_req_repetition_coding_level), 0x03, "", HFILL
                }
        },
        {
                &hf_rng_req_requested_downlink_repetition_coding_level_reserved,
                {
-                       "Reserved", "wimax.rng_req.reserved",
+                       "Reserved", "wmx.rng_req.reserved",
                        FT_UINT8, BASE_DEC, NULL, 0xFC, "", HFILL
                }
        },
        {
                &hf_rng_req_reserved,
                {
-                       "Reserved", "wimax.rng_req.reserved",
+                       "Reserved", "wmx.rng_req.reserved",
                        FT_UINT8, BASE_DEC, NULL, 0x0, "", HFILL
                }
        },
        {
                &hf_rng_req_serving_bs_id,
                {
-                       "Former serving BS ID", "wimax.rng_req.serving_bs_id",
+                       "Former serving BS ID", "wmx.rng_req.serving_bs_id",
                        FT_ETHER, BASE_HEX, NULL, 0x00, "", HFILL
                }
        },
        {
                &hf_rng_req_ss_mac_address,
                {
-                       "SS MAC Address", "wimax.rng_req.ss_mac_address",
+                       "SS MAC Address", "wmx.rng_req.ss_mac_address",
                        FT_ETHER, BASE_HEX, NULL, 0x00, "", HFILL
                }
        }
@@ -483,7 +483,7 @@ void proto_register_mac_mgmt_msg_rng_req(void)
                proto_mac_mgmt_msg_rng_req_decoder = proto_register_protocol (
                                                        "WiMax RNG-REQ/RSP Messages", /* name */
                                                        "WiMax RNG-REQ/RSP (rng)", /* short name */
-                                                       "rng" /* abbrev */
+                                                       "wmx.rng" /* abbrev */
                                                        );
 
                proto_register_field_array(proto_mac_mgmt_msg_rng_req_decoder, hf, array_length(hf));
index 845e160c3f09a3985343f2b8d2d24f300f86d305..48a237f37fa11d5d494d01bb8c1488b04fd8a756 100644 (file)
@@ -286,70 +286,70 @@ static hf_register_info hf[] =
        {
                &hf_rng_rsp_message_type,
                {
-                       "MAC Management Message Type", "wimax.macmgtmsgtype.rng_rsp",
+                       "MAC Management Message Type", "wmx.macmgtmsgtype.rng_rsp",
                        FT_UINT8, BASE_DEC, NULL, 0x0, "", HFILL
                }
        },
        {
                &hf_rng_rsp_broadcast,
                {
-                       "AAS broadcast permission", "wimax.rng_rsp.aas_broadcast",
+                       "AAS broadcast permission", "wmx.rng_rsp.aas_broadcast",
                        FT_BOOLEAN, 8, TFS(&tfs_rng_rsp_aas_broadcast), 0x00, "", HFILL
                }
        },
        {
                &hf_rng_rsp_akid,
                {
-                       "AKId", "wimax.rng_rsp.akid",
+                       "AKId", "wmx.rng_rsp.akid",
                        FT_BYTES, BASE_NONE, NULL, 0x00, "", HFILL
                }
        },
        {
                &hf_rng_rsp_basic_cid,
                {
-                       "Basic CID", "wimax.rng_rsp.basic_cid",
+                       "Basic CID", "wmx.rng_rsp.basic_cid",
                        FT_UINT16, BASE_DEC, NULL, 0x00, "", HFILL
                }
        },
        {
                &hf_rng_rsp_bs_random,
                {
-                       "BS_Random", "wimax.rng_rsp.bs_random",
+                       "BS_Random", "wmx.rng_rsp.bs_random",
                        FT_BYTES, BASE_NONE, NULL, 0x00, "", HFILL
                }
        },
        {
                &hf_rng_rsp_config_change_count_of_dcd,
                {
-                       "Configuration Change Count value of DCD defining DIUC associated burst profile", "wimax.rng_rsp.config_change_count_of_dcd",
+                       "Configuration Change Count value of DCD defining DIUC associated burst profile", "wmx.rng_rsp.config_change_count_of_dcd",
                        FT_UINT16, BASE_HEX, NULL, 0xFF00, "", HFILL
                }
        },
        {
                &hf_rng_rsp_dl_freq_override,
                {
-                       "Downlink Frequency Override", "wimax.rng_rsp.dl_freq_override",
+                       "Downlink Frequency Override", "wmx.rng_rsp.dl_freq_override",
                        FT_UINT32, BASE_DEC, NULL, 0x00, "", HFILL
                }
        },
        {
                &hf_rng_rsp_dl_operational_burst_profile_ccc,
                {
-                       "CCC value of DCD defining the burst profile associated with DIUC", "wimax.rng_rsp.dl_op_burst_prof.ccc",
+                       "CCC value of DCD defining the burst profile associated with DIUC", "wmx.rng_rsp.dl_op_burst_prof.ccc",
                        FT_UINT16, BASE_DEC, NULL, 0x00FF, "", HFILL
                }
        },
        {
                &hf_rng_rsp_dl_operational_burst_profile_diuc,
                {
-                       "The least robust DIUC that may be used by the BS for transmissions to the SS", "wimax.rng_rsp.dl_op_burst_prof.diuc",
+                       "The least robust DIUC that may be used by the BS for transmissions to the SS", "wmx.rng_rsp.dl_op_burst_prof.diuc",
                        FT_UINT16, BASE_DEC, NULL, 0xFF00, "", HFILL
                }
        },
        {
                &hf_rng_rsp_dl_operational_burst_profile,
                {
-                       "Downlink Operational Burst Profile", "wimax.rng_rsp.dl_op_burst_profile",
+                       "Downlink Operational Burst Profile", "wmx.rng_rsp.dl_op_burst_profile",
                        FT_UINT16, BASE_HEX, NULL, 0x00, "", HFILL
                }
        },
@@ -357,21 +357,21 @@ static hf_register_info hf[] =
        {
                &hf_rng_rsp_dl_op_burst_profile_ofdma,
                {
-                       "Downlink Operational Burst Profile for OFDMA", "wimax.rng_rsp.dl_op_burst_profile_ofdma",
+                       "Downlink Operational Burst Profile for OFDMA", "wmx.rng_rsp.dl_op_burst_profile_ofdma",
                        FT_UINT16, BASE_HEX, NULL, 0x00, "", HFILL
                }
        },
        {
                &hf_rng_rsp_frame_number2,
                {
-                       "The 8 least significant bits of the frame number of the OFDMA frame where the SS sent the ranging code", "wimax.rng_rsp.eight_bit_frame_num",
+                       "The 8 least significant bits of the frame number of the OFDMA frame where the SS sent the ranging code", "wmx.rng_rsp.eight_bit_frame_num",
                        FT_UINT32, BASE_DEC, NULL, 0x000000FF, "", HFILL
                }
        },
        {
                &hf_rng_rsp_frame_number,
                {
-                       "Frame number", "wimax.rng_rsp.frame_number",
+                       "Frame number", "wmx.rng_rsp.frame_number",
                        FT_UINT24, BASE_DEC, NULL, 0x00, "", HFILL
                }
        },
@@ -379,301 +379,301 @@ static hf_register_info hf[] =
        {
                &hf_rng_rsp_ho_id,
                {
-                       "HO ID", "wimax.rng_rsp.ho_id",
+                       "HO ID", "wmx.rng_rsp.ho_id",
                        FT_UINT8, BASE_HEX, NULL, 0x00, "", HFILL
                }
        },
        {
                &hf_rng_rsp_ho_process_optimization,
                {
-                       "HO Process Optimization", "wimax.rng_rsp.ho_process_optimization",
+                       "HO Process Optimization", "wmx.rng_rsp.ho_process_optimization",
                        FT_UINT16, BASE_HEX, NULL, 0x0000, "", HFILL
                }
        },
        {
                &hf_rng_rsp_ho_process_optimization_0,
                {
-                       "Bit #0", "wimax.rng_rsp.ho_process_optimization.omit_sbc_req",
+                       "Bit #0", "wmx.rng_rsp.ho_process_optimization.omit_sbc_req",
                        FT_UINT16, BASE_HEX, VALS(vals_rng_rsp_ho_process_optimization_0), 0x0001, "", HFILL
                }
        },
        {
                &hf_rng_rsp_ho_process_optimization_1_2,
                {
-                       "Bits #1-2", "wimax.rng_rsp.ho_process_optimization.perform_reauthentication",
+                       "Bits #1-2", "wmx.rng_rsp.ho_process_optimization.perform_reauthentication",
                        FT_UINT16, BASE_HEX, VALS(vals_rng_rsp_ho_process_optimization_1_2), 0x0006, "", HFILL
                }
        },
        {
                &hf_rng_rsp_ho_process_optimization_3,
                {
-                       "Bit #3", "wimax.rng_rsp.ho_process_optimization.omit_network_address",
+                       "Bit #3", "wmx.rng_rsp.ho_process_optimization.omit_network_address",
                        FT_UINT16, BASE_HEX, VALS(vals_rng_rsp_ho_process_optimization_3), 0x0008, "", HFILL
                }
        },
        {
                &hf_rng_rsp_ho_process_optimization_4,
                {
-                       "Bit #4", "wimax.rng_rsp.ho_process_optimization.omit_time_of_day",
+                       "Bit #4", "wmx.rng_rsp.ho_process_optimization.omit_time_of_day",
                        FT_UINT16, BASE_HEX, VALS(vals_rng_rsp_ho_process_optimization_4), 0x0010, "", HFILL
                }
        },
        {
                &hf_rng_rsp_ho_process_optimization_5,
                {
-                       "Bit #5", "wimax.rng_rsp.ho_process_optimization.omit_tftp",
+                       "Bit #5", "wmx.rng_rsp.ho_process_optimization.omit_tftp",
                        FT_UINT16, BASE_HEX, VALS(vals_rng_rsp_ho_process_optimization_5), 0x0020, "", HFILL
                }
        },
        {
                &hf_rng_rsp_ho_process_optimization_6,
                {
-                       "Bit #6", "wimax.rng_rsp.ho_process_optimization.transfer_or_sharing",
+                       "Bit #6", "wmx.rng_rsp.ho_process_optimization.transfer_or_sharing",
                        FT_UINT16, BASE_HEX, VALS(vals_rng_rsp_ho_process_optimization_6), 0x0040, "", HFILL
                }
        },
        {
                &hf_rng_rsp_ho_process_optimization_7,
                {
-                       "Bit #7", "wimax.rng_rsp.ho_process_optimization.omit_reg_req",
+                       "Bit #7", "wmx.rng_rsp.ho_process_optimization.omit_reg_req",
                        FT_UINT16, BASE_HEX, VALS(vals_rng_rsp_ho_process_optimization_7), 0x0080, "", HFILL
                }
        },
        {
                &hf_rng_rsp_ho_process_optimization_8,
                {
-                       "Bit #8", "wimax.rng_rsp.ho_process_optimization.unsolicited_sbc_rsp",
+                       "Bit #8", "wmx.rng_rsp.ho_process_optimization.unsolicited_sbc_rsp",
                        FT_UINT16, BASE_HEX, VALS(vals_rng_rsp_ho_process_optimization_8), 0x0100, "", HFILL
                }
        },
        {
                &hf_rng_rsp_ho_process_optimization_9,
                {
-                       "Bit #9", "wimax.rng_rsp.ho_process_optimization.post_ho_reentry",
+                       "Bit #9", "wmx.rng_rsp.ho_process_optimization.post_ho_reentry",
                        FT_UINT16, BASE_HEX, VALS(vals_rng_rsp_ho_process_optimization_9), 0x0200, "", HFILL
                }
        },
        {
                &hf_rng_rsp_ho_process_optimization_10,
                {
-                       "Bit #10", "wimax.rng_rsp.ho_process_optimization.unsolicited_reg_rsp",
+                       "Bit #10", "wmx.rng_rsp.ho_process_optimization.unsolicited_reg_rsp",
                        FT_UINT16, BASE_HEX, VALS(vals_rng_rsp_ho_process_optimization_10), 0x0400, "", HFILL
                }
        },
        {
                &hf_rng_rsp_ho_process_optimization_11,
                {
-                       "Bit #11", "wimax.rng_rsp.ho_process_optimization.virtual_sdu_sn",
+                       "Bit #11", "wmx.rng_rsp.ho_process_optimization.virtual_sdu_sn",
                        FT_UINT16, BASE_HEX, VALS(vals_rng_rsp_ho_process_optimization_11), 0x0800, "", HFILL
                }
        },
        {
                &hf_rng_rsp_ho_process_optimization_12,
                {
-                       "Bit #12", "wimax.rng_rsp.ho_process_optimization.send_notification",
+                       "Bit #12", "wmx.rng_rsp.ho_process_optimization.send_notification",
                        FT_UINT16, BASE_HEX, VALS(vals_rng_rsp_ho_process_optimization_12), 0x1000, "", HFILL
                }
        },
        {
                &hf_rng_rsp_ho_process_optimization_13,
                {
-                       "Bit #13", "wimax.rng_rsp.ho_process_optimization.trigger_higher_layer_protocol",
+                       "Bit #13", "wmx.rng_rsp.ho_process_optimization.trigger_higher_layer_protocol",
                        FT_UINT16, BASE_HEX, VALS(vals_rng_rsp_ho_process_optimization_13), 0x2000, "", HFILL
                }
        },
        {
                &hf_rng_rsp_ho_process_optimization_14,
                {
-                       "Bit #14: Reserved", "wimax.rng_rsp.ho_process_optimization.reserved",
+                       "Bit #14: Reserved", "wmx.rng_rsp.ho_process_optimization.reserved",
                        FT_UINT16, BASE_HEX, NULL, 0x4000, "", HFILL
                }
        },
        {
                &hf_rng_rsp_ho_process_optimization_15,
                {
-                       "Bit #15: Reserved", "wimax.rng_rsp.ho_process_optimization.reserved",
+                       "Bit #15: Reserved", "wmx.rng_rsp.ho_process_optimization.reserved",
                        FT_UINT16, BASE_HEX, NULL, 0x8000, "", HFILL
                }
        },
        {
                &hf_rng_invalid_tlv,
                {
-                       "Invalid TLV", "wimax.rng_rsp.invalid_tlv", 
+                       "Invalid TLV", "wmx.rng_rsp.invalid_tlv", 
                        FT_BYTES, BASE_HEX, NULL, 0, "", HFILL
                }
        },
        {
                &hf_rng_rsp_least_robust_diuc,
                {
-                       "Least Robust DIUC that may be used by the BS for transmissions to the MS", "wimax.rng_rsp.least_robust_diuc",
+                       "Least Robust DIUC that may be used by the BS for transmissions to the MS", "wmx.rng_rsp.least_robust_diuc",
                        FT_UINT16, BASE_HEX, NULL, 0x000F, "", HFILL
                }
        },
        {
                &hf_rng_rsp_location_update_response,
                {
-                       "Location Update Response", "wimax.rng_rsp.location_update_response",
+                       "Location Update Response", "wmx.rng_rsp.location_update_response",
                        FT_UINT8, BASE_DEC, VALS(vals_rng_rsp_location_update_response), 0xFF, "", HFILL
                }
        },
        {
                &hf_rng_rsp_offset_freq_adjust,
                {
-                       "Offset Frequency Adjust", "wimax.rng_rsp.offset_freq_adjust",
+                       "Offset Frequency Adjust", "wmx.rng_rsp.offset_freq_adjust",
                        FT_INT32, BASE_DEC, NULL, 0x00, "", HFILL
                }
        },
        {
                &hf_rng_rsp_opportunity_number,
                {
-                       "Initial ranging opportunity number", "wimax.rng_rsp.opportunity_number",
+                       "Initial ranging opportunity number", "wmx.rng_rsp.opportunity_number",
                        FT_UINT8, BASE_DEC, NULL, 0x00, "", HFILL
                }
        },
        {
                &hf_rng_rsp_paging_cycle,
                {
-                       "Paging Cycle", "wimax.rng_rsp.paging_cycle",
+                       "Paging Cycle", "wmx.rng_rsp.paging_cycle",
                        FT_UINT16, BASE_DEC, NULL, 0x00, "", HFILL
                }
        },
        {
                &hf_rng_rsp_paging_group_id,
                {
-                       "Paging Group ID", "wimax.rng_rsp.paging_group_id",
+                       "Paging Group ID", "wmx.rng_rsp.paging_group_id",
                        FT_UINT16, BASE_DEC, NULL, 0x00, "", HFILL
                }
        },
        {
                &hf_rng_rsp_paging_information,
                {
-                       "Paging Information", "wimax.rng_rsp.paging_information",
+                       "Paging Information", "wmx.rng_rsp.paging_information",
                        FT_BYTES, BASE_DEC, NULL, 0x00, "", HFILL
                }
        },
        {
                &hf_rng_rsp_paging_offset,
                {
-                       "Paging Offset", "wimax.rng_rsp.paging_offset",
+                       "Paging Offset", "wmx.rng_rsp.paging_offset",
                        FT_UINT8, BASE_DEC, NULL, 0x00, "", HFILL
                }
        },
        {
                &hf_rng_rsp_power_level_adjust,
                {
-                       "Power Level Adjust", "wimax.rng_rsp.power_level_adjust",
+                       "Power Level Adjust", "wmx.rng_rsp.power_level_adjust",
                        FT_FLOAT, BASE_DEC, NULL, 0x00, "", HFILL
                }
        },
        {
                &hf_rng_rsp_primary_mgmt_cid,
                {
-                       "Primary Management CID", "wimax.rng_rsp.primary_mgmt_cid",
+                       "Primary Management CID", "wmx.rng_rsp.primary_mgmt_cid",
                        FT_UINT16, BASE_DEC, NULL, 0x00, "", HFILL
                }
        },
        {
                &hf_rng_rsp_ranging_code_index,
                {
-                       "The ranging code index that was sent by the SS", "wimax.rng_rsp.ranging_code_index",
+                       "The ranging code index that was sent by the SS", "wmx.rng_rsp.ranging_code_index",
                        FT_UINT32, BASE_DEC, NULL, 0x0000FF00, "", HFILL
                }
        },
        {
                &hf_rng_rsp_ranging_status,
                {
-                       "Ranging status", "wimax.rng_rsp.ranging_status",
+                       "Ranging status", "wmx.rng_rsp.ranging_status",
                        FT_UINT8, BASE_DEC, VALS(vals_rng_rsp_ranging_status), 0x00, "", HFILL
                }
        },
        {
                &hf_rng_rsp_ranging_subchan,
                {
-                       "Ranging code attributes", "wimax.rng_rsp.ranging_subchannel",
+                       "Ranging code attributes", "wmx.rng_rsp.ranging_subchannel",
                        FT_UINT32, BASE_HEX, NULL, 0x00, "", HFILL
                }
        },
        {
                &hf_rng_rsp_repetition_coding_indication,
                {
-                       "Repetition Coding Indication", "wimax.rng_rsp.repetition_coding_indication",
+                       "Repetition Coding Indication", "wmx.rng_rsp.repetition_coding_indication",
                        FT_UINT16, BASE_HEX, VALS(vals_rng_rsp_repetition_coding_indication), 0x00F0, "", HFILL
                }
        },
        {
                &hf_rng_req_reserved,
                {
-                       "Reserved", "wimax.rng_rsp.reserved",
+                       "Reserved", "wmx.rng_rsp.reserved",
                        FT_UINT8, BASE_DEC, NULL, 0x0, "", HFILL
                }
        },
        {
                &hf_rng_rsp_resource_retain_flag,
                {
-                       "The connection information for the MS is", "wimax.rng_rsp.resource_retain_flag",
+                       "The connection information for the MS is", "wmx.rng_rsp.resource_retain_flag",
                        FT_BOOLEAN, 8, TFS(&tfs_rng_rsp_resource_retain_flag), 0x00, "", HFILL
                }
        },
        {
                &hf_rng_rsp_service_level_prediction,
                {
-                       "Service Level Prediction", "wimax.rng_rsp.service_level_prediction",
+                       "Service Level Prediction", "wmx.rng_rsp.service_level_prediction",
                        FT_UINT8, BASE_DEC, VALS(vals_rng_rsp_level_of_service), 0x00, "", HFILL
                }
        },
        {
                &hf_rng_rsp_ss_mac_address,
                {
-                       "SS MAC Address", "wimax.rng_rsp.ss_mac_address",
+                       "SS MAC Address", "wmx.rng_rsp.ss_mac_address",
                        FT_ETHER, BASE_HEX, NULL, 0x00, "", HFILL
                }
        },
         {
                &hf_rng_rsp_subchannel_reference,
                {
-                       "OFDMA subchannel reference used to transmit the ranging code", "wimax.rng_rsp.subchannel_reference",
+                       "OFDMA subchannel reference used to transmit the ranging code", "wmx.rng_rsp.subchannel_reference",
                        FT_UINT32, BASE_DEC, NULL, 0x003f0000, "", HFILL
                }
        },
         {
                &hf_rng_rsp_time_symbol_reference,
                {
-                       "OFDM time symbol reference used to transmit the ranging code", "wimax.rng_rsp.time_symbol_reference",
+                       "OFDM time symbol reference used to transmit the ranging code", "wmx.rng_rsp.time_symbol_reference",
                        FT_UINT32, BASE_DEC, NULL, 0xFFC00000, "", HFILL
                }
        },
        {
                &hf_rng_rsp_timing_adjust,
                {
-                       "Timing Adjust", "wimax.rng_rsp.timing_adjust",
+                       "Timing Adjust", "wmx.rng_rsp.timing_adjust",
                        FT_FLOAT, BASE_DEC, NULL, 0x00, "", HFILL
                }
        },
        {
                &hf_rng_rsp_ul_channel_id,
                {
-                       "Uplink Channel ID", "wimax.rng_rsp.ul_chan_id",
+                       "Uplink Channel ID", "wmx.rng_rsp.ul_chan_id",
                        FT_UINT8, BASE_DEC, NULL, 0x00, "", HFILL
                }
        },
        {
                &hf_rng_rsp_ul_chan_id_override,
                {
-                       "Uplink channel ID Override", "wimax.rng_rsp.ul_chan_id_override",
+                       "Uplink channel ID Override", "wmx.rng_rsp.ul_chan_id_override",
                        FT_UINT8, BASE_DEC, NULL, 0x00, "", HFILL
                }
        },
        {
                &hf_tlv_type,
                {
-                       "Unknown TLV Type", "wimax.rng_rsp.unknown_tlv_type",
+                       "Unknown TLV Type", "wmx.rng_rsp.unknown_tlv_type",
                        FT_BYTES, BASE_NONE, NULL, 0x00, "", HFILL
                }
        },
        {
                &hf_tlv_value,
                {
-                       "Value", "wimax.rng_rsp.tlv_value",
+                       "Value", "wmx.rng_rsp.tlv_value",
                        FT_BYTES, BASE_NONE, NULL, 0x00, "", HFILL
                }
        }
index e02addb41c7aaaf1a1fdb428378427f1d7a2e546..7e5f788ab38a35ffad4b0823cbc3a46133d03b3b 100644 (file)
@@ -45,7 +45,7 @@
 #include "wimax_mac.h"
 #include "wimax_utils.h"
 
-/* This is a global variable declared in mac_hd_generic_decoder.c, which determines whether 
+/* This is a global variable declared in mac_hd_generic_decoder.c, which determines whether
  *    or not cor2 changes are included */
 extern guint include_cor2_changes;
 
@@ -557,855 +557,855 @@ static hf_register_info hf_sbc[] =
 {
        {       /* 11.8.8 */
                &hf_sbc_tlv_t_167_association_type_support,
-               { 
-                       "Association Type Support", "wimax.sbc.association_type_support", 
+               {
+                       "Association Type Support", "wmx.sbc.association_type_support",
                        FT_UINT8, BASE_HEX, NULL, 0x0, "", HFILL
                }
        },
        {
                &hf_sbc_tlv_t_167_association_type_support_bit0,
-               { 
-                       "Scanning Without Association: association not supported", "wimax.sbc.association_type_support.bit0", 
+               {
+                       "Scanning Without Association: association not supported", "wmx.sbc.association_type_support.bit0",
                        FT_BOOLEAN, 8,  VALS(vals_yes_no_str), 0x1, "", HFILL
                }
        },
        {
                &hf_sbc_tlv_t_167_association_type_support_bit1,
-               { 
-                       "Association Level 0: scanning or association without coordination", "wimax.sbc.association_type_support.bit1", 
+               {
+                       "Association Level 0: scanning or association without coordination", "wmx.sbc.association_type_support.bit1",
                        FT_BOOLEAN, 8, VALS(vals_yes_no_str), 0x2, "", HFILL
                }
        },
        {
                &hf_sbc_tlv_t_167_association_type_support_bit2,
-               { 
-                       "Association Level 1: association with coordination", "wimax.sbc.association_type_support.bit2", 
+               {
+                       "Association Level 1: association with coordination", "wmx.sbc.association_type_support.bit2",
                        FT_BOOLEAN, 8, VALS(vals_yes_no_str), 0x4, "", HFILL
                }
        },
        {
                &hf_sbc_tlv_t_167_association_type_support_bit3,
-               { 
-                       "Association Level 2: network assisted association", "wimax.sbc.association_type_support.bit3", 
+               {
+                       "Association Level 2: network assisted association", "wmx.sbc.association_type_support.bit3",
                        FT_BOOLEAN, 8, VALS(vals_yes_no_str), 0x8, "", HFILL
                }
        },
        {
                &hf_sbc_tlv_t_167_association_type_support_bit4,
-               { 
-                       "Desired Association Support", "wimax.sbc.association_type_support.bit4", 
+               {
+                       "Desired Association Support", "wmx.sbc.association_type_support.bit4",
                        FT_BOOLEAN, 8, VALS(vals_yes_no_str), 0x10, "", HFILL
                }
        },
        {
                &hf_sbc_tlv_t_167_association_type_support_reserved,
-               { 
-                       "Reserved", "wimax.sbc.association_type_support.reserved", 
+               {
+                       "Reserved", "wmx.sbc.association_type_support.reserved",
                        FT_UINT8, BASE_HEX, NULL, 0xE0, "", HFILL
                }
        },
        {       /* 11.7.8.7 */
                &hf_sbc_auth_policy,
                {
-                       "Authorization Policy Support", "wimax.sbc.auth_policy", 
+                       "Authorization Policy Support", "wmx.sbc.auth_policy",
                        FT_UINT8, BASE_HEX, NULL, 0x0, "", HFILL
                }
        },
        {
                &hf_sbc_privacy_802_16,
                {
-                       "IEEE 802.16 Privacy", "wimax.sbc.auth_policy.802_16", 
+                       "IEEE 802.16 Privacy", "wmx.sbc.auth_policy.802_16",
                        FT_BOOLEAN, 8, TFS(&tfs_supported), 0x1, "", HFILL
                }
        },
        {
                &hf_sbc_privacy_rsvd,
                {
-                       "Reserved", "wimax.sbc.auth_policy.rsvd", 
+                       "Reserved", "wmx.sbc.auth_policy.rsvd",
                        FT_UINT8, BASE_HEX, NULL, 0xFE, "", HFILL
                }
        },
        {       /* 11.8.1 */
                &hf_sbc_bw_alloc_support,
                {
-                       "Bandwidth Allocation Support", "wimax.sbc.bw_alloc_support", 
+                       "Bandwidth Allocation Support", "wmx.sbc.bw_alloc_support",
                        FT_UINT8, BASE_HEX, NULL, 0x00, "", HFILL
                }
        },
        {
                &hf_sbc_bw_alloc_support_duplex,
                {
-                       "Duplex", "wimax.sbc.bw_alloc_support.duplex", 
+                       "Duplex", "wmx.sbc.bw_alloc_support.duplex",
                        FT_BOOLEAN, 8, VALS(vals_sbc_bw_alloc_support_duplex), 0x2, "", HFILL
                }
        },
        {
                &hf_sbc_bw_alloc_support_rsvd0,
                {
-                       "Reserved", "wimax.sbc.bw_alloc_support.rsvd0", 
+                       "Reserved", "wmx.sbc.bw_alloc_support.rsvd0",
                        FT_UINT8, BASE_HEX, NULL, 0x1, "", HFILL
                }
        },
        {
                &hf_sbc_bw_alloc_support_rsvd1,
                {
-                       "Reserved", "wimax.sbc.bw_alloc_support.rsvd1", 
+                       "Reserved", "wmx.sbc.bw_alloc_support.rsvd1",
                        FT_UINT8, BASE_HEX, NULL, 0xFC, "", HFILL
                }
        },
        {
                &hf_sbc_curr_transmit_power,
                {
-                       "Current transmitted power", "wimax.sbc.curr_transmit_power",
+                       "Current transmitted power", "wmx.sbc.curr_transmit_power",
                        FT_UINT8, BASE_HEX, NULL, 0x00, "", HFILL
                }
        },
        {
                &hf_sbc_ss_effective_cinr_measurement_preamble,
                {
-                       "Effective CINR Measurement For A Permutation Zone From Preamble", "wimax.sbc.effective_cinr_measure_permutation_zone_preamble", 
+                       "Effective CINR Measurement For A Permutation Zone From Preamble", "wmx.sbc.effective_cinr_measure_permutation_zone_preamble",
                        FT_BOOLEAN, 8, TFS(&tfs_supported), 0x8, "", HFILL
                }
        },
        {
                &hf_sbc_ss_effective_cinr_measurement_permutation_zone_from_pilot_subcarriers,
                {
-                       "Effective CINR Measurement For A Permutation Zone From Pilot Subcarriers", "wimax.sbc.effective_cinr_measure_permutation_zone.pilot_subcarriers", 
+                       "Effective CINR Measurement For A Permutation Zone From Pilot Subcarriers", "wmx.sbc.effective_cinr_measure_permutation_zone.pilot_subcarriers",
                        FT_BOOLEAN, 8, TFS(&tfs_supported), 0x10, "", HFILL
                }
        },
        {
                &hf_sbc_ss_effective_cinr_measurement_permutation_zone_from_data_subcarriers,
                {
-                       "Effective CINR Measurement For A Permutation Zone From Data Subcarriers", "wimax.sbc.effective_cinr_measure_permutation_zone.data_subcarriers", 
+                       "Effective CINR Measurement For A Permutation Zone From Data Subcarriers", "wmx.sbc.effective_cinr_measure_permutation_zone.data_subcarriers",
                        FT_BOOLEAN, 8, TFS(&tfs_supported), 0x20, "", HFILL
                }
        },
        {       /* 11.8.6 */
                &hf_sbc_tlv_t_27_extension_capability,
-               { 
-                       "Extension Capability", "wimax.sbc.extension_capability", 
+               {
+                       "Extension Capability", "wmx.sbc.extension_capability",
                        FT_UINT8, BASE_HEX, NULL, 0x0, "", HFILL
                }
        },
        {
                &hf_sbc_tlv_t_27_extension_capability_bit0,
-               { 
-                       "Supported Extended Subheader Format", "wimax.sbc.extension_capability.bit0", 
+               {
+                       "Supported Extended Subheader Format", "wmx.sbc.extension_capability.bit0",
                        FT_BOOLEAN, 8, VALS(vals_yes_no_str), 0x1, "", HFILL
                }
        },
        {
                &hf_sbc_tlv_t_27_extension_capability_reserved,
-               { 
-                       "Reserved", "wimax.sbc.extension_capability.reserved", 
+               {
+                       "Reserved", "wmx.sbc.extension_capability.reserved",
                        FT_UINT8, BASE_HEX, NULL, 0xFE, "", HFILL
                }
        },
        {
                &hf_sbc_ss_frequency_selectivity_characterization_report,
                {
-                       "Frequency Selectivity Characterization Report", "wimax.sbc.frequency_selectivity_characterization_report", 
+                       "Frequency Selectivity Characterization Report", "wmx.sbc.frequency_selectivity_characterization_report",
                        FT_BOOLEAN, 8, TFS(&tfs_supported), 0x80, "", HFILL
                }
        },
        {       /* 11.8.3.7.19.2 */
                &hf_sbc_tlv_t_163_harq_chase_combining_and_cc_ir_buffer_capability,
                {
-                       "HARQ Chase Combining And CC-IR Buffer Capability", "wimax.sbc.harq_chase_combining_and_cc_ir_buffer_capability", 
+                       "HARQ Chase Combining And CC-IR Buffer Capability", "wmx.sbc.harq_chase_combining_and_cc_ir_buffer_capability",
                        FT_UINT16, BASE_HEX, NULL, 0x0, "", HFILL
                }
        },
        {
                &hf_sbc_tlv_t_163_harq_chase_combining_and_cc_ir_buffer_capability_aggregation_flag_dl,
                {
-                       "Aggregation Flag For DL", "wimax.sbc.harq_chase_combining_and_cc_ir_buffer_capability.aggregation_flag_dl", 
+                       "Aggregation Flag For DL", "wmx.sbc.harq_chase_combining_and_cc_ir_buffer_capability.aggregation_flag_dl",
                        FT_UINT16, BASE_HEX, NULL, 0x40, "", HFILL
                }
        },
        {
                &hf_sbc_tlv_t_163_harq_chase_combining_and_cc_ir_buffer_capability_aggregation_flag_ul,
                {
-                       "Aggregation Flag for UL", "wimax.sbc.harq_chase_combining_and_cc_ir_buffer_capability.aggregation_flag_ul", 
+                       "Aggregation Flag for UL", "wmx.sbc.harq_chase_combining_and_cc_ir_buffer_capability.aggregation_flag_ul",
                        FT_UINT16, BASE_HEX, NULL, 0x4000, "", HFILL
                }
        },
        {
                &hf_sbc_tlv_t_163_dl_harq_buffering_capability_for_chase_combining,
                {
-                       "Downlink HARQ Buffering Capability For Chase Combining (K)", "wimax.sbc.harq_chase_combining_and_cc_ir_buffer_capability.dl_harq_buffering_capability_for_chase_combining", 
+                       "Downlink HARQ Buffering Capability For Chase Combining (K)", "wmx.sbc.harq_chase_combining_and_cc_ir_buffer_capability.dl_harq_buffering_capability_for_chase_combining",
                        FT_UINT16, BASE_HEX, NULL, 0x3F, "", HFILL
                }
        },
        {
                &hf_sbc_tlv_t_163_harq_chase_combining_and_cc_ir_buffer_capability_reserved1,
                {
-                       "Reserved", "wimax.sbc.harq_chase_combining_and_cc_ir_buffer_capability.reserved1", 
+                       "Reserved", "wmx.sbc.harq_chase_combining_and_cc_ir_buffer_capability.reserved1",
                        FT_UINT16, BASE_HEX, NULL, 0x80, "", HFILL
                }
        },
        {
                &hf_sbc_tlv_t_163_harq_chase_combining_and_cc_ir_buffer_capability_reserved2,
                {
-                       "Reserved", "wimax.sbc.harq_chase_combining_and_cc_ir_buffer_capability.reserved2", 
+                       "Reserved", "wmx.sbc.harq_chase_combining_and_cc_ir_buffer_capability.reserved2",
                        FT_UINT16, BASE_HEX, NULL, 0x8000, "", HFILL
                }
        },
        {
                &hf_sbc_tlv_t_163_ul_harq_buffering_capability_for_chase_combining,
                {
-                       "Uplink HARQ buffering capability for chase combining (K)", "wimax.sbc.harq_chase_combining_and_cc_ir_buffer_capability.ul_harq_buffering_capability_for_chase_combining", 
+                       "Uplink HARQ buffering capability for chase combining (K)", "wmx.sbc.harq_chase_combining_and_cc_ir_buffer_capability.ul_harq_buffering_capability_for_chase_combining",
                        FT_UINT16, BASE_HEX, NULL, 0x3F00, "", HFILL
                }
        },
        {       /* 11.8.3.7.19.1 */
                &hf_sbc_tlv_t_162_harq_incremental_redundancy_buffer_capability,
                {
-                       "HARQ Incremental Buffer Capability", "wimax.sbc.harq_incremental_redundancy_buffer_capability", 
+                       "HARQ Incremental Buffer Capability", "wmx.sbc.harq_incremental_redundancy_buffer_capability",
                        FT_UINT16, BASE_HEX, NULL, 0x0, "", HFILL
                }
        },
        {
                &hf_sbc_tlv_t_162_harq_incremental_redundancy_buffer_capability_aggregation_flag_for_dl,
                {
-                       "Aggregation Flag for DL", "wimax.sbc.harq_incremental_redundancy_buffer_capability.aggregation_flag_for_dl", 
+                       "Aggregation Flag for DL", "wmx.sbc.harq_incremental_redundancy_buffer_capability.aggregation_flag_for_dl",
                        FT_UINT16, BASE_HEX, NULL, 0x10, "", HFILL
                }
        },
        {
                &hf_sbc_tlv_t_162_harq_incremental_redundancy_buffer_capability_aggregation_flag_for_ul,
                {
-                       "Aggregation Flag For UL", "wimax.sbc.harq_incremental_redundancy_buffer_capability.aggregation_flag_for_ul", 
+                       "Aggregation Flag For UL", "wmx.sbc.harq_incremental_redundancy_buffer_capability.aggregation_flag_for_ul",
                        FT_UINT16, BASE_HEX, NULL, 0x1000, "", HFILL
                }
        },
        {
                &hf_sbc_tlv_t_162_harq_incremental_redundancy_buffer_capability_NEP,
                {
-                       "NEP Value Indicating Downlink HARQ Buffering Capability For Incremental Redundancy CTC", "wimax.sbc.harq_incremental_redundancy_buffer_capability.dl_incremental_redundancy_ctc", 
+                       "NEP Value Indicating Downlink HARQ Buffering Capability For Incremental Redundancy CTC", "wmx.sbc.harq_incremental_redundancy_buffer_capability.dl_incremental_redundancy_ctc",
                        FT_UINT16, BASE_HEX, NULL, 0xF, "", HFILL
                }
        },
        {
                &hf_sbc_tlv_t_162_harq_incremental_redundancy_buffer_capability_reserved1,
                {
-                       "Reserved", "wimax.sbc.harq_incremental_redundancy_buffer_capability.reserved", 
+                       "Reserved", "wmx.sbc.harq_incremental_redundancy_buffer_capability.reserved",
                        FT_UINT16, BASE_HEX, NULL, 0xE0, "", HFILL
                }
        },
        {
                &hf_sbc_tlv_t_162_harq_incremental_redundancy_buffer_capability_reserved2,
                {
-                       "Reserved", "wimax.sbc.harq_incremental_redundancy_buffer_capability.reserved2", 
+                       "Reserved", "wmx.sbc.harq_incremental_redundancy_buffer_capability.reserved2",
                        FT_UINT16, BASE_HEX, NULL, 0xE000, "", HFILL
                }
        },
        {
                &hf_sbc_tlv_t_162_ul_harq_incremental_redundancy_buffer_capability_NEP,
                {
-                       "NEP Value Indicating Uplink HARQ Buffering Capability For Incremental Redundancy CTC", "wimax.sbc.harq_incremental_redundancy_buffer_capability.ul_incremental_redundancy_ctc", 
+                       "NEP Value Indicating Uplink HARQ Buffering Capability For Incremental Redundancy CTC", "wmx.sbc.harq_incremental_redundancy_buffer_capability.ul_incremental_redundancy_ctc",
                        FT_UINT16,BASE_HEX, NULL, 0xF00, "", HFILL
                }
        },
        {
                &hf_sbc_ofdma_aas_harq_map_capability,
                {
-                       "H-ARQ MAP Capability", "wimax.sbc.harq_map_capability", 
+                       "H-ARQ MAP Capability", "wmx.sbc.harq_map_capability",
                        FT_BOOLEAN, 8, TFS(&tfs_supported), 0x1, "", HFILL
                }
        },
        {       /* 11.8.7 */
                &hf_sbc_tlv_t_28_ho_trigger_metric_support,
-               { 
-                       "HO Trigger Metric Support", "wimax.sbc.ho_trigger_metric_support", 
+               {
+                       "HO Trigger Metric Support", "wmx.sbc.ho_trigger_metric_support",
                        FT_UINT8, BASE_HEX, NULL, 0x0, "", HFILL
                }
        },
        {
                &hf_sbc_tlv_t_28_ho_trigger_metric_support_bit0,
-               { 
-                       "BS CINR Mean", "wimax.sbc.ho_trigger_metric_support.bit0", 
+               {
+                       "BS CINR Mean", "wmx.sbc.ho_trigger_metric_support.bit0",
                        FT_BOOLEAN, 8, TFS(&tfs_supported), 0x1, "", HFILL
                }
        },
        {
                &hf_sbc_tlv_t_28_ho_trigger_metric_support_bit1,
-               { 
-                       "BS RSSI Mean", "wimax.sbc.ho_trigger_metric_support.bit1", 
+               {
+                       "BS RSSI Mean", "wmx.sbc.ho_trigger_metric_support.bit1",
                        FT_BOOLEAN, 8, TFS(&tfs_supported), 0x2, "", HFILL
                }
        },
        {
                &hf_sbc_tlv_t_28_ho_trigger_metric_support_bit2,
-               { 
-                       "BS Relative Delay", "wimax.sbc.ho_trigger_metric_support.bit2", 
+               {
+                       "BS Relative Delay", "wmx.sbc.ho_trigger_metric_support.bit2",
                        FT_BOOLEAN, 8, TFS(&tfs_supported), 0x4, "", HFILL
                }
        },
        {
                &hf_sbc_tlv_t_28_ho_trigger_metric_support_bit3,
-               { 
-                       "BS RTD", "wimax.sbc.ho_trigger_metric_support.bit3", 
+               {
+                       "BS RTD", "wmx.sbc.ho_trigger_metric_support.bit3",
                        FT_BOOLEAN, 8, TFS(&tfs_supported), 0x8, "", HFILL
                }
        },
        {
                &hf_sbc_tlv_t_28_ho_trigger_metric_support_reserved,
-               { 
-                       "Reserved", "wimax.sbc.ho_trigger_metric_support.reserved", 
+               {
+                       "Reserved", "wmx.sbc.ho_trigger_metric_support.reserved",
                        FT_UINT8, BASE_HEX, NULL, 0xF0, "", HFILL
                }
        },
        {
                &hf_sbc_invalid_tlv,
                {
-                       "Invalid TLV", "wimax.sbc.invalid_tlv", 
+                       "Invalid TLV", "wmx.sbc.invalid_tlv",
                        FT_BYTES, BASE_HEX, NULL, 0x0, "", HFILL
                }
        },
        {       /* 11.8.2 */
                &hf_sbc_mac_pdu,
                {
-                       "Capabilities For Construction And Transmission Of MAC PDUs", "wimax.sbc.mac_pdu", 
+                       "Capabilities For Construction And Transmission Of MAC PDUs", "wmx.sbc.mac_pdu",
                        FT_UINT8, BASE_HEX, NULL, 0x0, "", HFILL
                }
        },
        {
                &hf_sbc_mac_pdu_piggybacked,
                {
-                       "Ability To Receive Requests Piggybacked With Data", "wimax.sbc.mac_pdu.bit0", 
+                       "Ability To Receive Requests Piggybacked With Data", "wmx.sbc.mac_pdu.bit0",
                        FT_BOOLEAN, 8, TFS(&tfs_supported), 0x1, "", HFILL
                }
        },
        {
                &hf_sbc_mac_pdu_fsn,
                {
-                       "Ability To Use 3-bit FSN Values Used When Forming MAC PDUs On Non-ARQ Connections", "wimax.sbc.mac_pdu.bit1", 
+                       "Ability To Use 3-bit FSN Values Used When Forming MAC PDUs On Non-ARQ Connections", "wmx.sbc.mac_pdu.bit1",
                        FT_BOOLEAN, 8, TFS(&tfs_supported), 0x2, "", HFILL
                }
        },
        {       /* 11.8.3.7.15 */
                &hf_sbc_tlv_t_175_max_num_bst_per_frm_capability_harq,
                {
-                       "Maximum Number Of Burst Per Frame Capability In HARQ", "wimax.sbc.max_num_bst_per_frm_capability_harq", 
+                       "Maximum Number Of Burst Per Frame Capability In HARQ", "wmx.sbc.max_num_bst_per_frm_capability_harq",
                        FT_UINT8, BASE_HEX, NULL, 0x0, "", HFILL
                }
        },
        {
                &hf_sbc_tlv_t_175_max_num_dl_harq_bst_per_harq_per_frm,
                {
-                       "Maximum Numbers Of DL HARQ Bursts Per HARQ Enabled Of MS Per Frame (default(0)=1)", "wimax.sbc.max_num_bst_per_frm_capability_harq.max_num_dl_harq_bst_per_harq_per_frm", 
+                       "Maximum Numbers Of DL HARQ Bursts Per HARQ Enabled Of MS Per Frame (default(0)=1)", "wmx.sbc.max_num_bst_per_frm_capability_harq.max_num_dl_harq_bst_per_harq_per_frm",
                        FT_UINT8, BASE_DEC, NULL, 0xF0, "", HFILL
                }
        },
        {
                &hf_sbc_tlv_t_175_max_num_ul_harq_bst,
                {
-                       "Maximum Number Of UL HARQ Burst Per HARQ Enabled MS Per Frame (default(0)=1)", "wimax.sbc.max_num_bst_per_frm_capability_harq.max_num_ul_harq_bst", 
+                       "Maximum Number Of UL HARQ Burst Per HARQ Enabled MS Per Frame (default(0)=1)", "wmx.sbc.max_num_bst_per_frm_capability_harq.max_num_ul_harq_bst",
                        FT_UINT8, BASE_DEC, NULL, 0x7, "", HFILL
                }
        },
        {
                &hf_sbc_tlv_t_175_max_num_ul_harq_per_frm_include_one_non_harq_bst,
                {
-                       "Whether The Maximum Number Of UL HARQ Bursts Per Frame (i.e. Bits# 2-0) Includes The One Non-HARQ Burst", "wimax.sbc.max_num_bst_per_frm_capability_harq.max_num_ul_harq_per_frm_include_one_non_harq_bst", 
+                       "Whether The Maximum Number Of UL HARQ Bursts Per Frame (i.e. Bits# 2-0) Includes The One Non-HARQ Burst", "wmx.sbc.max_num_bst_per_frm_capability_harq.max_num_ul_harq_per_frm_include_one_non_harq_bst",
                        FT_BOOLEAN, 8, VALS(vals_yes_no_str), 0x8, "", HFILL
                }
        },
        {       /* 11.7.8.8 */
                &hf_sbc_max_security_associations,
                {
-                       "Maximum Number Of Security Association Supported By The SS", "wimax.sbc.max_security_associations", 
+                       "Maximum Number Of Security Association Supported By The SS", "wmx.sbc.max_security_associations",
                        FT_UINT8, BASE_DEC, NULL, 0x0, "", HFILL
                }
        },
        {       /* 11.8.3.7.2 - type 161 */
                &hf_sbc_number_dl_arq_ack_channel,
-               { 
-                       "The Number Of DL HARQ ACK Channel", "wimax.sbc.number_dl_arq_ack_channel", 
+               {
+                       "The Number Of DL HARQ ACK Channel", "wmx.sbc.number_dl_arq_ack_channel",
                        FT_UINT8, BASE_DEC, NULL, 0x0, "", HFILL
                }
        },
        {       /* 11.8.3.7.3 - type 153 */
                &hf_sbc_number_ul_arq_ack_channel,
-               { 
-                       "The Number Of UL HARQ ACK Channel", "wimax.sbc.number_ul_arq_ack_channel", 
+               {
+                       "The Number Of UL HARQ ACK Channel", "wmx.sbc.number_ul_arq_ack_channel",
                        FT_UINT8, BASE_DEC, NULL, 0x0, "", HFILL
                }
        },
        {       /* 11.8.3.7.8 */
                &hf_sbc_ofdma_aas_capabilities,
                {
-                       "OFDMA AAS Capability", "wimax.sbc.ofdma_aas_capability", 
+                       "OFDMA AAS Capability", "wmx.sbc.ofdma_aas_capability",
                        FT_UINT16, BASE_HEX, NULL, 0x0, "", HFILL
                }
        },
        {
                &hf_sbc_ss_ofdma_aas_capabilities_rsvd,
                {
-                       "Reserved", "wimax.sbc.ofdma_aas_capabilities.rsvd", 
+                       "Reserved", "wmx.sbc.ofdma_aas_capabilities.rsvd",
                        FT_UINT16, BASE_HEX, NULL, 0xFFE0, "", HFILL
                }
        },
        {
                &hf_sbc_ss_ofdma_aas_diversity_map_scan,
                {
-                       "AAS Diversity Map Scan (AAS DLFP)", "wimax.sbc.ofdma_aas_diversity_map_scan", 
+                       "AAS Diversity Map Scan (AAS DLFP)", "wmx.sbc.ofdma_aas_diversity_map_scan",
                        FT_BOOLEAN, 16, TFS(&tfs_supported), 0x2, "", HFILL
                }
        },
        {
                &hf_sbc_ss_ofdma_aas_fbck_rsp_support,
                {
-                       "AAS-FBCK-RSP Support", "wimax.sbc.ofdma_aas_fbck_rsp_support", 
+                       "AAS-FBCK-RSP Support", "wmx.sbc.ofdma_aas_fbck_rsp_support",
                        FT_BOOLEAN, 16, TFS(&tfs_supported), 0x4, "", HFILL
                }
        },
        {
                &hf_sbc_ss_ofdma_aas_zone,
                {
-                       "AAS Zone", "wimax.sbc.ofdma_aas_zone", 
+                       "AAS Zone", "wmx.sbc.ofdma_aas_zone",
                        FT_BOOLEAN, 16, TFS(&tfs_supported), 0x1, "", HFILL
                }
        },
        {
                &hf_sbc_ss_ofdma_downlink_aas_preamble,
                {
-                       "Downlink AAS Preamble", "wimax.sbc.ofdma_downlink_aas_preamble", 
+                       "Downlink AAS Preamble", "wmx.sbc.ofdma_downlink_aas_preamble",
                        FT_BOOLEAN, 16, TFS(&tfs_supported), 0x8, "", HFILL
                }
        },
        {       /* 11.8.3.7.5 - 3 bytes */
                &hf_sbc_tlv_t_176,
                {
-                       "OFDMA MS Demodulator For MIMO Support In DL", "wimax.sbc.ofdma_ms_demodulator_for_mimo_support_in_dl", 
+                       "OFDMA MS Demodulator For MIMO Support In DL", "wmx.sbc.ofdma_ms_demodulator_for_mimo_support_in_dl",
                        FT_BOOLEAN, 24, TFS(&tfs_supported), 0x0, "", HFILL
                }
        },
        {
                &hf_sbc_tlv_t_176_bit0,
                {
-                       "2-antenna STC Matrix A", "wimax.sbc.ofdma_ms_demodulator_for_mimo_support_in_dl.bit0", 
+                       "2-antenna STC Matrix A", "wmx.sbc.ofdma_ms_demodulator_for_mimo_support_in_dl.bit0",
                        FT_BOOLEAN, 24, TFS(&tfs_supported), 0x1, "", HFILL
                }
        },
        {
                &hf_sbc_tlv_t_176_bit1,
                {
-                       "2-antenna STC Matrix B, vertical coding", "wimax.sbc.ofdma_ms_demodulator_for_mimo_support_in_dl.bit1", 
+                       "2-antenna STC Matrix B, vertical coding", "wmx.sbc.ofdma_ms_demodulator_for_mimo_support_in_dl.bit1",
                        FT_BOOLEAN, 24, TFS(&tfs_supported), 0x2, "", HFILL
                }
        },
        {
                &hf_sbc_tlv_t_176_bit2,
                {
-                       "Four Receive Antennas", "wimax.sbc.ofdma_ms_demodulator_for_mimo_support_in_dl.bit2", 
+                       "Four Receive Antennas", "wmx.sbc.ofdma_ms_demodulator_for_mimo_support_in_dl.bit2",
                        FT_BOOLEAN, 24, TFS(&tfs_supported), 0x4, "", HFILL
                }
        },
        {
                &hf_sbc_tlv_t_176_bit2_cor2,
                {
-                       "2-antenna STC matrix B, horizontal coding", "wimax.sbc.ofdma_ms_demodulator_for_mimo_support_in_dl.bit2", 
+                       "2-antenna STC matrix B, horizontal coding", "wmx.sbc.ofdma_ms_demodulator_for_mimo_support_in_dl.bit2",
                        FT_BOOLEAN, 24, TFS(&tfs_supported), 0x4, "", HFILL
                }
        },
        {
                &hf_sbc_tlv_t_176_bit3,
                {
-                       "4-antenna STC Matrix A", "wimax.sbc.ofdma_ms_demodulator_for_mimo_support_in_dl.bit3", 
+                       "4-antenna STC Matrix A", "wmx.sbc.ofdma_ms_demodulator_for_mimo_support_in_dl.bit3",
                        FT_BOOLEAN, 24, TFS(&tfs_supported), 0x8, "", HFILL
                }
        },
        {
                &hf_sbc_tlv_t_176_bit4,
                {
-                       "4-antenna STC Matrix B, vertical coding", "wimax.sbc.ofdma_ms_demodulator_for_mimo_support_in_dl.bit4", 
+                       "4-antenna STC Matrix B, vertical coding", "wmx.sbc.ofdma_ms_demodulator_for_mimo_support_in_dl.bit4",
                        FT_BOOLEAN, 24, TFS(&tfs_supported), 0x10, "", HFILL
                }
        },
        {
                &hf_sbc_tlv_t_176_bit5,
                {
-                       "4-antenna STC Matrix B, horizontal coding", "wimax.sbc.ofdma_ms_demodulator_for_mimo_support_in_dl.bit5", 
+                       "4-antenna STC Matrix B, horizontal coding", "wmx.sbc.ofdma_ms_demodulator_for_mimo_support_in_dl.bit5",
                        FT_BOOLEAN, 24, TFS(&tfs_supported), 0x20, "", HFILL
                }
        },
        {
                &hf_sbc_tlv_t_176_bit6,
                {
-                       "4-antenna STC Matrix C, vertical coding", "wimax.sbc.ofdma_ms_demodulator_for_mimo_support_in_dl.bit6", 
+                       "4-antenna STC Matrix C, vertical coding", "wmx.sbc.ofdma_ms_demodulator_for_mimo_support_in_dl.bit6",
                        FT_BOOLEAN, 24, TFS(&tfs_supported), 0x40, "", HFILL
                }
        },
        {
                &hf_sbc_tlv_t_176_bit7,
                {
-                       "4-antenna STC Matrix C, horizontal coding", "wimax.sbc.ofdma_ms_demodulator_for_mimo_support_in_dl.bit7", 
+                       "4-antenna STC Matrix C, horizontal coding", "wmx.sbc.ofdma_ms_demodulator_for_mimo_support_in_dl.bit7",
                        FT_BOOLEAN, 24, TFS(&tfs_supported), 0x80, "", HFILL
                }
-       }, 
+       },
        {
                &hf_sbc_tlv_t_176_bit8,
                {
-                       "3-antenna STC Matrix A", "wimax.sbc.ofdma_ms_demodulator_for_mimo_support_in_dl.bit8", 
+                       "3-antenna STC Matrix A", "wmx.sbc.ofdma_ms_demodulator_for_mimo_support_in_dl.bit8",
                        FT_BOOLEAN, 24, TFS(&tfs_supported), 0x100, "", HFILL
                }
        },
        {
                &hf_sbc_tlv_t_176_bit9,
                {
-                       "3-antenna STC Matrix B", "wimax.sbc.ofdma_ms_demodulator_for_mimo_support_in_dl.bit9", 
+                       "3-antenna STC Matrix B", "wmx.sbc.ofdma_ms_demodulator_for_mimo_support_in_dl.bit9",
                        FT_BOOLEAN, 24, TFS(&tfs_supported), 0x200, "", HFILL
                }
        },
        {
                &hf_sbc_tlv_t_176_bit10,
                {
-                       "3-antenna STC Matrix C, vertical coding", "wimax.sbc.ofdma_ms_demodulator_for_mimo_support_in_dl.bit10", 
+                       "3-antenna STC Matrix C, vertical coding", "wmx.sbc.ofdma_ms_demodulator_for_mimo_support_in_dl.bit10",
                        FT_BOOLEAN, 24, TFS(&tfs_supported), 0x400, "", HFILL
                }
        },
        {
                &hf_sbc_tlv_t_176_bit11,
                {
-                       "3-antenna STC Matrix C, horizontal coding", "wimax.sbc.ofdma_ms_demodulator_for_mimo_support_in_dl.bit11", 
+                       "3-antenna STC Matrix C, horizontal coding", "wmx.sbc.ofdma_ms_demodulator_for_mimo_support_in_dl.bit11",
                        FT_BOOLEAN, 24, TFS(&tfs_supported), 0x800, "", HFILL
                }
        },
        {
                &hf_sbc_tlv_t_176_bit12,
                {
-                       "Capable Of Calculating Precoding Weight", "wimax.sbc.ofdma_ms_demodulator_for_mimo_support_in_dl.bit12", 
+                       "Capable Of Calculating Precoding Weight", "wmx.sbc.ofdma_ms_demodulator_for_mimo_support_in_dl.bit12",
                        FT_BOOLEAN, 24, TFS(&tfs_supported), 0x1000, "", HFILL
                }
        },
        {
                &hf_sbc_tlv_t_176_bit13,
                {
-                       "Capable Of Adaptive Rate Control", "wimax.sbc.ofdma_ms_demodulator_for_mimo_support_in_dl.bit13", 
+                       "Capable Of Adaptive Rate Control", "wmx.sbc.ofdma_ms_demodulator_for_mimo_support_in_dl.bit13",
                        FT_BOOLEAN, 24, TFS(&tfs_supported), 0x2000, "", HFILL
                }
        },
        {
                &hf_sbc_tlv_t_176_bit14,
                {
-                       "Capable Of Calculating Channel Matrix", "wimax.sbc.ofdma_ms_demodulator_for_mimo_support_in_dl.bit14", 
+                       "Capable Of Calculating Channel Matrix", "wmx.sbc.ofdma_ms_demodulator_for_mimo_support_in_dl.bit14",
                        FT_BOOLEAN, 24, TFS(&tfs_supported), 0x4000, "", HFILL
                }
        },
        {
                &hf_sbc_tlv_t_176_bit15,
                {
-                       "Capable Of Antenna Grouping", "wimax.sbc.ofdma_ms_demodulator_for_mimo_support_in_dl.bit15", 
+                       "Capable Of Antenna Grouping", "wmx.sbc.ofdma_ms_demodulator_for_mimo_support_in_dl.bit15",
                        FT_BOOLEAN, 24, TFS(&tfs_supported), 0x8000, "", HFILL
                }
        },
        {
                &hf_sbc_tlv_t_176_bit16,
                {
-                       "Capable Of Antenna Selection", "wimax.sbc.ofdma_ms_demodulator_for_mimo_support_in_dl.bit16", 
+                       "Capable Of Antenna Selection", "wmx.sbc.ofdma_ms_demodulator_for_mimo_support_in_dl.bit16",
                        FT_BOOLEAN, 24, TFS(&tfs_supported), 0x10000, "", HFILL
                }
        },
        {
                &hf_sbc_tlv_t_176_bit17,
                {
-                       "Capable Of Codebook Based Precoding", "wimax.sbc.ofdma_ms_demodulator_for_mimo_support_in_dl.bit17", 
+                       "Capable Of Codebook Based Precoding", "wmx.sbc.ofdma_ms_demodulator_for_mimo_support_in_dl.bit17",
                        FT_BOOLEAN, 24, TFS(&tfs_supported), 0x20000, "", HFILL
                }
        },
        {
                &hf_sbc_tlv_t_176_bit18,
                {
-                       "Capable Of Long-term Precoding", "wimax.sbc.ofdma_ms_demodulator_for_mimo_support_in_dl.bit18", 
+                       "Capable Of Long-term Precoding", "wmx.sbc.ofdma_ms_demodulator_for_mimo_support_in_dl.bit18",
                        FT_BOOLEAN, 24, TFS(&tfs_supported), 0x40000, "", HFILL
                }
        },
        {
                &hf_sbc_tlv_t_176_bit19,
                {
-                       "Capable Of MIMO Midamble", "wimax.sbc.ofdma_ms_demodulator_for_mimo_support_in_dl.bit19", 
+                       "Capable Of MIMO Midamble", "wmx.sbc.ofdma_ms_demodulator_for_mimo_support_in_dl.bit19",
                        FT_BOOLEAN, 24, TFS(&tfs_supported), 0x80000, "", HFILL
                }
        },
        {
                &hf_sbc_tlv_t_176_reserved,
                {
-                       "Reserved", "wimax.sbc.ofdma_ms_demodulator_for_mimo_support_in_dl.reserved", 
+                       "Reserved", "wmx.sbc.ofdma_ms_demodulator_for_mimo_support_in_dl.reserved",
                        FT_UINT24, BASE_HEX, NULL, 0xF00000, "", HFILL
                }
        },
        {       /* 11.8.3.7.18 */
                &hf_sbc_tlv_t_179_ofdma_multiple_dl_burst_profile_support,
                {
-                       "OFDMA Multiple Downlink Burst Profile Capability", "wimax.sbc.ofdma_multiple_dl_burst_profile_support", 
+                       "OFDMA Multiple Downlink Burst Profile Capability", "wmx.sbc.ofdma_multiple_dl_burst_profile_support",
                        FT_UINT8, BASE_HEX, NULL, 0x0, "", HFILL
                }
        },
        {
                &hf_sbc_tlv_t_179_dl_bst_profile_for_multiple_fec,
                {
-                       "Downlink burst profile for multiple FEC types", "wimax.sbc.ofdma_multiple_dl_burst_profile_support.dl_bst_profile_for_multiple_fec", 
+                       "Downlink burst profile for multiple FEC types", "wmx.sbc.ofdma_multiple_dl_burst_profile_support.dl_bst_profile_for_multiple_fec",
                        FT_BOOLEAN, 8, TFS(&tfs_supported), 0x1, "", HFILL
                }
        },
        {
                &hf_sbc_tlv_t_179_reserved,
                {
-                       "Reserved", "wimax.sbc.ofdma_multiple_dl_burst_profile_support.reserved", 
+                       "Reserved", "wmx.sbc.ofdma_multiple_dl_burst_profile_support.reserved",
                        FT_UINT8, BASE_HEX, NULL, 0xFC, "", HFILL
                }
        },
        {
                &hf_sbc_tlv_t_179_ul_bst_profile_for_multiple_fec,
                {
-                       "Uplink burst profile for multiple FEC types", "wimax.sbc.ofdma_multiple_dl_burst_profile_support.ul_burst_profile_for_multiple_fec_types", 
+                       "Uplink burst profile for multiple FEC types", "wmx.sbc.ofdma_multiple_dl_burst_profile_support.ul_burst_profile_for_multiple_fec_types",
                        FT_BOOLEAN, 8, TFS(&tfs_supported), 0x2, "", HFILL
                }
        },
        {       /* 11.8.3.7.9 */
                &hf_sbc_ss_cinr_measure_capability,
                {
-                       "OFDMA SS CINR Measurement Capability", "wimax.sbc.ofdma_ss_cinr_measure_capability", 
+                       "OFDMA SS CINR Measurement Capability", "wmx.sbc.ofdma_ss_cinr_measure_capability",
                        FT_UINT8, BASE_HEX, NULL, 0x0, "", HFILL
                }
        },
        {       /* 11.8.3.7.6 */
                &hf_sbc_ss_mimo_uplink_support,
                {
-                       "OFDMA SS MIMO uplink support", "wimax.sbc.ofdma_ss_mimo_uplink_support",
+                       "OFDMA SS MIMO uplink support", "wmx.sbc.ofdma_ss_mimo_uplink_support",
                        FT_UINT8, BASE_HEX, NULL, 0x00, "", HFILL
                }
        },
        {
                &hf_sbc_ss_mimo_uplink_support_2_ann_sttd,
                {
-                       "2-antenna STTD", "wimax.sbc.ofdma_ss_mimo_uplink_support.2_antenna_sttd",
+                       "2-antenna STTD", "wmx.sbc.ofdma_ss_mimo_uplink_support.2_antenna_sttd",
                        FT_UINT8, BASE_HEX, NULL, 0x01, "", HFILL
                }
        },
        {
                &hf_sbc_ss_mimo_uplink_support_2_ann_sm_vertical,
                {
-                       "2-antenna SM with vertical coding", "wimax.sbc.ofdma_ss_mimo_uplink_support.2_antenna_sm_with_vertical_coding",
+                       "2-antenna SM with vertical coding", "wmx.sbc.ofdma_ss_mimo_uplink_support.2_antenna_sm_with_vertical_coding",
                        FT_UINT8, BASE_HEX, NULL, 0x02, "", HFILL
                }
        },
        {
                &hf_sbc_ss_mimo_uplink_support_1_ann_coop_sm,
                {
-                       "Single-antenna cooperative SM", "wimax.sbc.ofdma_ss_mimo_uplink_support.single_antenna_coop_sm",
+                       "Single-antenna cooperative SM", "wmx.sbc.ofdma_ss_mimo_uplink_support.single_antenna_coop_sm",
                        FT_UINT8, BASE_HEX, NULL, 0x04, "", HFILL
                }
        },
        {
                &hf_sbc_ss_ofdma_uplink_aas_preamble,
                {
-                       "Uplink AAS Preamble", "wimax.sbc.ofdma_uplink_aas_preamble", 
+                       "Uplink AAS Preamble", "wmx.sbc.ofdma_uplink_aas_preamble",
                        FT_BOOLEAN, 16, TFS(&tfs_supported), 0x10, "", HFILL
                }
        },
        {
                &hf_sbc_ss_phy_cinr_measurement_preamble,
                {
-                       "Physical CINR Measurement From The Preamble", "wimax.sbc.phy_cinr_measure_preamble", 
+                       "Physical CINR Measurement From The Preamble", "wmx.sbc.phy_cinr_measure_preamble",
                        FT_BOOLEAN, 8, TFS(&tfs_supported), 0x1, "", HFILL
                }
        },
        {
                &hf_sbc_ss_phy_cinr_measurement_permutation_zone_from_pilot_subcarriers,
                {
-                       "Physical CINR Measurement For A Permutation Zone From Pilot Subcarriers", "wimax.sbc.phy_cinr_measure_permutation_zone.pilot_subcarriers", 
+                       "Physical CINR Measurement For A Permutation Zone From Pilot Subcarriers", "wmx.sbc.phy_cinr_measure_permutation_zone.pilot_subcarriers",
                        FT_BOOLEAN, 8, TFS(&tfs_supported), 0x2, "", HFILL
                }
        },
        {
                &hf_sbc_ss_phy_cinr_measurement_permutation_zone_from_data_subcarriers,
                {
-                       "Physical CINR Measurement For A Permutation Zone From Data Subcarriers", "wimax.sbc.phy_cinr_measure_permutation_zone.data_subcarriers", 
+                       "Physical CINR Measurement For A Permutation Zone From Data Subcarriers", "wmx.sbc.phy_cinr_measure_permutation_zone.data_subcarriers",
                        FT_BOOLEAN, 8, TFS(&tfs_supported), 0x4, "", HFILL
                }
        },
        {       /* 11.7.8.6 */
                &hf_sbc_pkm_flow_control,
                {
-                       "PKM Flow Control", "wimax.sbc.pkm_flow_control", 
+                       "PKM Flow Control", "wmx.sbc.pkm_flow_control",
                        FT_UINT8, BASE_DEC, NULL, 0x0, "", HFILL
                }
        },
        {       /* 11.8.5 */
                &hf_sbc_power_save_class_types_capability,
                {
-                       "Power Save Class Types Capability", "wimax.sbc.power_save_class_types_capability",
+                       "Power Save Class Types Capability", "wmx.sbc.power_save_class_types_capability",
                        FT_UINT8, BASE_HEX, NULL, 0x0, "", HFILL
                }
        },
        {
                &hf_sbc_power_save_class_types_capability_bit0,
                {
-                       "Power Save Class Type I", "wimax.sbc.power_save_class_types_capability.bit0",
+                       "Power Save Class Type I", "wmx.sbc.power_save_class_types_capability.bit0",
                        FT_BOOLEAN, 8, TFS(&tfs_supported), 0x1, "", HFILL
                }
        },
        {
                &hf_sbc_power_save_class_types_capability_bit1,
                {
-                       "Power Save Class Type II", "wimax.sbc.power_save_class_types_capability.bit1",
+                       "Power Save Class Type II", "wmx.sbc.power_save_class_types_capability.bit1",
                        FT_BOOLEAN, 8, TFS(&tfs_supported), 0x2, "", HFILL
                }
        },
        {
                &hf_sbc_power_save_class_types_capability_bit2,
                {
-                       "Power Save Class Type III", "wimax.sbc.power_save_class_types_capability.bit2",
+                       "Power Save Class Type III", "wmx.sbc.power_save_class_types_capability.bit2",
                        FT_BOOLEAN, 8, TFS(&tfs_supported), 0x4, "", HFILL
                }
        },
        {
                &hf_sbc_power_save_class_types_capability_bits34,
                {
-                       "Number Of Power Save Class Type Instances Supported From Class Type I and II", "wimax.sbc.power_save_class_types_capability.bits34",
+                       "Number Of Power Save Class Type Instances Supported From Class Type I and II", "wmx.sbc.power_save_class_types_capability.bits34",
                        FT_UINT8, BASE_DEC, NULL, 0x18, "", HFILL
                }
        },
        {
                &hf_sbc_power_save_class_types_capability_bits567,
                {
-                       "Number Of Power Save Class Type Instances Supported From Class Type III", "wimax.sbc.power_save_class_types_capability.bits567",
+                       "Number Of Power Save Class Type Instances Supported From Class Type III", "wmx.sbc.power_save_class_types_capability.bits567",
                        FT_UINT8, BASE_DEC, NULL, 0xE0, "", HFILL
                }
        },
        {       /* 11.8.3.7.7 */
                &hf_sbc_ofdma_aas_private_chain_enable,
                {
-                       "Private Map Chain Enable", "wimax.sbc.private_chain_enable", 
+                       "Private Map Chain Enable", "wmx.sbc.private_chain_enable",
                        FT_BOOLEAN, 8, TFS(&tfs_supported), 0x8, "", HFILL
                }
        },
        {
                &hf_sbc_ofdma_aas_private_map_concurrency,
                {
-                       "Private Map Chain Concurrency", "wimax.sbc.private_map_concurrency", 
+                       "Private Map Chain Concurrency", "wmx.sbc.private_map_concurrency",
                        FT_UINT8, BASE_HEX, NULL, 0xC0, "", HFILL
                }
        },
        {
                &hf_sbc_ofdma_aas_private_map_dl_frame_offset,
                {
-                       "Private Map DL Frame Offset", "wimax.sbc.private_map_dl_frame_offset", 
+                       "Private Map DL Frame Offset", "wmx.sbc.private_map_dl_frame_offset",
                        FT_BOOLEAN, 8, TFS(&tfs_supported), 0x10, "", HFILL
                }
        },
        {
                &hf_sbc_ofdma_aas_private_map_support,
                {
-                       "Private Map Support", "wimax.sbc.private_map_support", 
+                       "Private Map Support", "wmx.sbc.private_map_support",
                        FT_BOOLEAN, 8, TFS(&tfs_supported), 0x2, "", HFILL
                }
        },
        {
                &hf_sbc_ss_ofdma_aas_private,
                {
-                       "OFDMA AAS Private Map Support", "wimax.sbc.private_map_support.ofdma_aas", 
+                       "OFDMA AAS Private Map Support", "wmx.sbc.private_map_support.ofdma_aas",
                        FT_UINT8, BASE_HEX, NULL, 0x0, "", HFILL
                }
        },
        {
                &hf_sbc_ofdma_aas_reduced_private_map_support,
                {
-                       "Reduced Private Map Support", "wimax.sbc.private_map_support.reduced", 
+                       "Reduced Private Map Support", "wmx.sbc.private_map_support.reduced",
                        FT_BOOLEAN, 8, TFS(&tfs_supported), 0x4, "", HFILL
                }
        },
        {
                &hf_sbc_ofdma_aas_private_ul_frame_offset,
                {
-                       "Private Map UL Frame Offset", "wimax.sbc.private_ul_frame_offset", 
+                       "Private Map UL Frame Offset", "wmx.sbc.private_ul_frame_offset",
                        FT_BOOLEAN, 8, TFS(&tfs_supported), 0x20, "", HFILL
                }
        },
        {
                &hf_sbc_mac_pdu_rsvd,
                {
-                       "Reserved", "wimax.sbc.mac_pdu.rsvd", 
+                       "Reserved", "wmx.sbc.mac_pdu.rsvd",
                        FT_UINT8, BASE_HEX, NULL, 0xFC, "", HFILL
                }
        },
        {       /* 11.8.3.2 */
                &hf_sbc_max_transmit_power,
                {
-                       "Maximum Transmit Power", "wimax.sbc.max_transmit_power", 
+                       "Maximum Transmit Power", "wmx.sbc.max_transmit_power",
                        FT_UINT32, BASE_HEX, NULL, 0x00, "", HFILL
                }
        },
        {       /* 11.8.3.7.5 - 2 bytes */
                &hf_sbc_ss_demodulator_mimo_2_ann_stc_matrix_a,
                {
-                       "2-antenna STC Matrix A", "wimax.sbc.ss_demodulator.mimo.2.antenna.stc.matrix.a", 
+                       "2-antenna STC Matrix A", "wmx.sbc.ss_demodulator.mimo.2.antenna.stc.matrix.a",
                        FT_BOOLEAN, 16, TFS(&tfs_supported), 0x1, "", HFILL
                }
        },
        {
                &hf_sbc_ss_demodulator_mimo_2_ann_stc_matrix_b_horizontal,
                {
-                       "2-antenna STC Matrix B, horizontal coding", "wimax.sbc.ss_demodulator.mimo.2.antenna.stc.matrix.b.horizontal", 
+                       "2-antenna STC Matrix B, horizontal coding", "wmx.sbc.ss_demodulator.mimo.2.antenna.stc.matrix.b.horizontal",
                        FT_BOOLEAN, 16, TFS(&tfs_supported), 0x4, "", HFILL
                }
        },
        {
                &hf_sbc_ss_demodulator_mimo_2_ann_stc_matrix_b_vertical,
                {
-                       "2-antenna STC Matrix B, vertical coding", "wimax.sbc.ss_demodulator.mimo.2.antenna.stc.matrix.b.vertical", 
+                       "2-antenna STC Matrix B, vertical coding", "wmx.sbc.ss_demodulator.mimo.2.antenna.stc.matrix.b.vertical",
                        FT_BOOLEAN, 16, TFS(&tfs_supported), 0x2, "", HFILL
                }
        },
        {
                &hf_sbc_ss_demodulator_mimo_4_ann_stc_matrix_a,
                {
-                       "4-antenna STC Matrix A", "wimax.sbc.ss_demodulator.mimo.4.antenna.stc.matrix.a", 
+                       "4-antenna STC Matrix A", "wmx.sbc.ss_demodulator.mimo.4.antenna.stc.matrix.a",
                        FT_BOOLEAN, 16, TFS(&tfs_supported), 0x8, "", HFILL
                }
        },
        {
                &hf_sbc_ss_demodulator_mimo_4_ann_stc_matrix_b_horizontal,
                {
-                       "4-antenna STC Matrix B, horizontal coding", "wimax.sbc.ss_demodulator.mimo.4.antenna.stc.matrix.b.horizontal", 
+                       "4-antenna STC Matrix B, horizontal coding", "wmx.sbc.ss_demodulator.mimo.4.antenna.stc.matrix.b.horizontal",
                        FT_BOOLEAN, 16, TFS(&tfs_supported), 0x20, "", HFILL
                }
        },
        {
                &hf_sbc_ss_demodulator_mimo_4_ann_stc_matrix_b_vertical,
                {
-                       "4-antenna STC Matrix B, vertical coding", "wimax.sbc.ss_demodulator.mimo.4.antenna.stc.matrix.b.vertical", 
+                       "4-antenna STC Matrix B, vertical coding", "wmx.sbc.ss_demodulator.mimo.4.antenna.stc.matrix.b.vertical",
                        FT_BOOLEAN, 16, TFS(&tfs_supported), 0x10, "", HFILL
                }
        },
        {
                &hf_sbc_ss_demodulator_mimo_4_ann_stc_matrix_c_horizontal,
                {
-                       "4-antenna STC Matrix C, horizontal coding", "wimax.sbc.ss_demodulator.mimo.4.antenna.stc.matrix.c.horizontal", 
+                       "4-antenna STC Matrix C, horizontal coding", "wmx.sbc.ss_demodulator.mimo.4.antenna.stc.matrix.c.horizontal",
                        FT_BOOLEAN, 16, TFS(&tfs_supported), 0x80, "", HFILL
                }
        },
        {
                &hf_sbc_ss_demodulator_mimo_4_ann_stc_matrix_c_vertical,
                {
-                       "4-antenna STC Matrix C, vertical coding", "wimax.sbc.ss_demodulator.mimo.4.antenna.stc.matrix.c.vertical", 
+                       "4-antenna STC Matrix C, vertical coding", "wmx.sbc.ss_demodulator.mimo.4.antenna.stc.matrix.c.vertical",
                        FT_BOOLEAN, 16, TFS(&tfs_supported), 0x40, "", HFILL
                }
        },
        {
                &hf_sbc_ss_demodulator_mimo_rsvd,
                {
-                       "Reserved", "wimax.sbc.ss_demodulator.mimo.reserved", 
+                       "Reserved", "wmx.sbc.ss_demodulator.mimo.reserved",
                        FT_UINT16, BASE_HEX, NULL, 0xFF00, "", HFILL
                }
        },
        {
                &hf_sbc_ss_demodulator_mimo_support,
                {
-                       "OFDMA SS Demodulator For MIMO Support", "wimax.sbc.ss_demodulator.mimo.support", 
+                       "OFDMA SS Demodulator For MIMO Support", "wmx.sbc.ss_demodulator.mimo.support",
                        FT_UINT16, BASE_HEX, NULL, 0x0, "", HFILL
                }
        },
@@ -1413,140 +1413,140 @@ static hf_register_info hf_sbc[] =
        {       /* 11.8.3.7.12 - 170 */
                &hf_sbc_ofdma_ss_uplink_power_control_support,
                {
-                       "OFDMA SS uplink power control support", "wimax.sbc.ofdma_ss_uplink_power_control_support", 
+                       "OFDMA SS uplink power control support", "wmx.sbc.ofdma_ss_uplink_power_control_support",
                        FT_UINT8, BASE_HEX, NULL, 0x0, "", HFILL
                }
        },
        {
                &hf_sbc_ofdma_ss_uplink_power_control_support_open_loop,
                {
-                       "Open loop", "wimax.sbc.ofdma_ss_uplink_power_control_support.open_loop",
+                       "Open loop", "wmx.sbc.ofdma_ss_uplink_power_control_support.open_loop",
                        FT_UINT8, BASE_HEX, NULL, 0x01, "", HFILL
                }
        },
        {
                &hf_sbc_ofdma_ss_uplink_power_control_support_aas_preamble,
                {
-                       "AAS preamble", "wimax.sbc.ofdma_ss_uplink_power_control_support.aas_preamble",
+                       "AAS preamble", "wmx.sbc.ofdma_ss_uplink_power_control_support.aas_preamble",
                        FT_UINT8, BASE_HEX, NULL, 0x02, "", HFILL
                }
        },
        {
                &hf_sbc_ofdma_ss_uplink_power_control_support_rsvd,
                {
-                       "Reserved", "wimax.sbc.ofdma_ss_uplink_power_control_support.rsvd",
+                       "Reserved", "wmx.sbc.ofdma_ss_uplink_power_control_support.rsvd",
                        FT_UINT8, BASE_HEX, NULL, 0xFC, "", HFILL
                }
        },
        {
                &hf_sbc_tlv_t_172_dl_region_definition_support,
                {
-                       "DL Region Definition Support", "wimax.sbc.ofdma_map_capability.dl_region_definition_support", 
+                       "DL Region Definition Support", "wmx.sbc.ofdma_map_capability.dl_region_definition_support",
                        FT_BOOLEAN, 8, TFS(&tfs_supported), 0x10, "", HFILL
                }
        },
        {       /* 11.8.3.7.12 - 172 */
                &hf_sbc_tlv_t_172,
                {
-                       "Support For Extended HARQ", "wimax.sbc.ofdma_map_capability.extended_harq", 
+                       "Support For Extended HARQ", "wmx.sbc.ofdma_map_capability.extended_harq",
                        FT_UINT8, BASE_HEX, NULL, 0x0, "", HFILL
                }
        },
        {
                &hf_sbc_tlv_t_172_extended_harq_ie_capability,
                {
-                       "Extended HARQ IE Capability", "wimax.sbc.ofdma_map_capability.extended_harq_ie_capability", 
+                       "Extended HARQ IE Capability", "wmx.sbc.ofdma_map_capability.extended_harq_ie_capability",
                        FT_BOOLEAN, 8, TFS(&tfs_supported), 0x2, "", HFILL
                }
        },
        {
                &hf_sbc_tlv_t_172_harq_map_capability,
                {
-                       "HARQ MAP Capability", "wimax.sbc.ofdma_map_capability.harq_map_capability", 
+                       "HARQ MAP Capability", "wmx.sbc.ofdma_map_capability.harq_map_capability",
                        FT_BOOLEAN, 8, TFS(&tfs_supported), 0x1, "", HFILL
                }
        },
        {       /* 11.8.3.7.12 - 171 */
                &hf_sbc_tlv_t_171_minimum_num_of_frames,
                {
-                       "The Minimum Number Of Frames That SS Takes To Switch From The Open Loop Power Control Scheme To The Closed Loop Power Control Scheme Or Vice Versa", "wimax.sbc.ofdma_ss_uplink_power_control_support.minimum_num_of_frames", 
+                       "The Minimum Number Of Frames That SS Takes To Switch From The Open Loop Power Control Scheme To The Closed Loop Power Control Scheme Or Vice Versa", "wmx.sbc.ofdma_ss_uplink_power_control_support.minimum_num_of_frames",
                        FT_UINT8, BASE_DEC, NULL, 0x0, "", HFILL
                }
        },
        {
                &hf_sbc_tlv_t_172_reserved,
                {
-                       "Reserved", "wimax.sbc.ofdma_map_capability.reserved", 
+                       "Reserved", "wmx.sbc.ofdma_map_capability.reserved",
                        FT_UINT8, BASE_HEX, NULL, 0xE0, "", HFILL
                }
        },
        {
                &hf_sbc_tlv_t_172_sub_map_capability_first_zone,
                {
-                       "Sub MAP Capability For First Zone", "wimax.sbc.ofdma_map_capability.sub_map_capability_first_zone", 
+                       "Sub MAP Capability For First Zone", "wmx.sbc.ofdma_map_capability.sub_map_capability_first_zone",
                        FT_BOOLEAN, 8, TFS(&tfs_supported), 0x4, "", HFILL
                }
        },
        {
                &hf_sbc_tlv_t_172_sub_map_capability_other_zones,
                {
-                       "Sub MAP Capability For Other Zones", "wimax.sbc.ofdma_map_capability.sub_map_capability_other_zones", 
+                       "Sub MAP Capability For Other Zones", "wmx.sbc.ofdma_map_capability.sub_map_capability_other_zones",
                        FT_BOOLEAN, 8, TFS(&tfs_supported), 0x8, "", HFILL
                }
        },
        {       /* 11.8.3.7.14 */
                &hf_sbc_tlv_t_174_ofdma_ms_csit_capability,
                {
-                       "OFDMA MS CSIT Capability", "wimax.sbc.ofdma_ms_csit_capability", 
+                       "OFDMA MS CSIT Capability", "wmx.sbc.ofdma_ms_csit_capability",
                        FT_UINT8, BASE_HEX, NULL, 0x0, "", HFILL
                }
        },
        {
                &hf_sbc_tlv_t_174_csit_compatibility_type_a,
                {
-                       "CSIT Compatibility Type A", "wimax.sbc.ofdma_ms_csit_capability.csit_compatibility_type_a", 
+                       "CSIT Compatibility Type A", "wmx.sbc.ofdma_ms_csit_capability.csit_compatibility_type_a",
                        FT_BOOLEAN, 16, TFS(&tfs_supported), 0x1, "", HFILL
                }
        },
        {
                &hf_sbc_tlv_t_174_csit_compatibility_type_b,
                {
-                       "CSIT Compatibility Type B", "wimax.sbc.ofdma_ms_csit_capability.csit_compatibility_type_b", 
+                       "CSIT Compatibility Type B", "wmx.sbc.ofdma_ms_csit_capability.csit_compatibility_type_b",
                        FT_BOOLEAN, 16, TFS(&tfs_supported), 0x2, "", HFILL
                }
        },
        {
                &hf_sbc_tlv_t_174_max_num_simultanous_sounding_instructions,
                {
-                       "Max Number Of Simultaneous Sounding Instructions", "wimax.sbc.ofdma_ms_csit_capability.max_num_simultaneous_sounding_instructions", 
+                       "Max Number Of Simultaneous Sounding Instructions", "wmx.sbc.ofdma_ms_csit_capability.max_num_simultaneous_sounding_instructions",
                        FT_UINT16, BASE_DEC, NULL, 0x03C0, "", HFILL
                }
        },
        {
                &hf_sbc_tlv_t_174_power_assignment_capability,
                {
-                       "Power Assignment Capability", "wimax.sbc.ofdma_ms_csit_capability.power_assignment_capability", 
+                       "Power Assignment Capability", "wmx.sbc.ofdma_ms_csit_capability.power_assignment_capability",
                        FT_BOOLEAN, 16, TFS(&tfs_supported), 0x4, "", HFILL
                }
        },
        {
                &hf_sbc_tlv_t_174_ss_csit_reserved,
                {
-                       "Reserved", "wimax.sbc.ofdma_ms_csit_capability.reserved", 
+                       "Reserved", "wmx.sbc.ofdma_ms_csit_capability.reserved",
                        FT_UINT16, BASE_HEX, NULL, 0xF800, "", HFILL
                }
        },
        {
                &hf_sbc_tlv_t_174_sounding_rsp_time_capability,
                {
-                       "Sounding Response Time Capability", "wimax.sbc.ofdma_ms_csit_capability.sounding_response_time_capability", 
+                       "Sounding Response Time Capability", "wmx.sbc.ofdma_ms_csit_capability.sounding_response_time_capability",
                        FT_BOOLEAN, 16, VALS(vals_sounding_rsp_time_cap_codings), 0x0038, "", HFILL
                }
        },
        {
                &hf_sbc_tlv_t_174_ss_csit_type_a_support,
                {
-                       "SS Does Not Support P Values Of 9 And 18 When Supporting CSIT Type A", "wimax.sbc.ofdma_ms_csit_capability.type_a_support", 
+                       "SS Does Not Support P Values Of 9 And 18 When Supporting CSIT Type A", "wmx.sbc.ofdma_ms_csit_capability.type_a_support",
                        FT_BOOLEAN, 16, TFS(&tfs_supported), 0x0400, "", HFILL
                }
        },
@@ -1554,175 +1554,175 @@ static hf_register_info hf_sbc[] =
                /* 11.8.3.7.20 */
                &hf_sbc_tlv_t_204_ofdma_parameters_sets,
                {
-                       "OFDMA parameters sets", "wimax.sbc.ofdma_parameters_sets",
+                       "OFDMA parameters sets", "wmx.sbc.ofdma_parameters_sets",
                        FT_UINT8, BASE_HEX, NULL, 0x0, "", HFILL
                }
        },
        {
                &hf_sbc_tlv_t_204_ofdma_parameters_sets_phy_set_a,
                {
-                       "Support OFDMA PHY parameter set A", "wimax.sbc.ofdma_parameters_sets.phy_set_a",
+                       "Support OFDMA PHY parameter set A", "wmx.sbc.ofdma_parameters_sets.phy_set_a",
                        FT_UINT8, BASE_HEX, NULL, 0x01, "", HFILL
                }
        },
        {
                &hf_sbc_tlv_t_204_ofdma_parameters_sets_phy_set_b,
                {
-                       "Support OFDMA PHY parameter set B", "wimax.sbc.ofdma_parameters_sets.phy_set_b",
+                       "Support OFDMA PHY parameter set B", "wmx.sbc.ofdma_parameters_sets.phy_set_b",
                        FT_UINT8, BASE_HEX, NULL, 0x02, "", HFILL
                }
        },
        {
                &hf_sbc_tlv_t_204_ofdma_parameters_sets_harq_parameters_set,
                {
-                       "HARQ parameters set", "wimax.sbc.ofdma_parameters_sets.harq_parameters_set",
+                       "HARQ parameters set", "wmx.sbc.ofdma_parameters_sets.harq_parameters_set",
                        FT_UINT8, BASE_HEX, VALS(vals_sbc_harq_parameters_set), 0x1C, "", HFILL
                }
        },
        {
                &hf_sbc_tlv_t_204_ofdma_parameters_sets_mac_set_a,
                {
-                       "Support OFDMA MAC parameters set A", "wimax.sbc.ofdma_parameters_sets.mac_set_a",
+                       "Support OFDMA MAC parameters set A", "wmx.sbc.ofdma_parameters_sets.mac_set_a",
                        FT_UINT8, BASE_HEX, NULL, 0x20, "", HFILL
                }
        },
        {
                &hf_sbc_tlv_t_204_ofdma_parameters_sets_mac_set_b,
                {
-                       "Support OFDMA MAC parameters set B", "wimax.sbc.ofdma_parameters_sets.mac_set_b",
+                       "Support OFDMA MAC parameters set B", "wmx.sbc.ofdma_parameters_sets.mac_set_b",
                        FT_UINT8, BASE_HEX, NULL, 0x40, "", HFILL
                }
        },
        {
                &hf_sbc_tlv_t_204_ofdma_parameters_sets_reserved,
                {
-                       "Reserved", "wimax.sbc.ofdma_parameters_sets.reserved",
+                       "Reserved", "wmx.sbc.ofdma_parameters_sets.reserved",
                        FT_UINT8, BASE_HEX, NULL, 0x80, "", HFILL
                }
        },
        {       /* 11.8.3.7.16 */
                &hf_sbc_tlv_t_177_ofdma_ss_modulator_for_mimo_support,
                {
-                       "OFDMA SS Modulator For MIMO Support", "wimax.sbc.ofdma_ss_modulator_for_mimo_support", 
+                       "OFDMA SS Modulator For MIMO Support", "wmx.sbc.ofdma_ss_modulator_for_mimo_support",
                        FT_UINT8, BASE_HEX, NULL, 0x0, "", HFILL
                }
        },
        {
                &hf_sbc_tlv_t_177_adaptive_rate_ctl,
                {
-                       "Capable Of Adaptive Rate Control", "wimax.sbc.ofdma_ss_modulator_for_mimo_support.capable_adaptive_rate_control", 
+                       "Capable Of Adaptive Rate Control", "wmx.sbc.ofdma_ss_modulator_for_mimo_support.capable_adaptive_rate_control",
                        FT_BOOLEAN, 8, TFS(&tfs_supported), 0x10, "", HFILL
                }
        },
        {
                &hf_sbc_tlv_t_177_beamforming,
                {
-                       "Capable Of Beamforming", "wimax.sbc.ofdma_ss_modulator_for_mimo_support.capable_beamforming", 
+                       "Capable Of Beamforming", "wmx.sbc.ofdma_ss_modulator_for_mimo_support.capable_beamforming",
                        FT_BOOLEAN, 8, TFS(&tfs_supported), 0x8, "", HFILL
                }
        },
        {
                &hf_sbc_tlv_t_177_single_antenna,
                {
-                       "Capable of single antenna transmission", "wimax.sbc.ofdma_ss_modulator_for_mimo_support.capable_single_antenna", 
+                       "Capable of single antenna transmission", "wmx.sbc.ofdma_ss_modulator_for_mimo_support.capable_single_antenna",
                        FT_BOOLEAN, 8, TFS(&tfs_supported), 0x20, "", HFILL
                }
        },
        {
                &hf_sbc_tlv_t_177_stc_matrix_b_horizontal,
                {
-                       "Capable of 2-antenna STC Matrix B, Horizontal coding", "wimax.sbc.ofdma_ss_modulator_for_mimo_support.stc_matrix_b_horizontal", 
+                       "Capable of 2-antenna STC Matrix B, Horizontal coding", "wmx.sbc.ofdma_ss_modulator_for_mimo_support.stc_matrix_b_horizontal",
                        FT_BOOLEAN, 8, TFS(&tfs_supported), 0x4, "", HFILL
                }
        },
        {
                &hf_sbc_tlv_t_177_two_transmit_antennas,
                {
-                       "Two transmit antennas", "wimax.sbc.ofdma_ss_modulator_for_mimo_support.two_transmit_antennas",
+                       "Two transmit antennas", "wmx.sbc.ofdma_ss_modulator_for_mimo_support.two_transmit_antennas",
                        FT_BOOLEAN, 8, TFS(&tfs_supported), 0x1, "", HFILL
                }
        },
        {
                &hf_sbc_tlv_t_177_capable_of_transmit_diversity,
                {
-                       "Capable of transmit diversity", "wimax.sbc.ofdma_ss_modulator_for_mimo_support.capable_of_transmit_diversity",
+                       "Capable of transmit diversity", "wmx.sbc.ofdma_ss_modulator_for_mimo_support.capable_of_transmit_diversity",
                        FT_BOOLEAN, 8, TFS(&tfs_supported), 0x2, "", HFILL
                }
        },
        {
                &hf_sbc_tlv_t_177_capable_of_spacial_multiplexing,
                {
-                       "Capable of spatial multiplexing", "wimax.sbc.ofdma_ss_modulator_for_mimo_support.capable_of_spatial_multiplexing",
+                       "Capable of spatial multiplexing", "wmx.sbc.ofdma_ss_modulator_for_mimo_support.capable_of_spatial_multiplexing",
                        FT_BOOLEAN, 8, TFS(&tfs_supported), 0x4, "", HFILL
                }
        },
        {
                &hf_sbc_tlv_t_177_stc_matrix_b_vertical,
                {
-                       "Capable of 2-antenna STC Matrix B, Vertical coding", "wimax.sbc.ofdma_ss_modulator_for_mimo_support.stc_matrix_b_vertical", 
+                       "Capable of 2-antenna STC Matrix B, Vertical coding", "wmx.sbc.ofdma_ss_modulator_for_mimo_support.stc_matrix_b_vertical",
                        FT_BOOLEAN, 8, TFS(&tfs_supported), 0x2, "", HFILL
                }
        },
        {
                &hf_sbc_tlv_t_177_collaborative_sm_with_one_antenna,
                {
-                       "Capable of collaborative SM with one antenna", "wimax.sbc.ofdma_ss_modulator_for_mimo_support.collaborative_sm_with_one_antenna", 
+                       "Capable of collaborative SM with one antenna", "wmx.sbc.ofdma_ss_modulator_for_mimo_support.collaborative_sm_with_one_antenna",
                        FT_BOOLEAN, 8, TFS(&tfs_supported), 0x40, "", HFILL
                }
        },
        {
                &hf_sbc_tlv_t_177_collaborative_sm_with_two_antennas,
                {
-                       "Collaborative SM with two antennas", "wimax.sbc.ofdma_ss_modulator_for_mimo_support.collaborative_sm_with_two_antennas", 
+                       "Collaborative SM with two antennas", "wmx.sbc.ofdma_ss_modulator_for_mimo_support.collaborative_sm_with_two_antennas",
                        FT_UINT8, BASE_HEX, NULL, 0x80, "", HFILL
                }
        },
        {
                &hf_sbc_tlv_t_177_capable_of_two_antenna,
                {
-                       "Capable of two antenna", "wimax.sbc.ofdma_ss_modulator_for_mimo_support.capable_of_two_antenna",
+                       "Capable of two antenna", "wmx.sbc.ofdma_ss_modulator_for_mimo_support.capable_of_two_antenna",
                        FT_UINT8, BASE_HEX, NULL, 0x40, "", HFILL
                }
        },
        {
                &hf_sbc_tlv_t_177_rsvd,
                {
-                       "Reserved", "wimax.sbc.ofdma_ss_modulator_for_mimo_support.rsvd",
+                       "Reserved", "wmx.sbc.ofdma_ss_modulator_for_mimo_support.rsvd",
                        FT_UINT8, BASE_HEX, NULL, 0x80, "", HFILL
                }
        },
        {
                &hf_sbc_tlv_t_177_stc_matrix_a,
                {
-                       "Capable of 2-antenna STC Matrix A", "wimax.sbc.ofdma_ss_modulator_for_mimo_support.stc_matrix_a", 
+                       "Capable of 2-antenna STC Matrix A", "wmx.sbc.ofdma_ss_modulator_for_mimo_support.stc_matrix_a",
                        FT_BOOLEAN, 8, TFS(&tfs_supported), 0x1, "", HFILL
                }
        },
        {       /* 11.8.3.7.17 */
                &hf_sbc_tlv_t_178_sdma_pilot_capability,
                {
-                       "SDMA Pilot Capability", "wimax.sbc.sdma_pilot_capability", 
+                       "SDMA Pilot Capability", "wmx.sbc.sdma_pilot_capability",
                        FT_UINT8, BASE_HEX, NULL, 0x0, "", HFILL
                }
        },
        {
                &hf_sbc_tlv_t_178_reserved,
                {
-                       "Reserved", "wimax.sbc.sdma_pilot_capability.reserved", 
+                       "Reserved", "wmx.sbc.sdma_pilot_capability.reserved",
                        FT_UINT8, BASE_HEX, NULL, 0xFC, "", HFILL
                }
        },
        {
                &hf_sbc_tlv_t_178_sdma_pilot_pattern_support_for_amc_zone,
                {
-                       "SDMA Pilot Patterns Support For AMC Zone", "wimax.sbc.sdma_pilot_capability.sdma_pilot_pattern_support_for_amc_zone", 
+                       "SDMA Pilot Patterns Support For AMC Zone", "wmx.sbc.sdma_pilot_capability.sdma_pilot_pattern_support_for_amc_zone",
                        FT_BOOLEAN, 8, VALS(vals_sbc_sdma_str), 0x03, "", HFILL
                }
        },
        {       /* 11.8.3.7.2 - type 151 */
                &hf_sbc_ss_demodulator,
                {
-                       "OFDMA SS Demodulator", "wimax.sbc.ss_demodulator", 
+                       "OFDMA SS Demodulator", "wmx.sbc.ss_demodulator",
                        FT_BYTES, BASE_HEX, NULL, 0x0, "", HFILL
                }
        },
@@ -1730,28 +1730,28 @@ static hf_register_info hf_sbc[] =
        {
                &hf_sbc_ss_demodulator_64qam,
                {
-                       "64-QAM", "wimax.sbc.ss_demodulator.64qam", 
+                       "64-QAM", "wmx.sbc.ss_demodulator.64qam",
                        FT_BOOLEAN, 8, TFS(&tfs_supported), 0x1, "", HFILL
                }
        },
        {
                &hf_sbc_ss_demodulator_btc,
                {
-                       "BTC", "wimax.sbc.ss_demodulator.btc", 
+                       "BTC", "wmx.sbc.ss_demodulator.btc",
                        FT_BOOLEAN, 8, TFS(&tfs_supported), 0x2, "", HFILL
                }
        },
        {
                &hf_sbc_ss_demodulator_cc_with_optional_interleaver,
                {
-                       "CC with Optional Interleaver", "wimax.sbc.ss_demodulator.cc_with_optional_interleaver", 
+                       "CC with Optional Interleaver", "wmx.sbc.ss_demodulator.cc_with_optional_interleaver",
                        FT_BOOLEAN, 8, TFS(&tfs_supported), 0x10, "", HFILL
                }
        },
        {
                &hf_sbc_ss_demodulator_ctc,
                {
-                       "CTC", "wimax.sbc.ss_demodulator.ctc", 
+                       "CTC", "wmx.sbc.ss_demodulator.ctc",
                        FT_BOOLEAN, 8, TFS(&tfs_supported), 0x4, "", HFILL
                }
        },
@@ -1759,119 +1759,119 @@ static hf_register_info hf_sbc[] =
        {
                &hf_sbc_ss_demodulator_64qam_2,
                {
-                       "64-QAM", "wimax.sbc.ss_demodulator.64qam", 
+                       "64-QAM", "wmx.sbc.ss_demodulator.64qam",
                        FT_BOOLEAN, 16, TFS(&tfs_supported), 0x1, "", HFILL
                }
        },
        {
                &hf_sbc_ss_demodulator_btc_2,
                {
-                       "BTC", "wimax.sbc.ss_demodulator.btc", 
+                       "BTC", "wmx.sbc.ss_demodulator.btc",
                        FT_BOOLEAN, 16, TFS(&tfs_supported), 0x2, "", HFILL
                }
        },
        {
                &hf_sbc_ss_demodulator_cc_with_optional_interleaver_2,
                {
-                       "CC with Optional Interleaver", "wimax.sbc.ss_demodulator.cc_with_optional_interleaver", 
+                       "CC with Optional Interleaver", "wmx.sbc.ss_demodulator.cc_with_optional_interleaver",
                        FT_BOOLEAN, 16, TFS(&tfs_supported), 0x10, "", HFILL
                }
        },
        {
                &hf_sbc_ss_demodulator_ctc_2,
                {
-                       "CTC", "wimax.sbc.ss_demodulator.ctc", 
+                       "CTC", "wmx.sbc.ss_demodulator.ctc",
                        FT_BOOLEAN, 16, TFS(&tfs_supported), 0x4, "", HFILL
                }
        },
        {
                &hf_sbc_ss_demodulator_dedicated_pilots_2,
                {
-                       "Dedicated Pilots", "wimax.sbc.ss_demodulator.dedicated_pilots", 
+                       "Dedicated Pilots", "wmx.sbc.ss_demodulator.dedicated_pilots",
                        FT_BOOLEAN, 16, TFS(&tfs_supported), 0x400, "", HFILL
                }
        },
        {
                &hf_sbc_ss_demodulator_harq_cc_ir_2,
                {
-                       "HARQ CC_IR", "wimax.sbc.ss_demodulator.harq.cc.ir", 
+                       "HARQ CC_IR", "wmx.sbc.ss_demodulator.harq.cc.ir",
                        FT_BOOLEAN, 16, TFS(&tfs_supported), 0x100, "", HFILL
                }
        },
        {
                &hf_sbc_ss_demodulator_harq_chase,
                {
-                       "HARQ Chase", "wimax.sbc.ss_demodulator.harq.chase", 
+                       "HARQ Chase", "wmx.sbc.ss_demodulator.harq.chase",
                        FT_BOOLEAN, 8, TFS(&tfs_supported), 0x20, "", HFILL
                }
        },
        {
                &hf_sbc_ss_demodulator_harq_chase_2,
                {
-                       "HARQ Chase", "wimax.sbc.ss_demodulator.harq.chase", 
+                       "HARQ Chase", "wmx.sbc.ss_demodulator.harq.chase",
                        FT_BOOLEAN, 16, TFS(&tfs_supported), 0x20, "", HFILL
                }
        },
        {
                &hf_sbc_ss_demodulator_harq_ctc_ir,
                {
-                       "HARQ CTC_IR", "wimax.sbc.ss_demodulator.harq.ctc.ir", 
+                       "HARQ CTC_IR", "wmx.sbc.ss_demodulator.harq.ctc.ir",
                        FT_BOOLEAN, 8, TFS(&tfs_supported), 0x40, "", HFILL
                }
        },
        {
                &hf_sbc_ss_demodulator_harq_ctc_ir_2,
                {
-                       "HARQ CTC_IR", "wimax.sbc.ss_demodulator.harq.ctc.ir", 
+                       "HARQ CTC_IR", "wmx.sbc.ss_demodulator.harq.ctc.ir",
                        FT_BOOLEAN, 16, TFS(&tfs_supported), 0x40, "", HFILL
                }
        },
        {
                &hf_sbc_ss_demodulator_ldpc_2,
                {
-                       "LDPC", "wimax.sbc.ss_demodulator.ldpc", 
+                       "LDPC", "wmx.sbc.ss_demodulator.ldpc",
                        FT_BOOLEAN, 16, TFS(&tfs_supported), 0x200, "", HFILL
                }
        },
        {
                &hf_sbc_ss_demodulator_reserved,
                {
-                       "Reserved", "wimax.sbc.ss_demodulator.reserved1", 
+                       "Reserved", "wmx.sbc.ss_demodulator.reserved1",
                        FT_UINT8, BASE_HEX, NULL, 0x80, "", HFILL
                }
        },
        {
                &hf_sbc_ss_demodulator_reserved_2,
                {
-                       "Reserved", "wimax.sbc.ss_demodulator.reserved2", 
+                       "Reserved", "wmx.sbc.ss_demodulator.reserved2",
                        FT_UINT16, BASE_HEX, NULL, 0x80, "", HFILL
                }
        },
        {
                &hf_sbc_ss_demodulator_reserved1_2,
                {
-                       "Reserved", "wimax.sbc.ss_demodulator.reserved2", 
+                       "Reserved", "wmx.sbc.ss_demodulator.reserved2",
                        FT_UINT16, BASE_HEX, NULL, 0x800, "", HFILL
                }
        },
        {       /* if the number of DL H-ARQ channels > 7 but tlv length = 1 */
                &hf_sbc_ss_demodulator_reserved1,
                {
-                       "Reserved", "wimax.sbc.ss_demodulator.reserved1", 
+                       "Reserved", "wmx.sbc.ss_demodulator.reserved1",
                        FT_UINT16, BASE_HEX, NULL, 0xFFFF, "", HFILL
                }
        },
        {
                &hf_sbc_ss_demodulator_stc,
                {
-                       "STC", "wimax.sbc.ss_demodulator.stc", 
+                       "STC", "wmx.sbc.ss_demodulator.stc",
                        FT_BOOLEAN, 8, TFS(&tfs_supported), 0x8, "", HFILL
                }
        },
        {
                &hf_sbc_ss_demodulator_stc_2,
                {
-                       "STC", "wimax.sbc.ss_demodulator.stc", 
+                       "STC", "wmx.sbc.ss_demodulator.stc",
                        FT_BOOLEAN, 16, TFS(&tfs_supported), 0x8, "", HFILL
                }
        },
@@ -1879,307 +1879,307 @@ static hf_register_info hf_sbc[] =
        {       /* 11.8.3.7.1 */
                &hf_sbc_ss_fft_sizes,
                {
-                       "OFDMA SS FFT Sizes", "wimax.sbc.ss_fft_sizes", 
+                       "OFDMA SS FFT Sizes", "wmx.sbc.ss_fft_sizes",
                        FT_UINT8, BASE_HEX, NULL, 0x0, "", HFILL
                }
        },
         {
                &hf_sbc_ss_fft_128,
                {
-                       "FFT-128", "wimax.sbc.ss_fft_sizes.128", 
+                       "FFT-128", "wmx.sbc.ss_fft_sizes.128",
                        FT_BOOLEAN, 8, TFS(&tfs_supported), 0x4, "", HFILL
                }
        },
        {
                &hf_sbc_ss_fft_256,
                {
-                       "FFT-256", "wimax.sbc.ss_fft_sizes.256", 
+                       "FFT-256", "wmx.sbc.ss_fft_sizes.256",
                        FT_BOOLEAN, 8, TFS(&tfs_supported), 0x1, "", HFILL
                }
        },
        {
                &hf_sbc_ss_fft_512,
                {
-                       "FFT-512", "wimax.sbc.ss_fft_sizes.512", 
+                       "FFT-512", "wmx.sbc.ss_fft_sizes.512",
                        FT_BOOLEAN, 8, TFS(&tfs_supported), 0x8, "", HFILL
                }
        },
        {
                &hf_sbc_ss_fft_1024,
                {
-                       "FFT-1024", "wimax.sbc.ss_fft_sizes.1024", 
+                       "FFT-1024", "wmx.sbc.ss_fft_sizes.1024",
                        FT_BOOLEAN, 8, TFS(&tfs_supported), 0x10, "", HFILL
                }
        },
        {
                &hf_sbc_ss_fft_2048,
                {
-                       "FFT-2048", "wimax.sbc.ss_fft_sizes.2048", 
+                       "FFT-2048", "wmx.sbc.ss_fft_sizes.2048",
                        FT_BOOLEAN, 8, TFS(&tfs_supported), 0x2, "", HFILL
                }
        },
        {
                &hf_sbc_ss_fft_rsvd1,
                {
-                       "Reserved", "wimax.sbc_ss_fft_sizes_rsvd1",
+                       "Reserved", "wmx.sbc_ss_fft_sizes_rsvd1",
                        FT_UINT8, BASE_HEX, NULL, 0x01, "", HFILL
                }
        },
        {
                &hf_sbc_ss_fft_rsvd2,
                {
-                       "Reserved", "wimax.sbc.ss_fft_sizes.rsvd2", 
+                       "Reserved", "wmx.sbc.ss_fft_sizes.rsvd2",
                        FT_UINT8, BASE_HEX, NULL, 0xE0, "", HFILL
                }
        },
        {
                &hf_sbc_ofdm_ss_minimum_num_of_frames,
                {
-                       "SS minimum number of frames", "wimax.sbc.ss_minimum_num_of_frames",
+                       "SS minimum number of frames", "wmx.sbc.ss_minimum_num_of_frames",
                        FT_UINT8, BASE_HEX, NULL, 0x0, "", HFILL
                }
        },
        {
                &hf_sbc_ss_mimo_uplink_support_rsvd,
                {
-                       "Reserved", "wimax.sbc.ss_mimo_ul_support.rsvd", 
+                       "Reserved", "wmx.sbc.ss_mimo_ul_support.rsvd",
                        FT_UINT8, BASE_HEX, NULL, 0xF8, "", HFILL
                }
        },
        {       /* 11.8.3.7.3 - type 152 */
                &hf_sbc_ss_modulator,
                {
-                       "OFDMA SS Modulator", "wimax.sbc.ss_modulator", 
+                       "OFDMA SS Modulator", "wmx.sbc.ss_modulator",
                        FT_UINT8, BASE_HEX, NULL, 0x0, "", HFILL
                }
        },
        {
                &hf_sbc_ss_modulator_64qam,
                {
-                       "64-QAM", "wimax.sbc.ss_modulator.64qam", 
+                       "64-QAM", "wmx.sbc.ss_modulator.64qam",
                        FT_BOOLEAN, 8, TFS(&tfs_supported), 0x1, "", HFILL
                }
        },
        {
                &hf_sbc_ss_modulator_btc,
                {
-                       "BTC", "wimax.sbc.ss_modulator.btc", 
+                       "BTC", "wmx.sbc.ss_modulator.btc",
                        FT_BOOLEAN, 8, TFS(&tfs_supported), 0x2, "", HFILL
                }
        },
        {
                &hf_sbc_ss_modulator_cc_ir,
                {
-                       "CC_IR", "wimax.sbc.ss_modulator.cc_ir", 
+                       "CC_IR", "wmx.sbc.ss_modulator.cc_ir",
                        FT_BOOLEAN, 8, TFS(&tfs_supported), 0x40, "", HFILL
                }
        },
        {
                &hf_sbc_ss_modulator_ctc,
                {
-                       "CTC", "wimax.sbc.ss_modulator.ctc", 
+                       "CTC", "wmx.sbc.ss_modulator.ctc",
                        FT_BOOLEAN, 8, TFS(&tfs_supported), 0x4, "", HFILL
                }
        },
        {
                &hf_sbc_ss_modulator_ctc_ir,
                {
-                       "CTC_IR", "wimax.sbc.ss_modulator.ctc_ir", 
+                       "CTC_IR", "wmx.sbc.ss_modulator.ctc_ir",
                        FT_BOOLEAN, 8, TFS(&tfs_supported), 0x20, "", HFILL
                }
        },
        {
                &hf_sbc_ss_modulator_harq_chase,
                {
-                       "HARQ Chase", "wimax.sbc.ss_modulator.harq_chase", 
+                       "HARQ Chase", "wmx.sbc.ss_modulator.harq_chase",
                        FT_BOOLEAN, 8, TFS(&tfs_supported), 0x10, "", HFILL
                }
        },
        {
                &hf_sbc_ss_modulator_ldpc,
                {
-                       "LDPC", "wimax.sbc.ss_modulator.ldpc", 
+                       "LDPC", "wmx.sbc.ss_modulator.ldpc",
                        FT_BOOLEAN, 8, TFS(&tfs_supported), 0x80, "", HFILL
                }
        },
        {
                &hf_sbc_ss_modulator_stc,
                {
-                       "STC", "wimax.sbc.ss_modulator.stc", 
+                       "STC", "wmx.sbc.ss_modulator.stc",
                        FT_BOOLEAN, 8, TFS(&tfs_supported), 0x8, "", HFILL
                }
        },
        {       /* 11.8.3.7.4 */
                &hf_sbc_ss_permutation_support,
-               { 
-                       "OFMDA SS Permutation Support", "wimax.sbc.ss_permutation_support", 
+               {
+                       "OFMDA SS Permutation Support", "wmx.sbc.ss_permutation_support",
                        FT_UINT8, BASE_HEX, NULL, 0x0, "", HFILL
                }
        },
        {
                &hf_sbc_ss_amc_1x6,
-               { 
-                       "AMC 1x6 ", "wimax.sbc.ss_permutation_support.amc_1x6", 
+               {
+                       "AMC 1x6 ", "wmx.sbc.ss_permutation_support.amc_1x6",
                        FT_BOOLEAN, 8, TFS(&tfs_supported), 0x4, "", HFILL
                }
        },
        {
                &hf_sbc_ss_amc_2x3,
-               { 
-                       "AMC 2x3 ", "wimax.sbc.ss_permutation_support.amc_2x3", 
+               {
+                       "AMC 2x3 ", "wmx.sbc.ss_permutation_support.amc_2x3",
                        FT_BOOLEAN, 8, TFS(&tfs_supported), 0x8, "", HFILL
                }
        },
        {
                &hf_sbc_ss_amc_3x2,
-               { 
-                       "AMC 3x2 ", "wimax.sbc.ss_permutation_support.amc_3x2", 
+               {
+                       "AMC 3x2 ", "wmx.sbc.ss_permutation_support.amc_3x2",
                        FT_BOOLEAN, 8, TFS(&tfs_supported), 0x10, "", HFILL
                }
        },
        {
                &hf_sbc_ss_amc_with_harq_map,
-               { 
-                       "AMC Support With H-ARQ Map ", "wimax.sbc.ss_permutation_support.amc_support_harq_map", 
+               {
+                       "AMC Support With H-ARQ Map ", "wmx.sbc.ss_permutation_support.amc_support_harq_map",
                        FT_BOOLEAN, 8, TFS(&tfs_supported), 0x20, "", HFILL
                }
        },
        {
                &hf_sbc_ss_optimal_fusc,
-               { 
-                       "Optional FUSC", "wimax.sbc.ss_permutation_support.optimal_fusc", 
+               {
+                       "Optional FUSC", "wmx.sbc.ss_permutation_support.optimal_fusc",
                        FT_BOOLEAN, 8, TFS(&tfs_supported), 0x2, "", HFILL
                }
        },
        {
                &hf_sbc_ss_optimal_pusc,
-               { 
-                       "Optional PUSC", "wimax.sbc.ss_permutation_support.optimal_pusc", 
+               {
+                       "Optional PUSC", "wmx.sbc.ss_permutation_support.optimal_pusc",
                        FT_BOOLEAN, 8, TFS(&tfs_supported), 0x1, "", HFILL
                }
        },
        {
                &hf_sbc_ss_tusc1_support,
-               { 
-                       "TUSC1", "wimax.sbc.ss_permutation_support.tusc1_support", 
+               {
+                       "TUSC1", "wmx.sbc.ss_permutation_support.tusc1_support",
                        FT_BOOLEAN, 8, TFS(&tfs_supported), 0x40, "", HFILL
                }
        },
        {
                &hf_sbc_ss_tusc2_support,
-               { 
-                       "TUSC2", "wimax.sbc.ss_permutation_support.tusc2_support", 
+               {
+                       "TUSC2", "wmx.sbc.ss_permutation_support.tusc2_support",
                        FT_BOOLEAN, 8, TFS(&tfs_supported), 0x80, "", HFILL
                }
        },
        {
                &hf_sbc_ssrtg,
                {
-                       "SSRTG", "wimax.sbc.ssrtg", 
+                       "SSRTG", "wmx.sbc.ssrtg",
                        FT_UINT8, BASE_DEC, NULL, 0x0, "", HFILL
                }
        },
        {
                &hf_sbc_ssttg,
                {
-                       "SSTTG", "wimax.sbc.ssttg", 
+                       "SSTTG", "wmx.sbc.ssttg",
                        FT_UINT8, BASE_DEC, NULL, 0x0, "", HFILL
                }
        },
        {
                &hf_sbc_ss_support_2_concurrent_cqi_channels,
                {
-                       "Support for 2 Concurrent CQI Channels", "wimax.sbc.support_2_concurrent_cqi_channels", 
+                       "Support for 2 Concurrent CQI Channels", "wmx.sbc.support_2_concurrent_cqi_channels",
                        FT_BOOLEAN, 8, TFS(&tfs_supported), 0x40, "", HFILL
                }
        },
        {       /* 11.8.3.1 */
                &hf_sbc_transition_gaps,
                {
-                       "Subscriber Transition Gaps", "wimax.sbc.transition_gaps", 
+                       "Subscriber Transition Gaps", "wmx.sbc.transition_gaps",
                        FT_UINT16, BASE_HEX, NULL, 0x00, "", HFILL
                }
        },
        {       /* 11.8.3.7.13 */
                &hf_sbc_tlv_t_173_ul_ctl_channel_support,
                {
-                       "Uplink Control Channel Support", "wimax.sbc.ul_ctl_channel_support", 
+                       "Uplink Control Channel Support", "wmx.sbc.ul_ctl_channel_support",
                        FT_UINT8, BASE_HEX, NULL, 0x0, "", HFILL
                }
        },
        {
                &hf_sbc_tlv_t_173_3_bit_mimo_fast_feedback,
                {
-                       "3-bit MIMO Fast-feedback", "wimax.sbc.ul_ctl_channel_support.3bit_mimo_fast_feedback", 
+                       "3-bit MIMO Fast-feedback", "wmx.sbc.ul_ctl_channel_support.3bit_mimo_fast_feedback",
                        FT_BOOLEAN, 8, TFS(&tfs_supported), 0x1, "", HFILL
                }
        },
        {
                &hf_sbc_tlv_t_173_diuc_cqi_fast_feedback,
                {
-                       "DIUC-CQI Fast-feedback", "wimax.sbc.ul_ctl_channel_support.diuc_cqi_fast_feedback", 
+                       "DIUC-CQI Fast-feedback", "wmx.sbc.ul_ctl_channel_support.diuc_cqi_fast_feedback",
                        FT_BOOLEAN, 8, TFS(&tfs_supported), 0x80, "", HFILL
                }
        },
        {
                &hf_sbc_tlv_t_173_enhanced_fast_feedback,
                {
-                       "Enhanced Fast_feedback", "wimax.sbc.ul_ctl_channel_support.enhanced_fast_feedback", 
+                       "Enhanced Fast_feedback", "wmx.sbc.ul_ctl_channel_support.enhanced_fast_feedback",
                        FT_BOOLEAN, 8, TFS(&tfs_supported), 0x2, "", HFILL
                }
        },
        {
                &hf_sbc_tlv_t_173_measurement_report,
                {
-                       "A Measurement Report Shall Be Performed On The Last DL Burst", "wimax.sbc.ul_ctl_channel_support.measurement_report", 
+                       "A Measurement Report Shall Be Performed On The Last DL Burst", "wmx.sbc.ul_ctl_channel_support.measurement_report",
                        FT_BOOLEAN, 8, TFS(&tfs_supported), 0x20, "", HFILL
                }
        },
        {
                &hf_sbc_tlv_t_173_primary_secondary_fast_feedback,
                {
-                       "Primary/Secondary FAST_FEEDBACK", "wimax.sbc.ul_ctl_channel_support.primary_secondary_fast_feedback", 
+                       "Primary/Secondary FAST_FEEDBACK", "wmx.sbc.ul_ctl_channel_support.primary_secondary_fast_feedback",
                        FT_BOOLEAN, 8, TFS(&tfs_supported), 0x40, "", HFILL
                }
        },
        {
                &hf_sbc_tlv_t_173_reserved,
                {
-                       "Reserved", "wimax.sbc.ul_ctl_channel_support.reserved", 
+                       "Reserved", "wmx.sbc.ul_ctl_channel_support.reserved",
                        FT_UINT8, BASE_HEX, NULL, 0x8, "", HFILL
                }
        },
        {
                &hf_sbc_tlv_t_173_uep_fast_feedback,
                {
-                       "UEP Fast-feedback", "wimax.sbc.ul_ctl_channel_support.uep_fast_feedback", 
+                       "UEP Fast-feedback", "wmx.sbc.ul_ctl_channel_support.uep_fast_feedback",
                        FT_BOOLEAN, 8, TFS(&tfs_supported), 0x10, "", HFILL
                }
        },
        {
                &hf_sbc_tlv_t_173_ul_ack,
                {
-                       "UL ACK", "wimax.sbc.ul_ctl_channel_support.ul_ack", 
+                       "UL ACK", "wmx.sbc.ul_ctl_channel_support.ul_ack",
                        FT_BOOLEAN, 8, TFS(&tfs_supported), 0x4, "", HFILL
                }
        },
        {
                &hf_sbc_req_message_type,
                {
-                       "MAC Management Message Type", "wimax.macmgtmsgtype.sbc_req", 
+                       "MAC Management Message Type", "wmx.macmgtmsgtype.sbc_req",
                        FT_UINT8, BASE_DEC, NULL, 0x0, "", HFILL
                }
        },
        {       &hf_sbc_rsp_message_type,
                {
-                       "MAC Management Message Type", "wimax.macmgtmsgtype.sbc_rsp",
+                       "MAC Management Message Type", "wmx.macmgtmsgtype.sbc_rsp",
                        FT_UINT8, BASE_DEC, NULL, 0x0, "", HFILL
                }
        },
        {
                &hf_sbc_unknown_type,
                {
-                       "Unknown SBC type", "wimax.sbc.unknown_tlv_type", 
+                       "Unknown SBC type", "wmx.sbc.unknown_tlv_type",
                        FT_BYTES, BASE_HEX, NULL, 0x0, "", HFILL
                }
        }
@@ -2193,7 +2193,7 @@ void proto_register_mac_mgmt_msg_sbc(void)
                proto_mac_mgmt_msg_sbc_decoder = proto_register_protocol (
                                                        "WiMax SBC-REQ/RSP Messages", /* name */
                                                        "WiMax SBC-REQ/RSP (sbc)", /* short name */
-                                                       "sbc" /* abbrev */
+                                                       "wmx.sbc" /* abbrev */
                                                        );
 
                proto_register_field_array(proto_mac_mgmt_msg_sbc_decoder, hf_sbc, array_length(hf_sbc));
@@ -2628,7 +2628,7 @@ void dissect_mac_mgmt_msg_sbc_req_decoder(tvbuff_t *tvb, packet_info *pinfo, pro
                                        proto_tree_add_item(tlv_tree, hf_sbc_tlv_t_175_max_num_ul_harq_per_frm_include_one_non_harq_bst, tvb, offset, 1, FALSE);
                                        proto_tree_add_item(tlv_tree, hf_sbc_tlv_t_175_max_num_dl_harq_bst_per_harq_per_frm, tvb, offset, 1, FALSE);
                                break;
-                               case SBC_TLV_T_176: /* TODO: Get an invalid TLV whenever this TLV is used. Could it be 
+                               case SBC_TLV_T_176: /* TODO: Get an invalid TLV whenever this TLV is used. Could it be
                                                       that lengths above 2 cause this problem? */
                                        /* add TLV subtree */
                                        tlv_tree = add_tlv_subtree(&tlv_info, ett_sbc_req_tlv_subtree, sbc_tree, hf_sbc_tlv_t_176, tvb, offset, tlv_len, FALSE);
index 6059a5e2916ece29ce2ccd713ff760f8c200ce24..884c71f6d4bc54308cecef7b613023a3964c6079 100644 (file)
@@ -220,444 +220,444 @@ static hf_register_info hf[] =
        {
                &hf_ucd_message_type,
                {
-                       "MAC Management Message Type", "wimax.macmgtmsgtype.ucd",
+                       "MAC Management Message Type", "wmx.macmgtmsgtype.ucd",
                        FT_UINT8, BASE_DEC, NULL, 0, "", HFILL
                }
        },
        {
                &hf_ucd_tlv_t_188_allow_aas_beam_select_message,
                {
-                       "Allow AAS Beam Select Message", "wimax.ucd.allow_aas_beam_select_message",
+                       "Allow AAS Beam Select Message", "wmx.ucd.allow_aas_beam_select_message",
                        FT_INT8, BASE_DEC, VALS(vals_yes_no_str), 0, "", HFILL
                }
        },
        {
                &hf_ucd_tlv_t_159_band_amc_allocation_threshold,
                {
-                       "Band AMC Allocation Threshold ", "wimax.ucd.band_amc.allocation_threshold",
+                       "Band AMC Allocation Threshold ", "wmx.ucd.band_amc.allocation_threshold",
                        FT_UINT8, BASE_HEX, NULL, 0, "", HFILL
                }
        },
        {
                &hf_ucd_tlv_t_161_band_amc_allocation_timer,
                {
-                       "Band AMC Allocation Timer", "wimax.ucd.band_amc.allocation_timer",
+                       "Band AMC Allocation Timer", "wmx.ucd.band_amc.allocation_timer",
                        FT_UINT8, BASE_HEX, NULL, 0, "", HFILL
                }
        },
        {
                &hf_ucd_tlv_t_160_band_amc_release_threshold,
                {
-                       "Band AMC Release Threshold", "wimax.ucd.band_amc.release_threshold",
+                       "Band AMC Release Threshold", "wmx.ucd.band_amc.release_threshold",
                        FT_UINT8, BASE_HEX, NULL, 0, "", HFILL
                }
        },
        {
                &hf_ucd_tlv_t_162_band_amc_release_timer,
                {
-                       "Band AMC Release Timer", "wimax.ucd.band_amc.release_timer",
+                       "Band AMC Release Timer", "wmx.ucd.band_amc.release_timer",
                        FT_UINT8, BASE_HEX, NULL, 0, "", HFILL
                }
        },
        {
                &hf_ucd_tlv_t_164_band_amc_retry_timer,
                {
-                       "Band AMC Retry Timer", "wimax.ucd.band_amc.retry_timer",
+                       "Band AMC Retry Timer", "wmx.ucd.band_amc.retry_timer",
                        FT_UINT8, BASE_HEX, NULL, 0, "", HFILL
                }
        },
        {
                &hf_ucd_tlv_t_163_band_status_report_max_period,
                {
-                       "Band Status Report MAC Period", "wimax.ucd.band_status.report_max_period",
+                       "Band Status Report MAC Period", "wmx.ucd.band_status.report_max_period",
                        FT_UINT8, BASE_DEC, NULL, 0, "", HFILL
                }
        },
        {
                &hf_ucd_tlv_t_152_bandwidth_request_codes,
                {
-                       "Bandwidth Request Codes", "wimax.ucd.bandwidth_request",
+                       "Bandwidth Request Codes", "wmx.ucd.bandwidth_request",
                        FT_UINT8, BASE_HEX, NULL, 0, "", HFILL
                }
        },
        {
                &hf_ucd_burst_fec,
                {
-                       "FEC Code Type", "wimax.ucd.burst.fec",
+                       "FEC Code Type", "wmx.ucd.burst.fec",
                        FT_UINT8, BASE_HEX, VALS(vals_dcd_burst_fec), 0, "", HFILL
                }
        },
        {
                &hf_ucd_burst_ranging_data_ratio,
                {
-                       "Ranging Data Ratio", "wimax.ucd.burst.ranging_data_ratio",
+                       "Ranging Data Ratio", "wmx.ucd.burst.ranging_data_ratio",
                        FT_UINT8, BASE_DEC, NULL, 0, "", HFILL
                }
        },
        {
                &hf_ucd_ul_burst_reserved,
                {
-                       "Reserved", "wimax.ucd.burst.reserved",
+                       "Reserved", "wmx.ucd.burst.reserved",
                        FT_UINT8, BASE_HEX, NULL, 0xF0, "", HFILL
                }
        },
        {
                &hf_ucd_ul_burst_uiuc,
                {
-                       "UIUC", "wimax.ucd.burst.uiuc",
+                       "UIUC", "wmx.ucd.burst.uiuc",
                        FT_UINT8, BASE_DEC, NULL, 0x0F, "", HFILL
                }
        },
 #if 0
        {
                &hf_ucd_burst_power_boost,
-               {"Focused Contention Power Boost", "wimax.ucd.burst.power_boost", FT_UINT8, BASE_HEX, NULL, 0, "", HFILL}
+               {"Focused Contention Power Boost", "wmx.ucd.burst.power_boost", FT_UINT8, BASE_HEX, NULL, 0, "", HFILL}
        },
        {
                &hf_ucd_burst_tcs_enable,
-               {"TCS", "wimax.ucd.burst.tcs", FT_UINT8, BASE_DEC, VALS(vals_dcd_burst_tcs), 0, "", HFILL}
+               {"TCS", "wmx.ucd.burst.tcs", FT_UINT8, BASE_DEC, VALS(vals_dcd_burst_tcs), 0, "", HFILL}
        },
 #endif
        {
                &hf_ucd_bw_req_size,
                {
-                       "Bandwidth Request Opportunity Size", "wimax.ucd.bw_req_size",
+                       "Bandwidth Request Opportunity Size", "wmx.ucd.bw_req_size",
                        FT_UINT16, BASE_DEC, NULL, 0, "", HFILL
                }
        },
        {
                &hf_ucd_tlv_t_172_cqich_band_amc_transition_delay,
                {
-                       "CQICH Band AMC-Transition Delay", "wimax.ucd.cqich_band_amc_transition_delay",
+                       "CQICH Band AMC-Transition Delay", "wmx.ucd.cqich_band_amc_transition_delay",
                        FT_UINT8, BASE_DEC, NULL, 0, "", HFILL
                }
        },
        {
                &hf_ucd_freq,
                {
-                       "Frequency", "wimax.ucd.frequency",
+                       "Frequency", "wmx.ucd.frequency",
                        FT_UINT32, BASE_DEC, NULL, 0, "", HFILL
                }
        },
        {
                &hf_ucd_tlv_t_194_handover_ranging_codes,
                {
-                       "Handover Ranging Codes", "wimax.ucd.handover_ranging_codes",
+                       "Handover Ranging Codes", "wmx.ucd.handover_ranging_codes",
                        FT_INT8, BASE_DEC, NULL, 0, "", HFILL
                }
        },
        {
                &hf_ucd_tlv_t_171_harq_ack_delay_dl_burst,
                {
-                       "HARQ ACK Delay for DL Burst", "wimax.ucd.harq_ack_delay_dl_burst",
+                       "HARQ ACK Delay for DL Burst", "wmx.ucd.harq_ack_delay_dl_burst",
                        FT_UINT8, BASE_DEC, NULL, 0, "", HFILL
                }
        },
        {
                &hf_ucd_tlv_t_150_initial_ranging_codes,
                {
-                       "Initial Ranging Codes", "wimax.ucd.initial_ranging_codes",
+                       "Initial Ranging Codes", "wmx.ucd.initial_ranging_codes",
                        FT_UINT8, BASE_HEX, NULL, 0, "", HFILL
                }
        },
        {
                &hf_ucd_tlv_t_195_initial_ranging_interval,
                {
-                       "Number of Frames Between Initial Ranging Interval Allocation", "wimax.ucd.initial_ranging_interval",
+                       "Number of Frames Between Initial Ranging Interval Allocation", "wmx.ucd.initial_ranging_interval",
                        FT_INT8, BASE_DEC, NULL, 0, "", HFILL
                }
        },
        {
                &hf_ucd_invalid_tlv,
                {
-                       "Invalid TLV", "wimax.ucd.invalid_tlv",
+                       "Invalid TLV", "wmx.ucd.invalid_tlv",
                        FT_BYTES, BASE_HEX, NULL, 0, "", HFILL
                }
        },
        {
                &hf_ucd_tlv_t_187_lower_bound_aas_preamble,
                {
-                       "Lower Bound AAS Preamble (in units of 0.25 dB)", "wimax.ucd.lower_bound_aas_preamble",
+                       "Lower Bound AAS Preamble (in units of 0.25 dB)", "wmx.ucd.lower_bound_aas_preamble",
                        FT_INT8, BASE_DEC, NULL, 0, "", HFILL
                }
        },
        {
                &hf_ucd_tlv_t_192_min_level_power_offset_adjustment,
                {
-                       "Minimum Level of Power Offset Adjustment (in units of 0.1 dB)", "wimax.ucd.min_level_power_offset_adjustment",
+                       "Minimum Level of Power Offset Adjustment (in units of 0.1 dB)", "wmx.ucd.min_level_power_offset_adjustment",
                        FT_INT8, BASE_DEC, NULL, 0, "", HFILL
                }
        },
        {
                &hf_ucd_tlv_t_193_max_level_power_offset_adjustment,
                {
-                       "Maximum Level of Power Offset Adjustment (in units of 0.1 dB)", "wimax.ucd.max_level_power_offset_adjustment",
+                       "Maximum Level of Power Offset Adjustment (in units of 0.1 dB)", "wmx.ucd.max_level_power_offset_adjustment",
                        FT_INT8, BASE_DEC, NULL, 0, "", HFILL
                }
        },
        {
                &hf_ucd_tlv_t_174_maximum_retransmission,
                {
-                       "Maximum Number of Retransmission in UL-HARQ", "wimax.ucd.max_number_of_retransmission_in_ul_harq",
+                       "Maximum Number of Retransmission in UL-HARQ", "wmx.ucd.max_number_of_retransmission_in_ul_harq",
                        FT_UINT8, BASE_DEC, NULL, 0, "", HFILL
                }
        },
        {
                &hf_ucd_tlv_t_191_ms_specific_down_power_addjustment_step,
                {
-                       "MS-specific Down Power Offset Adjustment Step (in units of 0.01 dB)", "wimax.ucd.ms_specific_down_power_offset_adjustment_step",
+                       "MS-specific Down Power Offset Adjustment Step (in units of 0.01 dB)", "wmx.ucd.ms_specific_down_power_offset_adjustment_step",
                        FT_UINT8, BASE_HEX, NULL, 0, "", HFILL
                }
        },
        {
                &hf_ucd_tlv_t_190_ms_specific_up_power_addjustment_step,
                {
-                       "MS-specific Up Power Offset Adjustment Step (in units of 0.01 dB)", "wimax.ucd.ms_specific_up_power_offset_adjustment_step",
+                       "MS-specific Up Power Offset Adjustment Step (in units of 0.01 dB)", "wmx.ucd.ms_specific_up_power_offset_adjustment_step",
                        FT_UINT8, BASE_HEX, NULL, 0, "", HFILL
                }
        },
        {
                &hf_ucd_tlv_t_197_normalized_cn_channel_sounding,
                {
-                       "Normalized C/N for Channel Sounding", "wimax.ucd.normalized_cn.channel_sounding",
+                       "Normalized C/N for Channel Sounding", "wmx.ucd.normalized_cn.channel_sounding",
                        FT_UINT8, BASE_HEX, NULL, 0, "", HFILL
                }
        },
        {
                &hf_ucd_tlv_t_177_normalized_cn_override2,
                {
-                       "Normalized C/N Override 2", "wimax.ucd.normalized_cn.override_2",
+                       "Normalized C/N Override 2", "wmx.ucd.normalized_cn.override_2",
                        FT_STRING, BASE_HEX, NULL, 0, "", HFILL
                }
        },
        {
                &hf_ucd_tlv_t_177_normalized_cn_override2_first_line,
                {
-                       "Normalized C/N Value", "wimax.ucd.normalized_cn.override_first_line",
+                       "Normalized C/N Value", "wmx.ucd.normalized_cn.override_first_line",
                        FT_UINT8, BASE_HEX, NULL, 0, "", HFILL
                }
        },
        {
                &hf_ucd_tlv_t_177_normalized_cn_override2_list,
                {
-                       "Normalized C/N Value List", "wimax.ucd.normalized_cn.override_list",
+                       "Normalized C/N Value List", "wmx.ucd.normalized_cn.override_list",
                        FT_STRING, BASE_HEX, NULL, 0, "", HFILL
                }
        },
        {
                &hf_ucd_tlv_t_158_optional_permutation_ul_allocated_subchannels_bitmap,
                {
-                       "Optional permutation UL allocated subchannels bitmap ", "wimax.ucd.optional_permutation_ul_allocated_subchannels_bitmap",
+                       "Optional permutation UL allocated subchannels bitmap ", "wmx.ucd.optional_permutation_ul_allocated_subchannels_bitmap",
                        FT_BYTES, BASE_HEX, NULL, 0, "", HFILL
                }
        },
        {
                &hf_ucd_tlv_t_151_periodic_ranging_codes,
                {
-                       "Periodic Ranging Codes", "wimax.ucd.periodic_ranging_codes",
+                       "Periodic Ranging Codes", "wmx.ucd.periodic_ranging_codes",
                        FT_UINT8, BASE_HEX, NULL, 0, "", HFILL
                }
        },
        {
                &hf_ucd_tlv_t_156_permutation_base,
                {
-                       "Permutation Base", "wimax.ucd.permutation_base",
+                       "Permutation Base", "wmx.ucd.permutation_base",
                        FT_UINT8, BASE_DEC, NULL, 0, "", HFILL
                }
        },
        {
                &hf_ucd_ranging_req_size,
                {
-                       "Ranging Request Opportunity Size", "wimax.ucd.ranging_req_size",
+                       "Ranging Request Opportunity Size", "wmx.ucd.ranging_req_size",
                        FT_UINT16, BASE_DEC, NULL, 0, "", HFILL
                }
        },
        {
                &hf_ucd_res_timeout,
                {
-                       "Contention-based Reservation Timeout", "wimax.ucd.res_timeout",
+                       "Contention-based Reservation Timeout", "wmx.ucd.res_timeout",
                        FT_UINT8, BASE_DEC, NULL, 0, "", HFILL
                }
        },
        {
                &hf_ucd_tlv_t_170_safety_channel_retry_timer,
                {
-                       "Safety Channel Release Timer", "wimax.ucd.safety_channel_release_timer",
+                       "Safety Channel Release Timer", "wmx.ucd.safety_channel_release_timer",
                        FT_UINT8, BASE_HEX, NULL, 0, "", HFILL
                }
        },
        {
                &hf_ucd_tlv_t_176_size_of_cqich_id_field,
                {
-                       "Size of CQICH_ID Field", "wimax.ucd.size_of_cqich_id_field",
+                       "Size of CQICH_ID Field", "wmx.ucd.size_of_cqich_id_field",
                        FT_UINT8, BASE_DEC, VALS(vals_ucd_cqich_size), 0, "", HFILL
                }
        },
        {
                &hf_ucd_tlv_t_155_start_of_ranging_codes_group,
                {
-                       "Start of Ranging Codes Group", "wimax.ucd.start_of_ranging_codes_group",
+                       "Start of Ranging Codes Group", "wmx.ucd.start_of_ranging_codes_group",
                        FT_UINT8, BASE_DEC, NULL, 0, "", HFILL
                }
        },
         {
                &hf_ucd_ul_allocated_subchannles_bitmap,
                {
-                       "UL Allocated Subchannels Bitmap", "wimax.ucd.subchan.bitmap",
+                       "UL Allocated Subchannels Bitmap", "wmx.ucd.subchan.bitmap",
                        FT_BYTES, BASE_HEX, NULL, 0, "", HFILL
                }
        },
        {
                &hf_ucd_subchan_codes,
                {
-                       "Periodic Ranging Codes", "wimax.ucd.subchan.codes",
+                       "Periodic Ranging Codes", "wmx.ucd.subchan.codes",
                        FT_UINT8, BASE_HEX, NULL, 0, "", HFILL
                }
        },
        {
                &hf_ucd_subchan_params_num_chan,
                {
-                       "Number of Subchannels", "wimax.ucd.subchan.num_chan",
+                       "Number of Subchannels", "wmx.ucd.subchan.num_chan",
                        FT_UINT8, BASE_DEC, NULL, 0, "", HFILL
                }
        },
        {
                &hf_ucd_subchan_params_num_sym,
                {
-                       "Number of OFDMA Symbols", "wimax.ucd.subchan.num_sym",
+                       "Number of OFDMA Symbols", "wmx.ucd.subchan.num_sym",
                        FT_UINT8, BASE_DEC, NULL, 0, "", HFILL
                }
        },
        {
                &hf_ucd_tlv_t_196_tx_power_report,
                {
-                       "Tx Power Report", "wimax.ucd.tx_power_report",
+                       "Tx Power Report", "wmx.ucd.tx_power_report",
                        FT_UINT24, BASE_HEX, NULL, 0, "", HFILL
                }
        },
        {
                &hf_ucd_tlv_t_196_tx_power_report_a_p_avg,
                {
-                       "A p_avg (in multiples of 1/16)", "wimax.ucd.tx_power_report.a_p_avg",
+                       "A p_avg (in multiples of 1/16)", "wmx.ucd.tx_power_report.a_p_avg",
                        FT_UINT8, BASE_DEC, NULL, 0xF0, "", HFILL
                }
        },
        {
                &hf_ucd_tlv_t_196_tx_power_report_a_p_avg_icqch,
                {
-                       "A p_avg (in multiples of 1/16) when ICQCH is allocated", "wimax.ucd.tx_power_report.a_p_avg_icqch",
+                       "A p_avg (in multiples of 1/16) when ICQCH is allocated", "wmx.ucd.tx_power_report.a_p_avg_icqch",
                        FT_UINT8, BASE_DEC, NULL, 0x0F, "", HFILL
                }
        },
        {
                &hf_ucd_tlv_t_196_tx_power_report_interval,
                {
-                       "Interval (expressed as power of 2)", "wimax.ucd.tx_power_report.interval",
+                       "Interval (expressed as power of 2)", "wmx.ucd.tx_power_report.interval",
                        FT_UINT8, BASE_DEC, NULL, 0x0F, "", HFILL
                }
        },
        {
                &hf_ucd_tlv_t_196_tx_power_report_interval_icqch,
                {
-                       "Interval When ICQCH is Allocated (expressed as power of 2)", "wimax.ucd.tx_power_report.interval_icqch",
+                       "Interval When ICQCH is Allocated (expressed as power of 2)", "wmx.ucd.tx_power_report.interval_icqch",
                        FT_UINT8, BASE_DEC, NULL, 0xF0, "", HFILL
                }
        },
        {
                &hf_ucd_tlv_t_196_tx_power_report_threshold,
                {
-                       "Threshold", "wimax.ucd.tx_power_report.threshold",
+                       "Threshold", "wmx.ucd.tx_power_report.threshold",
                        FT_UINT8, BASE_DEC, NULL, 0xF0, "", HFILL
                }
        },
        {
                &hf_ucd_tlv_t_196_tx_power_report_threshold_icqch,
                {
-                       "Threshold When ICQCH is Allocated to SS (in dB)", "wimax.ucd.tx_power_report.threshold_icqch",
+                       "Threshold When ICQCH is Allocated to SS (in dB)", "wmx.ucd.tx_power_report.threshold_icqch",
                        FT_UINT8, BASE_DEC, NULL, 0x0F, "", HFILL
                }
        },
        {
                &hf_ucd_unknown_type,
                {
-                       "Unknown UCD Type", "wimax.ucd.unknown_tlv_type",
+                       "Unknown UCD Type", "wmx.ucd.unknown_tlv_type",
                        FT_BYTES, BASE_HEX, NULL, 0, "", HFILL
                }
        },
        {
                &hf_ucd_tlv_t_202_uplink_burst_profile_for_multiple_fec_types,
                {
-                       "Uplink Burst Profile for Multiple FEC Types", "wimax.ucd.uplink_burst_profile.multiple_fec_types",
+                       "Uplink Burst Profile for Multiple FEC Types", "wmx.ucd.uplink_burst_profile.multiple_fec_types",
                        FT_UINT8, BASE_HEX, NULL, 0, "", HFILL
                }
        },
        {
                &hf_ucd_tlv_t_203_ul_pusc_subchannel_rotation,
                {
-                       "Uplink PUSC Subchannel Rotation", "wimax.ucd.uplink_burst_profile.ul_pusc_subchannel_rotation",
+                       "Uplink PUSC Subchannel Rotation", "wmx.ucd.uplink_burst_profile.ul_pusc_subchannel_rotation",
                        FT_UINT8, BASE_HEX, NULL, 0, "", HFILL
                }
        },
        {
                &hf_ucd_tlv_t_205_relative_power_offset_ul_harq_burst,
                {
-                       "Relative Power Offset UL HARQ Burst", "wimax.ucd.uplink_burst_profile.relative_power_offset_ul_harq_burst",
+                       "Relative Power Offset UL HARQ Burst", "wmx.ucd.uplink_burst_profile.relative_power_offset_ul_harq_burst",
                        FT_UINT8, BASE_HEX, NULL, 0, "", HFILL
                }
        },
        {
                &hf_ucd_tlv_t_206_relative_power_offset_ul_burst_containing_mac_mgmt_msg,
                {
-                       "Relative Power Offset UL Burst Containing MAC Mgmt Msg", "wimax.ucd.uplink_burst_profile.relative_power_offset_ul_burst_mac_mgmt_msg",
+                       "Relative Power Offset UL Burst Containing MAC Mgmt Msg", "wmx.ucd.uplink_burst_profile.relative_power_offset_ul_burst_mac_mgmt_msg",
                        FT_UINT8, BASE_HEX, NULL, 0, "", HFILL
                }
        },
        {
                &hf_ucd_tlv_t_207_ul_initial_transmit_timing,
                {
-                       "UL Initial Transmit Timing", "wimax.ucd.uplink_burst_profile.ul_initial_transmit_timing",
+                       "UL Initial Transmit Timing", "wmx.ucd.uplink_burst_profile.ul_initial_transmit_timing",
                        FT_UINT8, BASE_HEX, NULL, 0, "", HFILL
                }
        },
        {
                &hf_ucd_tlv_t_210_fast_feedback_region,
                {
-                       "Fast Feedback Region", "wimax.ucd.uplink_burst_profile.fast_feedback_region",
+                       "Fast Feedback Region", "wmx.ucd.uplink_burst_profile.fast_feedback_region",
                        FT_BYTES, BASE_HEX, NULL, 0, "", HFILL
                }
        },
        {
                &hf_ucd_tlv_t_211_harq_ack_region,
                {
-                       "HARQ ACK Region", "wimax.ucd.uplink_burst_profile.harq_ack_region",
+                       "HARQ ACK Region", "wmx.ucd.uplink_burst_profile.harq_ack_region",
                        FT_BYTES, BASE_HEX, NULL, 0, "", HFILL
                }
        },
        {
                &hf_ucd_tlv_t_212_ranging_region,
                {
-                       "Ranging Region", "wimax.ucd.uplink_burst_profile.ranging_region",
+                       "Ranging Region", "wmx.ucd.uplink_burst_profile.ranging_region",
                        FT_BYTES, BASE_HEX, NULL, 0, "", HFILL
                }
        },
        {
                &hf_ucd_tlv_t_213_sounding_region,
                {
-                       "Sounding Region", "wimax.ucd.uplink_burst_profile.sounding_region",
+                       "Sounding Region", "wmx.ucd.uplink_burst_profile.sounding_region",
                        FT_BYTES, BASE_HEX, NULL, 0, "", HFILL
                }
        },
        {
                &hf_ucd_tlv_t_186_upper_bound_aas_preamble,
                {
-                       "Upper Bound AAS Preamble (in units of 0.25 dB)", "wimax.ucd.upper_bound_aas_preamble",
+                       "Upper Bound AAS Preamble (in units of 0.25 dB)", "wmx.ucd.upper_bound_aas_preamble",
                        FT_INT8, BASE_DEC, NULL, 0, "", HFILL
                }
        },
        {
                &hf_ucd_tlv_t_189_use_cqich_indication_flag,
                {
-                       "Use CQICH Indication Flag", "wimax.ucd.use_cqich_indication_flag",
+                       "Use CQICH Indication Flag", "wmx.ucd.use_cqich_indication_flag",
                        FT_UINT8, BASE_HEX, NULL, 0, "", HFILL
                }
        }
index 3289811c231f15707afb0e92227352c7e438e47a..8db77105b37778d6255b8878a11087ea0600a0db 100644 (file)
@@ -315,301 +315,301 @@ static hf_register_info hf[] =
     {
            &hf_ulmap_message_type,
            {
-                   "MAC Management Message Type", "wimax.macmgtmsgtype.ulmap", 
+                   "MAC Management Message Type", "wmx.macmgtmsgtype.ulmap", 
                    FT_UINT8, BASE_DEC, NULL, 0x0, "", HFILL
            }
     },
     {
            &hf_ulmap_fch_expected,
            {
-                   "FCH Expected", "wimax.ulmap.fch.expected",
+                   "FCH Expected", "wmx.ulmap.fch.expected",
                    FT_UINT16, BASE_DEC, NULL, 0x0, "", HFILL 
            }
     },
     {
            &hf_ulmap_ie,
            {
-                   "UL-MAP IE", "wimax.ulmap.ie",
+                   "UL-MAP IE", "wmx.ulmap.ie",
                    FT_UINT8, BASE_DEC, NULL, 0x0, "", HFILL 
            }
     },
     {
            &hf_ulmap_ie_cid,
            {
-                   "CID", "wimax.ulmap.ie.cid",
+                   "CID", "wmx.ulmap.ie.cid",
                    FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL 
            }
     },
     {
            &hf_ulmap_ie_uiuc,
            {
-                   "UIUC", "wimax.ulmap.ie.uiuc",
+                   "UIUC", "wmx.ulmap.ie.uiuc",
                    FT_UINT8, BASE_DEC, NULL, 0x0, "", HFILL 
            }
     },
     {
            &hf_ulmap_ofdma_sym,
            {
-                   "Num OFDMA Symbols", "wimax.ulmap.ofdma.sym",
+                   "Num OFDMA Symbols", "wmx.ulmap.ofdma.sym",
                    FT_UINT8, BASE_DEC, NULL, 0x0, "", HFILL 
            }
     },
     {
            &hf_ulmap_reserved,
            {
-                   "Reserved", "wimax.ulmap.rsv",
+                   "Reserved", "wmx.ulmap.rsv",
                    FT_UINT8, BASE_DEC, NULL, 0x0, "", HFILL 
            }
     },
     {
            &hf_ulmap_alloc_start_time,
            {
-                   "Uplink Channel ID", "wimax.ulmap.start",
+                   "Uplink Channel ID", "wmx.ulmap.start",
                    FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL 
            }
     },
     {
            &hf_ulmap_ucd_count,
            {
-                   "UCD Count", "wimax.ulmap.ucd",
+                   "UCD Count", "wmx.ulmap.ucd",
                    FT_UINT8, BASE_DEC, NULL, 0x0, "", HFILL 
            }
     },
     {
            &hf_ulmap_uiuc0_numsub,
            {
-                   "No. subchannels", "wimax.ulmap.uiuc0.numsub",
+                   "No. subchannels", "wmx.ulmap.uiuc0.numsub",
                    FT_UINT32,  BASE_DEC, NULL, 0x000003f8, "", HFILL 
            }
     },
     {
            &hf_ulmap_uiuc0_numsym,
            {
-                   "No. OFDMA symbols", "wimax.ulmap.uiuc0.numsym",
+                   "No. OFDMA symbols", "wmx.ulmap.uiuc0.numsym",
                    FT_UINT32,  BASE_DEC, NULL, 0x0001fc00, "", HFILL 
            }
     },
     {
            &hf_ulmap_uiuc0_rsv,
            {
-                   "Reserved", "wimax.ulmap.uiuc0.rsv",
+                   "Reserved", "wmx.ulmap.uiuc0.rsv",
                    FT_UINT32,  BASE_DEC, NULL, 0x00000007, "", HFILL 
            }
     },
     {
            &hf_ulmap_uiuc0_subofs,
            {
-                   "Subchannel offset", "wimax.ulmap.uiuc0.subofs",
+                   "Subchannel offset", "wmx.ulmap.uiuc0.subofs",
                    FT_UINT32,  BASE_DEC, NULL, 0x00fe0000, "", HFILL 
            }
     },
     {
            &hf_ulmap_uiuc0_symofs,
            {
-                   "OFDMA symbol offset", "wimax.ulmap.uiuc0.symofs",
+                   "OFDMA symbol offset", "wmx.ulmap.uiuc0.symofs",
                    FT_UINT32,  BASE_DEC, NULL, 0xff000000, "", HFILL 
            }
     },
     {
            &hf_ulmap_uiuc11_data,
            {
-                   "Data", "wimax.ulmap.uiuc11.data",
+                   "Data", "wmx.ulmap.uiuc11.data",
                    FT_BYTES,  BASE_HEX, NULL, 0x0, "", HFILL 
            }
     },
     {
            &hf_ulmap_uiuc11_ext,
            {
-                   "Extended 2 UIUC", "wimax.ulmap.uiuc11.ext",
+                   "Extended 2 UIUC", "wmx.ulmap.uiuc11.ext",
                    FT_UINT8,  BASE_DEC, NULL, 0x0, "", HFILL 
            }
     },
     {
            &hf_ulmap_uiuc11_len,
            {
-                   "Length", "wimax.ulmap.uiuc11.len",
+                   "Length", "wmx.ulmap.uiuc11.len",
                    FT_UINT8,  BASE_DEC, NULL, 0x0, "", HFILL 
            }
     },
     {
            &hf_ulmap_uiuc12_dri,
            {
-                   "Dedicated ranging indicator", "wimax.ulmap.uiuc12.dri",
+                   "Dedicated ranging indicator", "wmx.ulmap.uiuc12.dri",
                    FT_UINT32, BASE_DEC, NULL, 0x00000001, "", HFILL 
            }
     },
     {
            &hf_ulmap_uiuc10_dur,
            {
-                   "Duration", "wimax.ulmap.uiuc12.dur",
+                   "Duration", "wmx.ulmap.uiuc12.dur",
                    FT_UINT16, BASE_DEC, NULL, 0xFFc0, "", HFILL 
            }
     },
     {
            &hf_ulmap_uiuc12_method,
            {
-                   "Ranging Method", "wimax.ulmap.uiuc12.method",
+                   "Ranging Method", "wmx.ulmap.uiuc12.method",
                    FT_UINT32, BASE_DEC, NULL, 0x00000006, "", HFILL 
            }
     },
     {
            &hf_ulmap_uiuc12_numsub,
            {
-                   "No. Subchannels", "wimax.ulmap.uiuc12.numsub",
+                   "No. Subchannels", "wmx.ulmap.uiuc12.numsub",
                    FT_UINT32, BASE_DEC, NULL, 0x000003F8, "", HFILL 
            }
     },
     {
            &hf_ulmap_uiuc12_numsym,
            {
-                   "No. OFDMA Symbols", "wimax.ulmap.uiuc12.numsym",
+                   "No. OFDMA Symbols", "wmx.ulmap.uiuc12.numsym",
                    FT_UINT32, BASE_DEC, NULL, 0x0001Fc00, "", HFILL 
            }
     },
     {
            &hf_ulmap_uiuc10_rep,
            {
-                   "Repetition Coding indication", "wimax.ulmap.uiuc12.rep",
+                   "Repetition Coding indication", "wmx.ulmap.uiuc12.rep",
                    FT_UINT16, BASE_DEC, NULL, 0x0030, "", HFILL 
            }
     },
     {
            &hf_ulmap_uiuc12_subofs,
            {
-                   "Subchannel Offset", "wimax.ulmap.uiuc12.subofs",
+                   "Subchannel Offset", "wmx.ulmap.uiuc12.subofs",
                    FT_UINT32, BASE_DEC, NULL, 0x00Fe0000, "", HFILL 
            }
     },
     {
            &hf_ulmap_uiuc12_symofs,
            {
-                   "OFDMA Symbol Offset", "wimax.ulmap.uiuc12.symofs",
+                   "OFDMA Symbol Offset", "wmx.ulmap.uiuc12.symofs",
                    FT_UINT32, BASE_DEC, NULL, 0xFF000000, "", HFILL 
            }
     },
     {
            &hf_ulmap_uiuc13_numsub,
            {
-                   "No. Subchannels/SZ Shift Value", "wimax.ulmap.uiuc13.numsub",
+                   "No. Subchannels/SZ Shift Value", "wmx.ulmap.uiuc13.numsub",
                    FT_UINT32,  BASE_DEC, NULL, 0x000003f8, "", HFILL 
            }
     },
     {
            &hf_ulmap_uiuc13_numsym,
            {
-                   "No. OFDMA symbols", "wimax.ulmap.uiuc13.numsym",
+                   "No. OFDMA symbols", "wmx.ulmap.uiuc13.numsym",
                    FT_UINT32,  BASE_DEC, NULL, 0x0001fc00, "", HFILL 
            }
     },
     {
            &hf_ulmap_uiuc13_papr,  
            {
-                   "PAPR Reduction/Safety Zone", "wimax.ulmap.uiuc13.papr",
+                   "PAPR Reduction/Safety Zone", "wmx.ulmap.uiuc13.papr",
                    FT_UINT32,  BASE_DEC, NULL, 0x00000004, "", HFILL 
            }
     },
     {
            &hf_ulmap_uiuc13_rsv,   
            {
-                   "Reserved", "wimax.ulmap.uiuc13.rsv",
+                   "Reserved", "wmx.ulmap.uiuc13.rsv",
                    FT_UINT32,  BASE_DEC, NULL, 0x00000001, "", HFILL 
            }
     },
     {
            &hf_ulmap_uiuc13_subofs,
            {
-                   "Subchannel offset", "wimax.ulmap.uiuc13.subofs",
+                   "Subchannel offset", "wmx.ulmap.uiuc13.subofs",
                    FT_UINT32,  BASE_DEC, NULL, 0x00fe0000, "", HFILL 
            }
     },
     {
            &hf_ulmap_uiuc13_symofs,
            {
-                   "OFDMA symbol offset", "wimax.ulmap.uiuc13.symofs",
+                   "OFDMA symbol offset", "wmx.ulmap.uiuc13.symofs",
                    FT_UINT32,  BASE_DEC, NULL, 0xff000000, "", HFILL 
            }
     },
     {
            &hf_ulmap_uiuc13_zone,  
            {
-                   "Sounding Zone", "wimax.ulmap.uiuc13.zone",
+                   "Sounding Zone", "wmx.ulmap.uiuc13.zone",
                    FT_UINT32,  BASE_DEC, NULL, 0x00000002, "", HFILL 
            }
     },
     {
            &hf_ulmap_uiuc14_bwr,
            {
-                   "BW request mandatory", "wimax.ulmap.uiuc14.bwr",
+                   "BW request mandatory", "wmx.ulmap.uiuc14.bwr",
                    FT_UINT8,  BASE_DEC, NULL, 0x01, "", HFILL 
            }
     },
     {
            &hf_ulmap_uiuc14_code,
            {
-                   "Ranging code", "wimax.ulmap.uiuc14.code",
+                   "Ranging code", "wmx.ulmap.uiuc14.code",
                    FT_UINT8,  BASE_DEC, NULL, 0x0, "", HFILL 
            }
     },
     {
            &hf_ulmap_uiuc14_dur,
            {
-                   "Duration", "wimax.ulmap.uiuc14.dur",
+                   "Duration", "wmx.ulmap.uiuc14.dur",
                    FT_UINT16, BASE_DEC, NULL, 0xfc00, "", HFILL 
            }
     },
     {
            &hf_ulmap_uiuc14_idx,
            {
-                   "Frame Number Index", "wimax.ulmap.uiuc14.idx",
+                   "Frame Number Index", "wmx.ulmap.uiuc14.idx",
                    FT_UINT16, BASE_DEC, NULL, 0x000F, "", HFILL 
            }
     },
     {
            &hf_ulmap_uiuc14_rep,
            {
-                   "Repetition Coding Indication", "wimax.ulmap.uiuc14.rep",
+                   "Repetition Coding Indication", "wmx.ulmap.uiuc14.rep",
                    FT_UINT16, BASE_DEC, NULL, 0x0030, "", HFILL 
            }
     },
     {
            &hf_ulmap_uiuc14_sub,
            {
-                   "Ranging subchannel", "wimax.ulmap.uiuc14.sub",
+                   "Ranging subchannel", "wmx.ulmap.uiuc14.sub",
                    FT_UINT8,  BASE_DEC, NULL, 0xfe, "", HFILL 
            }
     },
     {
            &hf_ulmap_uiuc14_sym,
            {
-                   "Ranging symbol", "wimax.ulmap.uiuc14.sym",
+                   "Ranging symbol", "wmx.ulmap.uiuc14.sym",
                    FT_UINT8,  BASE_DEC, NULL, 0x0, "", HFILL 
            }
     },
     {
            &hf_ulmap_uiuc14_uiuc,
            {
-                   "UIUC", "wimax.ulmap.uiuc14.uiuc",
+                   "UIUC", "wmx.ulmap.uiuc14.uiuc",
                    FT_UINT16, BASE_DEC, NULL, 0x03c0, "", HFILL 
            }
     },
     {
            &hf_ulmap_uiuc15_data,
            {
-                   "Data", "wimax.ulmap.uiuc15.data",
+                   "Data", "wmx.ulmap.uiuc15.data",
                    FT_BYTES,  BASE_HEX, NULL, 0x0, "", HFILL 
            }
     },
     {
            &hf_ulmap_uiuc15_ext,
            {
-                   "Extended UIUC", "wimax.ulmap.uiuc15.ext",
+                   "Extended UIUC", "wmx.ulmap.uiuc15.ext",
                    FT_UINT8,  BASE_DEC, NULL, 0x0, "", HFILL 
            }
     },
     {
            &hf_ulmap_uiuc15_len,
            {
-                   "Length", "wimax.ulmap.uiuc15.len",
+                   "Length", "wmx.ulmap.uiuc15.len",
                    FT_UINT8,  BASE_DEC, NULL, 0x0, "", HFILL 
            }
     }
index fa78768dbc45b2f93ca3d7891b48d416fa16e33d..b73719672033d2f2eb97a73ae38175ddfe067153 100644 (file)
@@ -78,7 +78,7 @@ gint    man_ofdma = 1;
 
 address bs_address = {0,0,0};
 
-/* The following variables are local to the function, but serve as 
+/* The following variables are local to the function, but serve as
    elements for the global ett_tlv[] array */
 static gint ett_tlv_0 = -1;
 static gint ett_tlv_1 = -1;
@@ -338,7 +338,7 @@ static gint ett_tlv_254 = -1;
 static gint ett_tlv_255 = -1;
 
 /* Global TLV array to retrieve unique subtree identifiers */
-/* Note: ett_tlv_0 is a placeholder so the TLV number will 
+/* Note: ett_tlv_0 is a placeholder so the TLV number will
       correlate directly with the index number */
 gint *ett_tlv[] =
 {
@@ -837,7 +837,7 @@ void proto_register_wimax(void)
 
                wimax_module = prefs_register_protocol(proto_wimax, proto_reg_handoff_wimax);
 
-               prefs_register_uint_preference(wimax_module, "wimax.basic_cid_max",
+               prefs_register_uint_preference(wimax_module, "basic_cid_max",
                                 "Maximum Basic CID",
                                 "Set the maximum Basic CID"
                                 " used in the Wimax decoder"
@@ -846,13 +846,15 @@ void proto_register_wimax(void)
                                 " double the maximum Basic CID.",
                                10, &global_cid_max_basic);
 
-               prefs_register_bool_preference(wimax_module, "wimax.corrigendum_2_version",
+               prefs_register_bool_preference(wimax_module, "corrigendum_2_version",
                                 "Corrigendum 2 Version",
                                 "Set to TRUE to use the Corrigendum"
                                 " 2 version of Wimax message decoding."
                                 " Set to FALSE to use the 802.16e-2005"
                                 "  version.",
                                &include_cor2_changes);
+               prefs_register_obsolete_preference(wimax_module, "wimax.basic_cid_max");
+               prefs_register_obsolete_preference(wimax_module, "wimax.corrigendum_2_version");
 
                register_dissector_table("wimax.max_basic_cid", "Max Basic CID", FT_UINT16, BASE_DEC);
                register_dissector_table("wimax.corrigendum_2_version", "Corrigendum 2 Version", FT_UINT16, BASE_DEC);
@@ -866,7 +868,7 @@ void proto_reg_wimax(void)
        if (find_dissector("wmx") == NULL)
        {
                /* Register the WiMax dissector */
-               register_dissector("wimax_dissector", dissect_wimax, proto_wimax);
+               register_dissector("wmx", dissect_wimax, proto_wimax);
        }
 }
 
index 51c10bf59fb9fd889e36964d5aa04fe215867689..1fe3d7f533805ac4ce3bae0041d5f40ab68f23fb 100644 (file)
@@ -55,7 +55,7 @@ static hf_register_info hf[] =
        {
                &hf_wimax_ranging_code,
                {
-                       "Ranging Code", "wimax.cdma.ranging_code",
+                       "Ranging Code", "wmx.cdma.ranging_code",
                        FT_UINT8, BASE_HEX, NULL, 0x0,
                        "", HFILL
                }
@@ -63,7 +63,7 @@ static hf_register_info hf[] =
        {
                &hf_wimax_ranging_symbol_offset,
                {
-                       "Ranging Symbol Offset", "wimax.cdma.ranging_symbol_offset",
+                       "Ranging Symbol Offset", "wmx.cdma.ranging_symbol_offset",
                        FT_UINT8, BASE_HEX, NULL, 0x0,
                        "", HFILL
                }
@@ -71,7 +71,7 @@ static hf_register_info hf[] =
        {
                &hf_wimax_ranging_subchannel_offset,
                {
-                       "Ranging Sub-Channel Offset", "wimax.cdma.ranging_subchannel_offset",
+                       "Ranging Sub-Channel Offset", "wmx.cdma.ranging_subchannel_offset",
                        FT_UINT8, BASE_HEX, NULL, 0x0,
                        "", HFILL
                }
index 03f2884a42c5731904fd6503212668ec850cb85b..5780a96f5356bbc56a7bbe66519e4430eaa072df 100644 (file)
@@ -226,177 +226,177 @@ static hf_register_info hf_compact_dlmap[] =
 {
        {
                &hf_cdlmap_dl_map_type,
-               {"DL-MAP Type", "wimax.compact_dlmap.dl_map_type", FT_UINT8, BASE_DEC, NULL, DL_MAP_TYPE_MASK, "", HFILL}
+               {"DL-MAP Type", "wmx.compact_dlmap.dl_map_type", FT_UINT8, BASE_DEC, NULL, DL_MAP_TYPE_MASK, "", HFILL}
        },
        {
                &hf_cdlmap_dl_map_type_1,
-               {"DL-MAP Type", "wimax.compact_dlmap.dl_map_type", FT_UINT8, BASE_DEC, NULL, DL_MAP_TYPE_MASK_1, "", HFILL}
+               {"DL-MAP Type", "wmx.compact_dlmap.dl_map_type", FT_UINT8, BASE_DEC, NULL, DL_MAP_TYPE_MASK_1, "", HFILL}
        },
        {
                &hf_cdlmap_ul_map_append,
-               {"UL-MAP Append", "wimax.compact_dlmap.ul_map_append", FT_UINT8, BASE_HEX, NULL, UL_MAP_APPEND_MASK, "", HFILL}
+               {"UL-MAP Append", "wmx.compact_dlmap.ul_map_append", FT_UINT8, BASE_HEX, NULL, UL_MAP_APPEND_MASK, "", HFILL}
        },
        {
                &hf_cdlmap_ul_map_append_1,
-               {"UL-MAP Append", "wimax.compact_dlmap.ul_map_append", FT_UINT8, BASE_HEX, NULL, UL_MAP_APPEND_MASK_1, "", HFILL}
+               {"UL-MAP Append", "wmx.compact_dlmap.ul_map_append", FT_UINT8, BASE_HEX, NULL, UL_MAP_APPEND_MASK_1, "", HFILL}
        },
        {
                &hf_cdlmap_reserved,
-               {"Reserved", "wimax.compact_dlmap.reserved", FT_UINT8, BASE_HEX, NULL, UL_MAP_APPEND_MASK, "", HFILL}
+               {"Reserved", "wmx.compact_dlmap.reserved", FT_UINT8, BASE_HEX, NULL, UL_MAP_APPEND_MASK, "", HFILL}
        },
        {
                &hf_cdlmap_reserved_1,
-               {"Reserved", "wimax.compact_dlmap.reserved", FT_UINT8, BASE_HEX, NULL, UL_MAP_APPEND_MASK_1, "", HFILL}
+               {"Reserved", "wmx.compact_dlmap.reserved", FT_UINT8, BASE_HEX, NULL, UL_MAP_APPEND_MASK_1, "", HFILL}
        },
        {
                &hf_cdlmap_nep_code,
-               {"Nep Code", "wimax.compact_dlmap.nep_code", FT_UINT8, BASE_HEX, NULL, MSB_NIBBLE_MASK, "", HFILL}
+               {"Nep Code", "wmx.compact_dlmap.nep_code", FT_UINT8, BASE_HEX, NULL, MSB_NIBBLE_MASK, "", HFILL}
        },
        {
                &hf_cdlmap_nep_code_1,
-               {"Nep Code", "wimax.compact_dlmap.nep_code", FT_UINT8, BASE_HEX, NULL, LSB_NIBBLE_MASK, "", HFILL}
+               {"Nep Code", "wmx.compact_dlmap.nep_code", FT_UINT8, BASE_HEX, NULL, LSB_NIBBLE_MASK, "", HFILL}
        },
        {
                &hf_cdlmap_nsch_code,
-               {"Nsch Code", "wimax.compact_dlmap.nsch_code", FT_UINT8, BASE_HEX, NULL, MSB_NIBBLE_MASK, "", HFILL}
+               {"Nsch Code", "wmx.compact_dlmap.nsch_code", FT_UINT8, BASE_HEX, NULL, MSB_NIBBLE_MASK, "", HFILL}
        },
        {
                &hf_cdlmap_nsch_code_1,
-               {"Nsch Code", "wimax.compact_dlmap.nsch_code", FT_UINT8, BASE_HEX, NULL, LSB_NIBBLE_MASK, "", HFILL}
+               {"Nsch Code", "wmx.compact_dlmap.nsch_code", FT_UINT8, BASE_HEX, NULL, LSB_NIBBLE_MASK, "", HFILL}
        },
        {
                &hf_cdlmap_num_bands,
-               {"Number Of Bands", "wimax.compact_dlmap.num_bands", FT_UINT8, BASE_HEX, NULL, MSB_NIBBLE_MASK, "", HFILL}
+               {"Number Of Bands", "wmx.compact_dlmap.num_bands", FT_UINT8, BASE_HEX, NULL, MSB_NIBBLE_MASK, "", HFILL}
        },
        {
                &hf_cdlmap_num_bands_1,
-               {"Number Of Bands", "wimax.compact_dlmap.num_bands", FT_UINT8, BASE_HEX, NULL, LSB_NIBBLE_MASK, "", HFILL}
+               {"Number Of Bands", "wmx.compact_dlmap.num_bands", FT_UINT8, BASE_HEX, NULL, LSB_NIBBLE_MASK, "", HFILL}
        },
        {
                &hf_cdlmap_band_index,
-               {"Band Index", "wimax.compact_dlmap.band_index", FT_BYTES, BASE_HEX, NULL, 0x0, "", HFILL}
+               {"Band Index", "wmx.compact_dlmap.band_index", FT_BYTES, BASE_HEX, NULL, 0x0, "", HFILL}
        },
 #if 0
        {
                &hf_cdlmap_band_index_1,
-               {"Band Index", "wimax.compact_dlmap.band_index", FT_BYTES, BASE_HEX, NULL, 0x0, "", HFILL}
+               {"Band Index", "wmx.compact_dlmap.band_index", FT_BYTES, BASE_HEX, NULL, 0x0, "", HFILL}
        },
 #endif
        {
                &hf_cdlmap_nb_bitmap,
-               {"Number Of Bits For Band BITMAP", "wimax.compact_dlmap.nb_bitmap", FT_UINT8, BASE_HEX, NULL, MSB_NIBBLE_MASK, "", HFILL}
+               {"Number Of Bits For Band BITMAP", "wmx.compact_dlmap.nb_bitmap", FT_UINT8, BASE_HEX, NULL, MSB_NIBBLE_MASK, "", HFILL}
        },
        {
                &hf_cdlmap_nb_bitmap_1,
-               {"Number Of Bits For Band BITMAP", "wimax.compact_dlmap.nb_bitmap", FT_UINT8, BASE_HEX, NULL, LSB_NIBBLE_MASK, "", HFILL}
+               {"Number Of Bits For Band BITMAP", "wmx.compact_dlmap.nb_bitmap", FT_UINT8, BASE_HEX, NULL, LSB_NIBBLE_MASK, "", HFILL}
        },
        {
                &hf_cdlmap_shortened_uiuc,
-               {"Shortened UIUC", "wimax.compact_dlmap.shortened_uiuc", FT_UINT8, BASE_HEX, NULL, SHORTENED_DIUC_MASK, "", HFILL}
+               {"Shortened UIUC", "wmx.compact_dlmap.shortened_uiuc", FT_UINT8, BASE_HEX, NULL, SHORTENED_DIUC_MASK, "", HFILL}
        },
        {
                &hf_cdlmap_shortened_uiuc_1,
-               {"Shortened UIUC", "wimax.compact_dlmap.shortened_uiuc", FT_UINT16, BASE_HEX, NULL, SHORTENED_DIUC_MASK_1, "", HFILL}
+               {"Shortened UIUC", "wmx.compact_dlmap.shortened_uiuc", FT_UINT16, BASE_HEX, NULL, SHORTENED_DIUC_MASK_1, "", HFILL}
        },
        {
                &hf_cdlmap_shortened_diuc,
-               {"Shortened DIUC", "wimax.compact_dlmap.shortened_diuc", FT_UINT8, BASE_HEX, NULL, SHORTENED_DIUC_MASK, "", HFILL}
+               {"Shortened DIUC", "wmx.compact_dlmap.shortened_diuc", FT_UINT8, BASE_HEX, NULL, SHORTENED_DIUC_MASK, "", HFILL}
        },
        {
                &hf_cdlmap_shortened_diuc_1,
-               {"Shortened DIUC", "wimax.compact_dlmap.shortened_diuc", FT_UINT16, BASE_HEX, NULL, SHORTENED_DIUC_MASK_1, "", HFILL}
+               {"Shortened DIUC", "wmx.compact_dlmap.shortened_diuc", FT_UINT16, BASE_HEX, NULL, SHORTENED_DIUC_MASK_1, "", HFILL}
        },
        {
                &hf_cdlmap_companded_sc,
-               {"Companded SC", "wimax.compact_dlmap.companded_sc", FT_UINT8, BASE_HEX, NULL, COMPANDED_SC_MASK, "", HFILL}
+               {"Companded SC", "wmx.compact_dlmap.companded_sc", FT_UINT8, BASE_HEX, NULL, COMPANDED_SC_MASK, "", HFILL}
        },
        {
                &hf_cdlmap_companded_sc_1,
-               {"Companded SC", "wimax.compact_dlmap.companded_sc", FT_UINT16, BASE_HEX, NULL, COMPANDED_SC_MASK_1, "", HFILL}
+               {"Companded SC", "wmx.compact_dlmap.companded_sc", FT_UINT16, BASE_HEX, NULL, COMPANDED_SC_MASK_1, "", HFILL}
        },
        {
                &hf_cdlmap_bin_offset,
-               {"BIN Offset", "wimax.compact_dlmap.bin_offset", FT_UINT8, BASE_HEX, NULL, 0x0, "", HFILL}
+               {"BIN Offset", "wmx.compact_dlmap.bin_offset", FT_UINT8, BASE_HEX, NULL, 0x0, "", HFILL}
        },
        {
                &hf_cdlmap_bin_offset_1,
-               {"BIN Offset", "wimax.compact_dlmap.bin_offset", FT_UINT16, BASE_HEX, NULL, 0x0FF0, "", HFILL}
+               {"BIN Offset", "wmx.compact_dlmap.bin_offset", FT_UINT16, BASE_HEX, NULL, 0x0FF0, "", HFILL}
        },
        {
                &hf_cdlmap_diuc_num_of_subchannels,
-               {"Number Of Subchannels", "wimax.compact_dlmap.diuc_num_of_subchannels", FT_UINT8, BASE_DEC, NULL, 0x0, "", HFILL}
+               {"Number Of Subchannels", "wmx.compact_dlmap.diuc_num_of_subchannels", FT_UINT8, BASE_DEC, NULL, 0x0, "", HFILL}
        },
        {
                &hf_cdlmap_diuc_num_of_subchannels_1,
-               {"Number Of Subchannels", "wimax.compact_dlmap.diuc_num_of_subchannels", FT_UINT16, BASE_DEC, NULL, 0x0FF0, "", HFILL}
+               {"Number Of Subchannels", "wmx.compact_dlmap.diuc_num_of_subchannels", FT_UINT16, BASE_DEC, NULL, 0x0FF0, "", HFILL}
        },
        {
                &hf_cdlmap_diuc_repetition_coding_indication,
-               {"Repetition Coding Indication", "wimax.compact_dlmap.diuc_repetition_coding_indication", FT_UINT8, BASE_DEC, VALS(rep_msgs), 0xC0, "", HFILL}
+               {"Repetition Coding Indication", "wmx.compact_dlmap.diuc_repetition_coding_indication", FT_UINT8, BASE_DEC, VALS(rep_msgs), 0xC0, "", HFILL}
        },
        {
                &hf_cdlmap_diuc_repetition_coding_indication_1,
-               {"Repetition Coding Indication", "wimax.compact_dlmap.diuc_repetition_coding_indication", FT_UINT8, BASE_DEC, VALS(rep_msgs), 0x0C, "", HFILL}
+               {"Repetition Coding Indication", "wmx.compact_dlmap.diuc_repetition_coding_indication", FT_UINT8, BASE_DEC, VALS(rep_msgs), 0x0C, "", HFILL}
        },
        {
                &hf_cdlmap_diuc_reserved,
-               {"Reserved", "wimax.compact_dlmap.diuc_reserved", FT_UINT8, BASE_HEX, NULL, 0x30, "", HFILL}
+               {"Reserved", "wmx.compact_dlmap.diuc_reserved", FT_UINT8, BASE_HEX, NULL, 0x30, "", HFILL}
        },
        {
                &hf_cdlmap_diuc_reserved_1,
-               {"Reserved", "wimax.compact_dlmap.diuc_reserved", FT_UINT8, BASE_HEX, NULL, 0x03, "", HFILL}
+               {"Reserved", "wmx.compact_dlmap.diuc_reserved", FT_UINT8, BASE_HEX, NULL, 0x03, "", HFILL}
        },
        {
                &hf_cdlmap_bit_map_length,
-               {"BIT MAP Length", "wimax.compact_dlmap.bit_map_length", FT_UINT8, BASE_DEC, NULL, MSB_NIBBLE_MASK, "", HFILL}
+               {"BIT MAP Length", "wmx.compact_dlmap.bit_map_length", FT_UINT8, BASE_DEC, NULL, MSB_NIBBLE_MASK, "", HFILL}
        },
        {
                &hf_cdlmap_bit_map_length_1,
-               {"BIT MAP Length", "wimax.compact_dlmap.bit_map_length", FT_UINT8, BASE_DEC, NULL, LSB_NIBBLE_MASK, "", HFILL}
+               {"BIT MAP Length", "wmx.compact_dlmap.bit_map_length", FT_UINT8, BASE_DEC, NULL, LSB_NIBBLE_MASK, "", HFILL}
        },
        {
                &hf_cdlmap_bit_map,
-               {"BIT MAP", "wimax.compact_dlmap.bit_map", FT_BYTES, BASE_HEX, NULL, 0x0, "", HFILL}
+               {"BIT MAP", "wmx.compact_dlmap.bit_map", FT_BYTES, BASE_HEX, NULL, 0x0, "", HFILL}
        },
        {
                &hf_cdlmap_diuc,
-               {"DIUC", "wimax.compact_dlmap.diuc", FT_UINT8, BASE_HEX, NULL, MSB_NIBBLE_MASK, "", HFILL}
+               {"DIUC", "wmx.compact_dlmap.diuc", FT_UINT8, BASE_HEX, NULL, MSB_NIBBLE_MASK, "", HFILL}
        },
        {
                &hf_cdlmap_diuc_1,
-               {"DIUC", "wimax.compact_dlmap.diuc", FT_UINT8, BASE_HEX, NULL, LSB_NIBBLE_MASK, "", HFILL}
+               {"DIUC", "wmx.compact_dlmap.diuc", FT_UINT8, BASE_HEX, NULL, LSB_NIBBLE_MASK, "", HFILL}
        },
        {
                &hf_cdlmap_allocation_mode,
-               {"Allocation Mode", "wimax.compact_dlmap.allocation_mode", FT_UINT8, BASE_DEC, VALS(vals_allocation_modes), 0xC0, "", HFILL}
+               {"Allocation Mode", "wmx.compact_dlmap.allocation_mode", FT_UINT8, BASE_DEC, VALS(vals_allocation_modes), 0xC0, "", HFILL}
        },
        {
                &hf_cdlmap_allocation_mode_1,
-               {"Allocation Mode", "wimax.compact_dlmap.allocation_mode", FT_UINT8, BASE_DEC, VALS(vals_allocation_modes), 0x0C, "", HFILL}
+               {"Allocation Mode", "wmx.compact_dlmap.allocation_mode", FT_UINT8, BASE_DEC, VALS(vals_allocation_modes), 0x0C, "", HFILL}
        },
        {
                &hf_cdlmap_allocation_mode_rsvd,
-               {"Reserved", "wimax.compact_dlmap.allocation_mode_rsvd", FT_UINT8, BASE_DEC, NULL, 0x30, "", HFILL}
+               {"Reserved", "wmx.compact_dlmap.allocation_mode_rsvd", FT_UINT8, BASE_DEC, NULL, 0x30, "", HFILL}
        },
        {
                &hf_cdlmap_allocation_mode_rsvd_1,
-               {"Reserved", "wimax.compact_dlmap.allocation_mode_rsvd", FT_UINT8, BASE_DEC, NULL, 0x03, "", HFILL}
+               {"Reserved", "wmx.compact_dlmap.allocation_mode_rsvd", FT_UINT8, BASE_DEC, NULL, 0x03, "", HFILL}
        },
        {
                &hf_cdlmap_num_subchannels,
-               {"Number Of Subchannels", "wimax.compact_dlmap.num_subchannels", FT_UINT8, BASE_DEC, NULL, 0x0, "", HFILL}
+               {"Number Of Subchannels", "wmx.compact_dlmap.num_subchannels", FT_UINT8, BASE_DEC, NULL, 0x0, "", HFILL}
        },
        {
                &hf_cdlmap_num_subchannels_1,
-               {"Number Of Subchannels", "wimax.compact_dlmap.num_subchannels", FT_UINT16, BASE_DEC, NULL, 0x0FF0, "", HFILL}
+               {"Number Of Subchannels", "wmx.compact_dlmap.num_subchannels", FT_UINT16, BASE_DEC, NULL, 0x0FF0, "", HFILL}
        },
        {
                &hf_cdlmap_reserved_type,
-               {"DL-MAP Reserved Type", "wimax.compact_dlmap.reserved_type", FT_UINT8, BASE_DEC, NULL, DL_MAP_TYPE_MASK, "", HFILL}
+               {"DL-MAP Reserved Type", "wmx.compact_dlmap.reserved_type", FT_UINT8, BASE_DEC, NULL, DL_MAP_TYPE_MASK, "", HFILL}
        },
        {
                &hf_cdlmap_reserved_type_1,
-               {"DL-MAP Reserved Type", "wimax.compact_dlmap.reserved_type", FT_UINT8, BASE_DEC, NULL, DL_MAP_TYPE_MASK_1, "", HFILL}
+               {"DL-MAP Reserved Type", "wmx.compact_dlmap.reserved_type", FT_UINT8, BASE_DEC, NULL, DL_MAP_TYPE_MASK_1, "", HFILL}
        }
 };
 
@@ -445,83 +445,83 @@ static hf_register_info hf_format_config[] =
 {
        {
                &hf_format_config_ie_dl_map_type,
-               {"DL-MAP Type", "wimax.format_config_ie.dl_map_type", FT_UINT8, BASE_DEC, NULL, DL_MAP_TYPE_MASK, "", HFILL}
+               {"DL-MAP Type", "wmx.format_config_ie.dl_map_type", FT_UINT8, BASE_DEC, NULL, DL_MAP_TYPE_MASK, "", HFILL}
        },
        {
                &hf_format_config_ie_dl_map_type_1,
-               {"DL-MAP Type", "wimax.format_config_ie.dl_map_type", FT_UINT8, BASE_DEC, NULL, DL_MAP_TYPE_MASK_1, "", HFILL}
+               {"DL-MAP Type", "wmx.format_config_ie.dl_map_type", FT_UINT8, BASE_DEC, NULL, DL_MAP_TYPE_MASK_1, "", HFILL}
        },
        {
                &hf_format_config_ie_dl_map_type_32,
-               {"DL-MAP Type", "wimax.format_config_ie.dl_map_type", FT_UINT32, BASE_DEC, NULL, FORMAT_CONFIG_IE_DL_MAP_TYPE_MASK, "", HFILL}
+               {"DL-MAP Type", "wmx.format_config_ie.dl_map_type", FT_UINT32, BASE_DEC, NULL, FORMAT_CONFIG_IE_DL_MAP_TYPE_MASK, "", HFILL}
        },
        {
                &hf_format_config_ie_new_format_indication,
-               {"New Format Indication", "wimax.format_config_ie.new_format_indication", FT_BOOLEAN, 8, TFS(&tfs_indication), UL_MAP_APPEND_MASK, "", HFILL}
+               {"New Format Indication", "wmx.format_config_ie.new_format_indication", FT_BOOLEAN, 8, TFS(&tfs_indication), UL_MAP_APPEND_MASK, "", HFILL}
        },
        {
                &hf_format_config_ie_new_format_indication_1,
-               {"New Format Indication", "wimax.format_config_ie.new_format_indication", FT_BOOLEAN, 8, TFS(&tfs_indication), UL_MAP_APPEND_MASK_1, "", HFILL}
+               {"New Format Indication", "wmx.format_config_ie.new_format_indication", FT_BOOLEAN, 8, TFS(&tfs_indication), UL_MAP_APPEND_MASK_1, "", HFILL}
        },
        {
                &hf_format_config_ie_new_format_indication_32,
-               {"New Format Indication", "wimax.format_config_ie.new_format_indication", FT_BOOLEAN, 32, TFS(&tfs_indication), FORMAT_CONFIG_IE_NEW_FORMAT_IND_MASK, "", HFILL}
+               {"New Format Indication", "wmx.format_config_ie.new_format_indication", FT_BOOLEAN, 32, TFS(&tfs_indication), FORMAT_CONFIG_IE_NEW_FORMAT_IND_MASK, "", HFILL}
        },
        {
                &hf_format_config_ie_cid_type,
-               {"HARQ MAP Indicator", "wimax.harq_map.format_config_ie.indicator", FT_UINT32, BASE_HEX, VALS(vals_cid_types), CID_TYPE_MASK, "", HFILL}
+               {"HARQ MAP Indicator", "wmx.harq_map.format_config_ie.indicator", FT_UINT32, BASE_HEX, VALS(vals_cid_types), CID_TYPE_MASK, "", HFILL}
        },
        {
                &hf_format_config_ie_cid_type_1,
-               {"CID Type", "wimax.harq_map.format_config_ie.cid_type", FT_UINT32, BASE_HEX, VALS(vals_cid_types), CID_TYPE_MASK_1, "", HFILL}
+               {"CID Type", "wmx.harq_map.format_config_ie.cid_type", FT_UINT32, BASE_HEX, VALS(vals_cid_types), CID_TYPE_MASK_1, "", HFILL}
        },
        {
                &hf_format_config_ie_safety_pattern,
-               {"Safety Pattern", "wimax.harq_map.format_config_ie.safety_pattern", FT_UINT32, BASE_HEX, NULL, SAFETY_PATTERN_MASK, "", HFILL}
+               {"Safety Pattern", "wmx.harq_map.format_config_ie.safety_pattern", FT_UINT32, BASE_HEX, NULL, SAFETY_PATTERN_MASK, "", HFILL}
        },
        {
                &hf_format_config_ie_safety_pattern_1,
-               {"Safety Pattern", "wimax.harq_map.format_config_ie.safety_pattern", FT_UINT32, BASE_HEX, NULL, SAFETY_PATTERN_MASK_1, "", HFILL}
+               {"Safety Pattern", "wmx.harq_map.format_config_ie.safety_pattern", FT_UINT32, BASE_HEX, NULL, SAFETY_PATTERN_MASK_1, "", HFILL}
        },
        {
                &hf_format_config_ie_subchannel_type,
-               {"Subchannel Type For Band AMC", "wimax.harq_map.format_config_ie.subchannel_type", FT_UINT32, BASE_HEX, VALS(vals_subchannel_types), BAND_AMC_SUBCHANNEL_TYPE_MASK, "", HFILL}
+               {"Subchannel Type For Band AMC", "wmx.harq_map.format_config_ie.subchannel_type", FT_UINT32, BASE_HEX, VALS(vals_subchannel_types), BAND_AMC_SUBCHANNEL_TYPE_MASK, "", HFILL}
        },
        {
                &hf_format_config_ie_subchannel_type_1,
-               {"Subchannel Type For Band AMC", "wimax.harq_map.format_config_ie.subchannel_type", FT_UINT32, BASE_HEX, VALS(vals_subchannel_types), BAND_AMC_SUBCHANNEL_TYPE_MASK_1, "", HFILL}
+               {"Subchannel Type For Band AMC", "wmx.harq_map.format_config_ie.subchannel_type", FT_UINT32, BASE_HEX, VALS(vals_subchannel_types), BAND_AMC_SUBCHANNEL_TYPE_MASK_1, "", HFILL}
        },
        {
                &hf_format_config_ie_max_logical_bands,
-               {"Max Logical Bands", "wimax.harq_map.format_config_ie.max_logical_bands", FT_UINT32, BASE_HEX, VALS(vals_max_logical_bands), MAX_LOGICAL_BANDS_MASK, "", HFILL}
+               {"Max Logical Bands", "wmx.harq_map.format_config_ie.max_logical_bands", FT_UINT32, BASE_HEX, VALS(vals_max_logical_bands), MAX_LOGICAL_BANDS_MASK, "", HFILL}
        },
        {
                &hf_format_config_ie_max_logical_bands_1,
-               {"Max Logical Bands", "wimax.harq_map.format_config_ie.max_logical_bands", FT_UINT32, BASE_HEX, VALS(vals_max_logical_bands), MAX_LOGICAL_BANDS_MASK_1, "", HFILL}
+               {"Max Logical Bands", "wmx.harq_map.format_config_ie.max_logical_bands", FT_UINT32, BASE_HEX, VALS(vals_max_logical_bands), MAX_LOGICAL_BANDS_MASK_1, "", HFILL}
        },
        {
                &hf_format_config_ie_num_of_broadcast_symbol,
-               {"Number Of Symbols for Broadcast", "wimax.harq_map.format_config_ie.num_of_broadcast_symbol", FT_UINT32, BASE_HEX, NULL, NUM_BROADCAST_SYMBOLS_MASK_1, "", HFILL}
+               {"Number Of Symbols for Broadcast", "wmx.harq_map.format_config_ie.num_of_broadcast_symbol", FT_UINT32, BASE_HEX, NULL, NUM_BROADCAST_SYMBOLS_MASK_1, "", HFILL}
        },
        {
                &hf_format_config_ie_num_of_broadcast_symbol_1,
-               {"Number Of Symbols for Broadcast", "wimax.harq_map.num_of_broadcast_symbol", FT_UINT32, BASE_HEX, NULL, NUM_BROADCAST_SYMBOLS_MASK_1, "", HFILL}
+               {"Number Of Symbols for Broadcast", "wmx.harq_map.num_of_broadcast_symbol", FT_UINT32, BASE_HEX, NULL, NUM_BROADCAST_SYMBOLS_MASK_1, "", HFILL}
        },
        {
                &hf_format_config_ie_num_of_dl_band_amc_symbol,
-               {"Number Of Symbols for Broadcast", "wimax.harq_map.format_config_ie.num_of_dl_band_amc_symbol", FT_UINT32, BASE_HEX, NULL, NUM_DL_AMC_SYMBOLS_MASK, "", HFILL}
+               {"Number Of Symbols for Broadcast", "wmx.harq_map.format_config_ie.num_of_dl_band_amc_symbol", FT_UINT32, BASE_HEX, NULL, NUM_DL_AMC_SYMBOLS_MASK, "", HFILL}
        },
        {
                &hf_format_config_ie_num_of_dl_band_amc_symbol_1,
-               {"Number Of Symbols for Broadcast", "wimax.harq_map.num_of_dl_band_amc_symbol", FT_UINT32, BASE_HEX, NULL, NUM_DL_AMC_SYMBOLS_MASK_1, "", HFILL}
+               {"Number Of Symbols for Broadcast", "wmx.harq_map.num_of_dl_band_amc_symbol", FT_UINT32, BASE_HEX, NULL, NUM_DL_AMC_SYMBOLS_MASK_1, "", HFILL}
        },
        {
                &hf_format_config_ie_num_of_ul_band_amc_symbol,
-               {"Number Of Symbols for Broadcast", "wimax.harq_map.format_config_ie.num_of_ul_band_amc_symbol", FT_UINT32, BASE_HEX, NULL, NUM_UL_AMC_SYMBOLS_MASK, "", HFILL}
+               {"Number Of Symbols for Broadcast", "wmx.harq_map.format_config_ie.num_of_ul_band_amc_symbol", FT_UINT32, BASE_HEX, NULL, NUM_UL_AMC_SYMBOLS_MASK, "", HFILL}
        },
        {
                &hf_format_config_ie_num_of_ul_band_amc_symbol_1,
-               {"Number Of Symbols for Broadcast", "wimax.harq_map.num_of_ul_band_amc_symbol", FT_UINT32, BASE_HEX, NULL, NUM_UL_AMC_SYMBOLS_MASK_1, "", HFILL}
+               {"Number Of Symbols for Broadcast", "wmx.harq_map.num_of_ul_band_amc_symbol", FT_UINT32, BASE_HEX, NULL, NUM_UL_AMC_SYMBOLS_MASK_1, "", HFILL}
        }
 };
 
@@ -555,51 +555,51 @@ static hf_register_info hf_rcid[] =
 {
        {
                &hf_harq_rcid_ie_normal_cid,
-               {"Normal CID", "wimax.harq_map.rcid_ie.normal_cid", FT_UINT16, BASE_HEX, NULL, 0x0, "", HFILL}
+               {"Normal CID", "wmx.harq_map.rcid_ie.normal_cid", FT_UINT16, BASE_HEX, NULL, 0x0, "", HFILL}
        },
        {
                &hf_harq_rcid_ie_normal_cid_1,
-               {"Normal CID", "wimax.harq_map.rcid_ie.normal_cid", FT_UINT24, BASE_HEX, NULL, WIMAX_RCID_IE_NORMAL_CID_MASK_1, "", HFILL}
+               {"Normal CID", "wmx.harq_map.rcid_ie.normal_cid", FT_UINT24, BASE_HEX, NULL, WIMAX_RCID_IE_NORMAL_CID_MASK_1, "", HFILL}
        },
        {
                &hf_harq_rcid_ie_prefix,
-               {"Prefix", "wimax.harq_map.rcid_ie.prefix", FT_UINT16, BASE_HEX, NULL, WIMAX_RCID_IE_PREFIX_MASK, "", HFILL}
+               {"Prefix", "wmx.harq_map.rcid_ie.prefix", FT_UINT16, BASE_HEX, NULL, WIMAX_RCID_IE_PREFIX_MASK, "", HFILL}
        },
        {
                &hf_harq_rcid_ie_prefix_1,
-               {"Prefix", "wimax.harq_map.rcid_ie.prefix", FT_UINT16, BASE_HEX, NULL, WIMAX_RCID_IE_PREFIX_MASK_1, "", HFILL}
+               {"Prefix", "wmx.harq_map.rcid_ie.prefix", FT_UINT16, BASE_HEX, NULL, WIMAX_RCID_IE_PREFIX_MASK_1, "", HFILL}
        },
        {
                &hf_harq_rcid_ie_cid3,
-               {"3 LSB Of Basic CID", "wimax.harq_map.rcid_ie.cid3", FT_UINT16, BASE_HEX, NULL, WIMAX_RCID_IE_CID3_MASK, "", HFILL}
+               {"3 LSB Of Basic CID", "wmx.harq_map.rcid_ie.cid3", FT_UINT16, BASE_HEX, NULL, WIMAX_RCID_IE_CID3_MASK, "", HFILL}
        },
        {
                &hf_harq_rcid_ie_cid3_1,
-               {"3 LSB Of Basic CID", "wimax.harq_map.rcid_ie.cid3", FT_UINT16, BASE_HEX, NULL, WIMAX_RCID_IE_CID3_MASK_1, "", HFILL}
+               {"3 LSB Of Basic CID", "wmx.harq_map.rcid_ie.cid3", FT_UINT16, BASE_HEX, NULL, WIMAX_RCID_IE_CID3_MASK_1, "", HFILL}
        },
        {
                &hf_harq_rcid_ie_cid7,
-               {"7 LSB Of Basic CID", "wimax.harq_map.rcid_ie.cid7", FT_UINT16, BASE_HEX, NULL, WIMAX_RCID_IE_CID7_MASK, "", HFILL}
+               {"7 LSB Of Basic CID", "wmx.harq_map.rcid_ie.cid7", FT_UINT16, BASE_HEX, NULL, WIMAX_RCID_IE_CID7_MASK, "", HFILL}
        },
        {
                &hf_harq_rcid_ie_cid7_1,
-               {"7 LSB Of Basic CID", "wimax.harq_map.rcid_ie.cid7", FT_UINT16, BASE_HEX, NULL, WIMAX_RCID_IE_CID7_MASK_1, "", HFILL}
+               {"7 LSB Of Basic CID", "wmx.harq_map.rcid_ie.cid7", FT_UINT16, BASE_HEX, NULL, WIMAX_RCID_IE_CID7_MASK_1, "", HFILL}
        },
        {
                &hf_harq_rcid_ie_cid11,
-               {"11 LSB Of Basic CID", "wimax.harq_map.rcid_ie.cid11", FT_UINT16, BASE_HEX, NULL, WIMAX_RCID_IE_CID11_MASK, "", HFILL}
+               {"11 LSB Of Basic CID", "wmx.harq_map.rcid_ie.cid11", FT_UINT16, BASE_HEX, NULL, WIMAX_RCID_IE_CID11_MASK, "", HFILL}
        },
        {
                &hf_harq_rcid_ie_cid11_1,
-               {"11 LSB Of Basic CID", "wimax.harq_map.rcid_ie.cid11", FT_UINT16, BASE_HEX, NULL, WIMAX_RCID_IE_CID11_MASK_1, "", HFILL}
+               {"11 LSB Of Basic CID", "wmx.harq_map.rcid_ie.cid11", FT_UINT16, BASE_HEX, NULL, WIMAX_RCID_IE_CID11_MASK_1, "", HFILL}
        },
        {
                &hf_harq_rcid_ie_cid11_2,
-               {"11 LSB Of Multicast, AAS or Broadcast CID", "wimax.harq_map.rcid_ie.cid11", FT_UINT16, BASE_HEX, NULL, WIMAX_RCID_IE_CID11_MASK, "", HFILL}
+               {"11 LSB Of Multicast, AAS or Broadcast CID", "wmx.harq_map.rcid_ie.cid11", FT_UINT16, BASE_HEX, NULL, WIMAX_RCID_IE_CID11_MASK, "", HFILL}
        },
        {
                &hf_harq_rcid_ie_cid11_3,
-               {"11 LSB Of Multicast, AAS or Broadcast CID", "wimax.harq_map.rcid_ie.cid11", FT_UINT16, BASE_HEX, NULL, WIMAX_RCID_IE_CID11_MASK_1, "", HFILL}
+               {"11 LSB Of Multicast, AAS or Broadcast CID", "wmx.harq_map.rcid_ie.cid11", FT_UINT16, BASE_HEX, NULL, WIMAX_RCID_IE_CID11_MASK_1, "", HFILL}
        }
 };
 
@@ -632,43 +632,43 @@ static hf_register_info hf_harq_control[] =
 {
        {
                &hf_harq_control_ie_prefix,
-               {"Prefix", "wimax.harq_map.harq_control_ie.prefix", FT_BOOLEAN, 8, TFS(&tfs_prefix), WIMAX_HARQ_CONTROL_IE_PREFIX_MASK, "", HFILL}
+               {"Prefix", "wmx.harq_map.harq_control_ie.prefix", FT_BOOLEAN, 8, TFS(&tfs_prefix), WIMAX_HARQ_CONTROL_IE_PREFIX_MASK, "", HFILL}
        },
        {
                &hf_harq_control_ie_ai_sn,
-               {"HARQ ID Sequence Number(AI_SN)", "wimax.harq_map.harq_control_ie.ai_sn", FT_UINT8, BASE_HEX, NULL, WIMAX_HARQ_CONTROL_IE_AI_SN_MASK, "", HFILL}
+               {"HARQ ID Sequence Number(AI_SN)", "wmx.harq_map.harq_control_ie.ai_sn", FT_UINT8, BASE_HEX, NULL, WIMAX_HARQ_CONTROL_IE_AI_SN_MASK, "", HFILL}
        },
        {
                &hf_harq_control_ie_spid,
-               {"Subpacket ID (SPID)", "wimax.harq_map.harq_control_ie.spid", FT_UINT8, BASE_HEX, NULL, WIMAX_HARQ_CONTROL_IE_SPID_MASK, "", HFILL}
+               {"Subpacket ID (SPID)", "wmx.harq_map.harq_control_ie.spid", FT_UINT8, BASE_HEX, NULL, WIMAX_HARQ_CONTROL_IE_SPID_MASK, "", HFILL}
        },
        {
                &hf_harq_control_ie_acid,
-               {"HARQ CH ID (ACID)", "wimax.harq_map.harq_control_ie.acid", FT_UINT8, BASE_HEX, NULL, WIMAX_HARQ_CONTROL_IE_ACID_MASK, "", HFILL}
+               {"HARQ CH ID (ACID)", "wmx.harq_map.harq_control_ie.acid", FT_UINT8, BASE_HEX, NULL, WIMAX_HARQ_CONTROL_IE_ACID_MASK, "", HFILL}
        },
        {
                &hf_harq_control_ie_reserved,
-               {"Reserved", "wimax.harq_map.harq_control_ie.reserved", FT_UINT8, BASE_HEX, NULL, WIMAX_HARQ_CONTROL_IE_RESERVED_MASK, "", HFILL}
+               {"Reserved", "wmx.harq_map.harq_control_ie.reserved", FT_UINT8, BASE_HEX, NULL, WIMAX_HARQ_CONTROL_IE_RESERVED_MASK, "", HFILL}
        },
        {
                &hf_harq_control_ie_prefix_1,
-               {"Prefix", "wimax.harq_map.harq_control_ie.prefix", FT_BOOLEAN, 16, TFS(&tfs_prefix), WIMAX_HARQ_CONTROL_IE_PREFIX_MASK_1, "", HFILL}
+               {"Prefix", "wmx.harq_map.harq_control_ie.prefix", FT_BOOLEAN, 16, TFS(&tfs_prefix), WIMAX_HARQ_CONTROL_IE_PREFIX_MASK_1, "", HFILL}
        },
        {
                &hf_harq_control_ie_ai_sn_1,
-               {"HARQ ID Sequence Number(AI_SN)", "wimax.harq_map.harq_control_ie.ai_sn", FT_UINT16, BASE_HEX, NULL, WIMAX_HARQ_CONTROL_IE_AI_SN_MASK_1, "", HFILL}
+               {"HARQ ID Sequence Number(AI_SN)", "wmx.harq_map.harq_control_ie.ai_sn", FT_UINT16, BASE_HEX, NULL, WIMAX_HARQ_CONTROL_IE_AI_SN_MASK_1, "", HFILL}
        },
        {
                &hf_harq_control_ie_spid_1,
-               {"Subpacket ID (SPID)", "wimax.harq_map.harq_control_ie.spid", FT_UINT16, BASE_HEX, NULL, WIMAX_HARQ_CONTROL_IE_SPID_MASK_1, "", HFILL}
+               {"Subpacket ID (SPID)", "wmx.harq_map.harq_control_ie.spid", FT_UINT16, BASE_HEX, NULL, WIMAX_HARQ_CONTROL_IE_SPID_MASK_1, "", HFILL}
        },
        {
                &hf_harq_control_ie_acid_1,
-               {"HARQ CH ID (ACID)", "wimax.harq_map.harq_control_ie.acid", FT_UINT16, BASE_HEX, NULL, WIMAX_HARQ_CONTROL_IE_ACID_MASK_1, "", HFILL}
+               {"HARQ CH ID (ACID)", "wmx.harq_map.harq_control_ie.acid", FT_UINT16, BASE_HEX, NULL, WIMAX_HARQ_CONTROL_IE_ACID_MASK_1, "", HFILL}
        },
        {
                &hf_harq_control_ie_reserved_1,
-               {"Reserved", "wimax.harq_map.harq_control_ie.reserved", FT_UINT16, BASE_HEX, NULL, WIMAX_HARQ_CONTROL_IE_RESERVED_MASK_1, "", HFILL}
+               {"Reserved", "wmx.harq_map.harq_control_ie.reserved", FT_UINT16, BASE_HEX, NULL, WIMAX_HARQ_CONTROL_IE_RESERVED_MASK_1, "", HFILL}
        }
 };
 
@@ -705,51 +705,51 @@ static hf_register_info hf_cqich_control[] =
 {
        {
                &hf_cqich_control_ie_indicator,
-               {"CQICH Indicator", "wimax.harq_map.cqich_control_ie.cqich_indicator", FT_BOOLEAN, 16, TFS(&tfs_cqich_ind), WIMAX_CQICH_CONTROL_IE_INDICATOR_MASK, "", HFILL}
+               {"CQICH Indicator", "wmx.harq_map.cqich_control_ie.cqich_indicator", FT_BOOLEAN, 16, TFS(&tfs_cqich_ind), WIMAX_CQICH_CONTROL_IE_INDICATOR_MASK, "", HFILL}
        },
        {
                &hf_cqich_control_ie_alloc_id,
-               {"Allocation Index", "wimax.harq_map.cqich_control_ie.alloc_id", FT_UINT16, BASE_HEX, NULL, WIMAX_CQICH_CONTROL_IE_ALLOCATION_INDEX_MASK, "", HFILL}
+               {"Allocation Index", "wmx.harq_map.cqich_control_ie.alloc_id", FT_UINT16, BASE_HEX, NULL, WIMAX_CQICH_CONTROL_IE_ALLOCATION_INDEX_MASK, "", HFILL}
        },
        {
                &hf_cqich_control_ie_period,
-               {"PERIOD", "wimax.harq_map.cqich_control_ie.period", FT_UINT16, BASE_HEX, NULL, WIMAX_CQICH_CONTROL_IE_PERIOD_MASK, "", HFILL}
+               {"PERIOD", "wmx.harq_map.cqich_control_ie.period", FT_UINT16, BASE_HEX, NULL, WIMAX_CQICH_CONTROL_IE_PERIOD_MASK, "", HFILL}
        },
        {
                &hf_cqich_control_ie_frame_offset,
-               {"Frame Offset", "wimax.harq_map.cqich_control_ie.frame_offset", FT_UINT16, BASE_HEX, NULL, WIMAX_CQICH_CONTROL_IE_FRAME_OFFSET_MASK, "", HFILL}
+               {"Frame Offset", "wmx.harq_map.cqich_control_ie.frame_offset", FT_UINT16, BASE_HEX, NULL, WIMAX_CQICH_CONTROL_IE_FRAME_OFFSET_MASK, "", HFILL}
        },
        {
                &hf_cqich_control_ie_duration,
-               {"Duration", "wimax.harq_map.cqich_control_ie.duration", FT_UINT16, BASE_HEX, NULL, WIMAX_CQICH_CONTROL_IE_DURATION_MASK, "", HFILL}
+               {"Duration", "wmx.harq_map.cqich_control_ie.duration", FT_UINT16, BASE_HEX, NULL, WIMAX_CQICH_CONTROL_IE_DURATION_MASK, "", HFILL}
        },
        {
                &hf_cqich_control_ie_cqi_rep_threshold,
-               {"CQI Reporting Threshold", "wimax.harq_map.cqich_control_ie.cqi_rep_threshold", FT_UINT16, BASE_HEX, NULL, WIMAX_CQICH_CONTROL_IE_CQI_REP_THRESHOLD_MASK, "", HFILL}
+               {"CQI Reporting Threshold", "wmx.harq_map.cqich_control_ie.cqi_rep_threshold", FT_UINT16, BASE_HEX, NULL, WIMAX_CQICH_CONTROL_IE_CQI_REP_THRESHOLD_MASK, "", HFILL}
        },
        {
                &hf_cqich_control_ie_indicator_1,
-               {"CQICH Indicator", "wimax.harq_map.cqich_control_ie.cqich_indicator", FT_BOOLEAN, 24, TFS(&tfs_cqich_ind), WIMAX_CQICH_CONTROL_IE_INDICATOR_MASK_1, "", HFILL}
+               {"CQICH Indicator", "wmx.harq_map.cqich_control_ie.cqich_indicator", FT_BOOLEAN, 24, TFS(&tfs_cqich_ind), WIMAX_CQICH_CONTROL_IE_INDICATOR_MASK_1, "", HFILL}
        },
        {
                &hf_cqich_control_ie_alloc_id_1,
-               {"Allocation Index", "wimax.harq_map.cqich_control_ie.alloc_id", FT_UINT24, BASE_HEX, NULL, WIMAX_CQICH_CONTROL_IE_ALLOCATION_INDEX_MASK_1, "", HFILL}
+               {"Allocation Index", "wmx.harq_map.cqich_control_ie.alloc_id", FT_UINT24, BASE_HEX, NULL, WIMAX_CQICH_CONTROL_IE_ALLOCATION_INDEX_MASK_1, "", HFILL}
        },
        {
                &hf_cqich_control_ie_period_1,
-               {"PERIOD", "wimax.harq_map.cqich_control_ie.period", FT_UINT24, BASE_HEX, NULL, WIMAX_CQICH_CONTROL_IE_PERIOD_MASK_1, "", HFILL}
+               {"PERIOD", "wmx.harq_map.cqich_control_ie.period", FT_UINT24, BASE_HEX, NULL, WIMAX_CQICH_CONTROL_IE_PERIOD_MASK_1, "", HFILL}
        },
        {
                &hf_cqich_control_ie_frame_offset_1,
-               {"Frame Offset", "wimax.harq_map.cqich_control_ie.frame_offset", FT_UINT24, BASE_HEX, NULL, WIMAX_CQICH_CONTROL_IE_FRAME_OFFSET_MASK_1, "", HFILL}
+               {"Frame Offset", "wmx.harq_map.cqich_control_ie.frame_offset", FT_UINT24, BASE_HEX, NULL, WIMAX_CQICH_CONTROL_IE_FRAME_OFFSET_MASK_1, "", HFILL}
        },
        {
                &hf_cqich_control_ie_duration_1,
-               {"Duration", "wimax.harq_map.cqich_control_ie.duration", FT_UINT24, BASE_HEX, NULL, WIMAX_CQICH_CONTROL_IE_DURATION_MASK_1, "", HFILL}
+               {"Duration", "wmx.harq_map.cqich_control_ie.duration", FT_UINT24, BASE_HEX, NULL, WIMAX_CQICH_CONTROL_IE_DURATION_MASK_1, "", HFILL}
        },
        {
                &hf_cqich_control_ie_cqi_rep_threshold_1,
-               {"CQI Reporting Threshold", "wimax.harq_map.cqich_control_ie.cqi_rep_threshold", FT_UINT24, BASE_HEX, NULL, WIMAX_CQICH_CONTROL_IE_CQI_REP_THRESHOLD_MASK_1, "", HFILL}
+               {"CQI Reporting Threshold", "wmx.harq_map.cqich_control_ie.cqi_rep_threshold", FT_UINT24, BASE_HEX, NULL, WIMAX_CQICH_CONTROL_IE_CQI_REP_THRESHOLD_MASK_1, "", HFILL}
        }
 };
 
@@ -779,51 +779,51 @@ static hf_register_info hf_extension_type[] =
 {
        {
                &hf_cdlmap_extension_type,
-               {"DL-MAP Type", "wimax.extension_type.dl_map_type", FT_UINT16, BASE_DEC, NULL, EXTENSION_TYPE_MASK, "", HFILL}
+               {"DL-MAP Type", "wmx.extension_type.dl_map_type", FT_UINT16, BASE_DEC, NULL, EXTENSION_TYPE_MASK, "", HFILL}
        },
        {
                &hf_cdlmap_extension_type_1,
-               {"DL-MAP Type", "wimax.extension_type.dl_map_type", FT_UINT16, BASE_DEC, NULL, EXTENSION_TYPE_MASK_1, "", HFILL}
+               {"DL-MAP Type", "wmx.extension_type.dl_map_type", FT_UINT16, BASE_DEC, NULL, EXTENSION_TYPE_MASK_1, "", HFILL}
        },
        {
                &hf_cdlmap_extension_subtype,
-               {"Extension Subtype", "wimax.extension_type.subtype", FT_UINT16, BASE_DEC, NULL, EXTENSION_SUBTYPE_MASK, "", HFILL}
+               {"Extension Subtype", "wmx.extension_type.subtype", FT_UINT16, BASE_DEC, NULL, EXTENSION_SUBTYPE_MASK, "", HFILL}
        },
        {
                &hf_cdlmap_extension_subtype_1,
-               {"Extension Subtype", "wimax.extension_type.subtype", FT_UINT16, BASE_DEC, NULL, EXTENSION_SUBTYPE_MASK_1, "", HFILL}
+               {"Extension Subtype", "wmx.extension_type.subtype", FT_UINT16, BASE_DEC, NULL, EXTENSION_SUBTYPE_MASK_1, "", HFILL}
        },
        {
                &hf_cdlmap_extension_length,
-               {"Extension Length", "wimax.extension_type.length", FT_UINT16, BASE_DEC, NULL, EXTENSION_LENGTH_MASK, "", HFILL}
+               {"Extension Length", "wmx.extension_type.length", FT_UINT16, BASE_DEC, NULL, EXTENSION_LENGTH_MASK, "", HFILL}
        },
        {
                &hf_cdlmap_extension_length_1,
-               {"Extension Length", "wimax.extension_type.length", FT_UINT16, BASE_DEC, NULL, EXTENSION_LENGTH_MASK_1, "", HFILL}
+               {"Extension Length", "wmx.extension_type.length", FT_UINT16, BASE_DEC, NULL, EXTENSION_LENGTH_MASK_1, "", HFILL}
        },
        {
                &hf_cdlmap_extension_time_diversity_mbs,
-               {"Time Diversity MBS", "wimax.extension_type.time_diversity_mbs", FT_BYTES, BASE_HEX, NULL, 0x0, "", HFILL}
+               {"Time Diversity MBS", "wmx.extension_type.time_diversity_mbs", FT_BYTES, BASE_HEX, NULL, 0x0, "", HFILL}
        },
        {
                &hf_cdlmap_extension_time_diversity_mbs_1,
-               {"Time Diversity MBS", "wimax.extension_type.time_diversity_mbs", FT_BYTES, BASE_HEX, NULL, 0x0, "", HFILL}
+               {"Time Diversity MBS", "wmx.extension_type.time_diversity_mbs", FT_BYTES, BASE_HEX, NULL, 0x0, "", HFILL}
        },
        {
                &hf_cdlmap_extension_harq_mode_1,
-               {"HARQ Mode Switch", "wimax.extension_type.harq_mode", FT_UINT16, BASE_HEX, NULL, 0x000F, "", HFILL}
+               {"HARQ Mode Switch", "wmx.extension_type.harq_mode", FT_UINT16, BASE_HEX, NULL, 0x000F, "", HFILL}
        },
        {
                &hf_cdlmap_extension_harq_mode,
-               {"HARQ Mode Switch", "wimax.extension_type.harq_mode", FT_UINT8, BASE_HEX, NULL, MSB_NIBBLE_MASK, "", HFILL}
+               {"HARQ Mode Switch", "wmx.extension_type.harq_mode", FT_UINT8, BASE_HEX, NULL, MSB_NIBBLE_MASK, "", HFILL}
        },
        {
                &hf_cdlmap_extension_unknown_sub_type,
-               {"Unknown Extension Subtype", "wimax.extension_type.unknown_sub_type", FT_BYTES, BASE_HEX, NULL, 0x0, "", HFILL}
+               {"Unknown Extension Subtype", "wmx.extension_type.unknown_sub_type", FT_BYTES, BASE_HEX, NULL, 0x0, "", HFILL}
        },
        {
                &hf_cdlmap_extension_unknown_sub_type_1,
-               {"Unknown Extension Subtype", "wimax.extension_type.unknown_sub_type", FT_BYTES, BASE_HEX, NULL, 0x0, "", HFILL}
+               {"Unknown Extension Subtype", "wmx.extension_type.unknown_sub_type", FT_BYTES, BASE_HEX, NULL, 0x0, "", HFILL}
        }
 };
 
@@ -850,68 +850,68 @@ static hf_register_info hf_extended_diuc[] =
 {
        {
                &hf_extended_diuc_dependent_ie_diuc,
-               {"Extended DIUC", "wimax.extended_diuc_dependent_ie.diuc", FT_UINT8, BASE_HEX, NULL, MSB_NIBBLE_MASK, "", HFILL }
+               {"Extended DIUC", "wmx.extended_diuc_dependent_ie.diuc", FT_UINT8, BASE_HEX, NULL, MSB_NIBBLE_MASK, "", HFILL }
        },
        {
                &hf_extended_diuc_dependent_ie_diuc_1,
-               {"Extended DIUC", "wimax.extended_diuc_dependent_ie.diuc", FT_UINT8, BASE_HEX, NULL, LSB_NIBBLE_MASK, "", HFILL }
+               {"Extended DIUC", "wmx.extended_diuc_dependent_ie.diuc", FT_UINT8, BASE_HEX, NULL, LSB_NIBBLE_MASK, "", HFILL }
        },
        {
                &hf_extended_diuc_dependent_ie_length,
-               {"Length", "wimax.extended_diuc_dependent_ie.length", FT_UINT8, BASE_DEC, NULL, MSB_NIBBLE_MASK, "", HFILL }
+               {"Length", "wmx.extended_diuc_dependent_ie.length", FT_UINT8, BASE_DEC, NULL, MSB_NIBBLE_MASK, "", HFILL }
        },
        {
                &hf_extended_diuc_dependent_ie_length_1,
-               {"Length", "wimax.extended_diuc_dependent_ie.length", FT_UINT8, BASE_DEC, NULL, LSB_NIBBLE_MASK, "", HFILL }
+               {"Length", "wmx.extended_diuc_dependent_ie.length", FT_UINT8, BASE_DEC, NULL, LSB_NIBBLE_MASK, "", HFILL }
        },
        {       /* 8.4.5.3.? Channel_Measurement_IE */
                &hf_extended_diuc_dependent_ie_channel_measurement,
-               {"Channel_Measurement_IE (not implemented)", "wimax.extended_diuc_dependent_ie.channel_measurement", FT_BYTES, BASE_HEX, NULL, 0x0, "", HFILL }
+               {"Channel_Measurement_IE (not implemented)", "wmx.extended_diuc_dependent_ie.channel_measurement", FT_BYTES, BASE_HEX, NULL, 0x0, "", HFILL }
        },
        {       /* 8.4.5.3.4 STC_Zone_IE */
                &hf_extended_diuc_dependent_ie_stc_zone,
-               {"STC_Zone_IE (not implemented)", "wimax.extended_diuc_dependent_ie.stc_zone", FT_BYTES, BASE_HEX, NULL, 0x0, "", HFILL }
+               {"STC_Zone_IE (not implemented)", "wmx.extended_diuc_dependent_ie.stc_zone", FT_BYTES, BASE_HEX, NULL, 0x0, "", HFILL }
        },
        {       /* 8.4.5.3.3 AAS_DL_IE */
                &hf_extended_diuc_dependent_ie_aas_dl,
-               {"AAS_DL_IE (not implemented)", "wimax.extended_diuc_dependent_ie.aas_dl", FT_BYTES, BASE_HEX, NULL, 0x0, "", HFILL }
+               {"AAS_DL_IE (not implemented)", "wmx.extended_diuc_dependent_ie.aas_dl", FT_BYTES, BASE_HEX, NULL, 0x0, "", HFILL }
        },
        {       /* 8.4.5.3.6 Data_location_in_another_BS_IE */
                &hf_extended_diuc_dependent_ie_data_location,
-               {"Data_location_in_another_BS_IE (not implemented)", "wimax.extended_diuc_dependent_ie.data_location", FT_BYTES, BASE_HEX, NULL, 0x0, "", HFILL }
+               {"Data_location_in_another_BS_IE (not implemented)", "wmx.extended_diuc_dependent_ie.data_location", FT_BYTES, BASE_HEX, NULL, 0x0, "", HFILL }
        },
        {       /* 8.4.5.3.7 CID_Switch_IE */
                &hf_extended_diuc_dependent_ie_cid_switch,
-               {"CID_Switch_IE (not implemented)", "wimax.extended_diuc_dependent_ie.cid_switch", FT_BYTES, BASE_HEX, NULL, 0x0, "", HFILL }
+               {"CID_Switch_IE (not implemented)", "wmx.extended_diuc_dependent_ie.cid_switch", FT_BYTES, BASE_HEX, NULL, 0x0, "", HFILL }
        },
 
        {       /* 8.4.5.3.8 MIMO_DL_Basic_IE */
                &hf_extended_diuc_dependent_ie_mimo_dl_basic,
-               {"MIMO_DL_Basic_IE (not implemented)", "wimax.extended_diuc_dependent_ie.mimo_dl_basic", FT_BYTES, BASE_HEX, NULL, 0x0, "", HFILL }
+               {"MIMO_DL_Basic_IE (not implemented)", "wmx.extended_diuc_dependent_ie.mimo_dl_basic", FT_BYTES, BASE_HEX, NULL, 0x0, "", HFILL }
        },
        {       /* 8.4.5.3.9 MIMO_DL_Enhanced_IE */
                &hf_extended_diuc_dependent_ie_mimo_dl_enhanced,
-               {"MIMO_DL_Enhanced_IE (not implemented)", "wimax.extended_diuc_dependent_ie.mimo_dl_enhanced", FT_BYTES, BASE_HEX, NULL, 0x0, "", HFILL }
+               {"MIMO_DL_Enhanced_IE (not implemented)", "wmx.extended_diuc_dependent_ie.mimo_dl_enhanced", FT_BYTES, BASE_HEX, NULL, 0x0, "", HFILL }
        },
        {       /* 8.4.5.3.10 HARQ_Map_Pointer_IE */
                &hf_extended_diuc_dependent_ie_harq_map_pointer,
-               {"HARQ_Map_Pointer_IE (not implemented)", "wimax.extended_diuc_dependent_ie.harq_map_pointer", FT_BYTES, BASE_HEX, NULL, 0x0, "", HFILL }
+               {"HARQ_Map_Pointer_IE (not implemented)", "wmx.extended_diuc_dependent_ie.harq_map_pointer", FT_BYTES, BASE_HEX, NULL, 0x0, "", HFILL }
        },
        {       /* 8.4.5.3.11 PHYMOD_DL_IE */
                &hf_extended_diuc_dependent_ie_phymod_dl,
-               {"PHYMOD_DL_IE (not implemented)", "wimax.extended_diuc_dependent_ie.phymod_dl", FT_BYTES, BASE_HEX, NULL, 0x0, "", HFILL }
+               {"PHYMOD_DL_IE (not implemented)", "wmx.extended_diuc_dependent_ie.phymod_dl", FT_BYTES, BASE_HEX, NULL, 0x0, "", HFILL }
        },
        {       /* 8.4.5.3.13 DL PUSC Burst Allocation in Other Segment IE */
                &hf_extended_diuc_dependent_ie_dl_pusc_burst_allocation,
-               {"DL_PUSC_Burst_Allocation_in_Other_Segment_IE (not implemented)", "wimax.extended_diuc_dependent_ie.dl_pusc_burst_allocation", FT_BYTES, BASE_HEX, NULL, 0x0, "", HFILL }
+               {"DL_PUSC_Burst_Allocation_in_Other_Segment_IE (not implemented)", "wmx.extended_diuc_dependent_ie.dl_pusc_burst_allocation", FT_BYTES, BASE_HEX, NULL, 0x0, "", HFILL }
        },
        {       /* 8.4.5.3.19 UL_interference_and_noise_level_IE */
                &hf_extended_diuc_dependent_ie_ul_interference_and_noise_level,
-               {"UL_interference_and_noise_level_IE (not implemented)", "wimax.extended_diuc_dependent_ie.ul_interference_and_noise_level", FT_BYTES, BASE_HEX, NULL, 0x0, "", HFILL }
+               {"UL_interference_and_noise_level_IE (not implemented)", "wmx.extended_diuc_dependent_ie.ul_interference_and_noise_level", FT_BYTES, BASE_HEX, NULL, 0x0, "", HFILL }
        },
        {       /* unknown DIUC */
                &hf_extended_diuc_dependent_ie_unknown_diuc,
-               {"Unknown Extended DIUC", "wimax.extended_diuc_dependent_ie.unknown_diuc", FT_BYTES, BASE_HEX, NULL, 0x0, "", HFILL }
+               {"Unknown Extended DIUC", "wmx.extended_diuc_dependent_ie.unknown_diuc", FT_BYTES, BASE_HEX, NULL, 0x0, "", HFILL }
        }
 };
 
index a0d710b10277d912dbd6b16d994f575ccc5715fe..a5364c2ef854b0ff65717fd559baf022eb11ccc3 100644 (file)
@@ -215,224 +215,224 @@ static hf_register_info hf_compact_ulmap[] =
 {
        {
                &hf_culmap_ul_map_type,
-               {"UL-MAP Type", "wimax.compact_ulmap.ul_map_type", FT_UINT8, BASE_DEC, NULL, UL_MAP_TYPE_MASK, "", HFILL}
+               {"UL-MAP Type", "wmx.compact_ulmap.ul_map_type", FT_UINT8, BASE_DEC, NULL, UL_MAP_TYPE_MASK, "", HFILL}
        },
        {
                &hf_culmap_ul_map_type_1,
-               {"UL-MAP Type", "wimax.compact_ulmap.ul_map_type", FT_UINT8, BASE_DEC, NULL, UL_MAP_TYPE_MASK_1, "", HFILL}
+               {"UL-MAP Type", "wmx.compact_ulmap.ul_map_type", FT_UINT8, BASE_DEC, NULL, UL_MAP_TYPE_MASK_1, "", HFILL}
        },
        {
                &hf_culmap_reserved,
-               {"Reserved", "wimax.compact_ulmap.reserved", FT_UINT8, BASE_HEX, NULL, UL_MAP_RESERVED_MASK, "", HFILL}
+               {"Reserved", "wmx.compact_ulmap.reserved", FT_UINT8, BASE_HEX, NULL, UL_MAP_RESERVED_MASK, "", HFILL}
        },
        {
                &hf_culmap_reserved_1,
-               {"Reserved", "wimax.compact_ulmap.reserved", FT_UINT8, BASE_HEX, NULL, UL_MAP_RESERVED_MASK_1, "", HFILL}
+               {"Reserved", "wmx.compact_ulmap.reserved", FT_UINT8, BASE_HEX, NULL, UL_MAP_RESERVED_MASK_1, "", HFILL}
        },
        {
                &hf_culmap_nep_code,
-               {"Nep Code", "wimax.compact_ulmap.nep_code", FT_UINT8, BASE_HEX, NULL, MSB_NIBBLE_MASK, "", HFILL}
+               {"Nep Code", "wmx.compact_ulmap.nep_code", FT_UINT8, BASE_HEX, NULL, MSB_NIBBLE_MASK, "", HFILL}
        },
        {
                &hf_culmap_nep_code_1,
-               {"Nep Code", "wimax.compact_ulmap.nep_code", FT_UINT8, BASE_HEX, NULL, LSB_NIBBLE_MASK, "", HFILL}
+               {"Nep Code", "wmx.compact_ulmap.nep_code", FT_UINT8, BASE_HEX, NULL, LSB_NIBBLE_MASK, "", HFILL}
        },
        {
                &hf_culmap_nsch_code,
-               {"Nsch Code", "wimax.compact_ulmap.nsch_code", FT_UINT8, BASE_HEX, NULL, MSB_NIBBLE_MASK, "", HFILL}
+               {"Nsch Code", "wmx.compact_ulmap.nsch_code", FT_UINT8, BASE_HEX, NULL, MSB_NIBBLE_MASK, "", HFILL}
        },
        {
                &hf_culmap_nsch_code_1,
-               {"Nsch Code", "wimax.compact_ulmap.nsch_code", FT_UINT8, BASE_HEX, NULL, LSB_NIBBLE_MASK, "", HFILL}
+               {"Nsch Code", "wmx.compact_ulmap.nsch_code", FT_UINT8, BASE_HEX, NULL, LSB_NIBBLE_MASK, "", HFILL}
        },
        {
                &hf_culmap_shortened_uiuc,
-               {"Shortened UIUC", "wimax.compact_ulmap.shortened_uiuc", FT_UINT8, BASE_HEX, NULL, SHORTENED_UIUC_MASK, "", HFILL}
+               {"Shortened UIUC", "wmx.compact_ulmap.shortened_uiuc", FT_UINT8, BASE_HEX, NULL, SHORTENED_UIUC_MASK, "", HFILL}
        },
        {
                &hf_culmap_companded_sc,
-               {"Companded SC", "wimax.compact_ulmap.companded_sc", FT_UINT8, BASE_HEX, NULL, COMPANDED_SC_MASK, "", HFILL}
+               {"Companded SC", "wmx.compact_ulmap.companded_sc", FT_UINT8, BASE_HEX, NULL, COMPANDED_SC_MASK, "", HFILL}
        },
        {
                &hf_culmap_shortened_uiuc_1,
-               {"Shortened UIUC", "wimax.compact_ulmap.shortened_uiuc", FT_UINT16, BASE_HEX, NULL, SHORTENED_UIUC_MASK_1, "", HFILL}
+               {"Shortened UIUC", "wmx.compact_ulmap.shortened_uiuc", FT_UINT16, BASE_HEX, NULL, SHORTENED_UIUC_MASK_1, "", HFILL}
        },
        {
                &hf_culmap_companded_sc_1,
-               {"Companded SC", "wimax.compact_ulmap.companded_sc", FT_UINT16, BASE_HEX, NULL, COMPANDED_SC_MASK_1, "", HFILL}
+               {"Companded SC", "wmx.compact_ulmap.companded_sc", FT_UINT16, BASE_HEX, NULL, COMPANDED_SC_MASK_1, "", HFILL}
        },
        {
                &hf_culmap_num_bands,
-               {"Number Of Bands", "wimax.compact_ulmap.num_bands", FT_UINT8, BASE_HEX, NULL, MSB_NIBBLE_MASK, "", HFILL}
+               {"Number Of Bands", "wmx.compact_ulmap.num_bands", FT_UINT8, BASE_HEX, NULL, MSB_NIBBLE_MASK, "", HFILL}
        },
        {
                &hf_culmap_num_bands_1,
-               {"Number Of Bands", "wimax.compact_ulmap.num_bands", FT_UINT8, BASE_HEX, NULL, LSB_NIBBLE_MASK, "", HFILL}
+               {"Number Of Bands", "wmx.compact_ulmap.num_bands", FT_UINT8, BASE_HEX, NULL, LSB_NIBBLE_MASK, "", HFILL}
        },
        {
                &hf_culmap_band_index,
-               {"Band Index", "wimax.compact_ulmap.band_index", FT_BYTES, BASE_HEX, NULL, 0x0, "", HFILL}
+               {"Band Index", "wmx.compact_ulmap.band_index", FT_BYTES, BASE_HEX, NULL, 0x0, "", HFILL}
        },
        {
                &hf_culmap_nb_bitmap,
-               {"Number Of Bits For Band BITMAP", "wimax.compact_ulmap.nb_bitmap", FT_UINT8, BASE_HEX, NULL, MSB_NIBBLE_MASK, "", HFILL}
+               {"Number Of Bits For Band BITMAP", "wmx.compact_ulmap.nb_bitmap", FT_UINT8, BASE_HEX, NULL, MSB_NIBBLE_MASK, "", HFILL}
        },
        {
                &hf_culmap_nb_bitmap_1,
-               {"Number Of Bits For Band BITMAP", "wimax.compact_ulmap.nb_bitmap", FT_UINT8, BASE_HEX, NULL, LSB_NIBBLE_MASK, "", HFILL}
+               {"Number Of Bits For Band BITMAP", "wmx.compact_ulmap.nb_bitmap", FT_UINT8, BASE_HEX, NULL, LSB_NIBBLE_MASK, "", HFILL}
        },
        {
                &hf_culmap_allocation_mode,
-               {"Allocation Mode", "wimax.compact_ulmap.allocation_mode", FT_UINT8, BASE_DEC, VALS(vals_allocation_modes), ALLOCATION_MODE_MASK, "", HFILL}
+               {"Allocation Mode", "wmx.compact_ulmap.allocation_mode", FT_UINT8, BASE_DEC, VALS(vals_allocation_modes), ALLOCATION_MODE_MASK, "", HFILL}
        },
        {
                &hf_culmap_allocation_mode_1,
-               {"Allocation Mode", "wimax.compact_ulmap.allocation_mode", FT_UINT8, BASE_DEC, VALS(vals_allocation_modes), ALLOCATION_MODE_MASK_1, "", HFILL}
+               {"Allocation Mode", "wmx.compact_ulmap.allocation_mode", FT_UINT8, BASE_DEC, VALS(vals_allocation_modes), ALLOCATION_MODE_MASK_1, "", HFILL}
        },
        {
                &hf_culmap_allocation_mode_rsvd,
-               {"Reserved", "wimax.compact_ulmap.allocation_mode_rsvd", FT_UINT8, BASE_DEC, NULL, 0x30, "", HFILL}
+               {"Reserved", "wmx.compact_ulmap.allocation_mode_rsvd", FT_UINT8, BASE_DEC, NULL, 0x30, "", HFILL}
        },
        {
                &hf_culmap_allocation_mode_rsvd_1,
-               {"Reserved", "wimax.compact_ulmap.allocation_mode_rsvd", FT_UINT8, BASE_DEC, NULL, 0x03, "", HFILL}
+               {"Reserved", "wmx.compact_ulmap.allocation_mode_rsvd", FT_UINT8, BASE_DEC, NULL, 0x03, "", HFILL}
        },
        {
                &hf_culmap_num_subchannels,
-               {"Number Of Subchannels", "wimax.compact_ulmap.num_subchannels", FT_UINT8, BASE_DEC, NULL, 0x0, "", HFILL}
+               {"Number Of Subchannels", "wmx.compact_ulmap.num_subchannels", FT_UINT8, BASE_DEC, NULL, 0x0, "", HFILL}
        },
        {
                &hf_culmap_num_subchannels_1,
-               {"Number Of Subchannels", "wimax.compact_ulmap.num_subchannels", FT_UINT16, BASE_DEC, NULL, MIDDLE_BYTE_MASK, "", HFILL}
+               {"Number Of Subchannels", "wmx.compact_ulmap.num_subchannels", FT_UINT16, BASE_DEC, NULL, MIDDLE_BYTE_MASK, "", HFILL}
        },
        {
                &hf_culmap_bin_offset,
-               {"BIN Offset", "wimax.compact_ulmap.bin_offset", FT_UINT8, BASE_HEX, NULL, 0x0, "", HFILL}
+               {"BIN Offset", "wmx.compact_ulmap.bin_offset", FT_UINT8, BASE_HEX, NULL, 0x0, "", HFILL}
        },
        {
                &hf_culmap_bin_offset_1,
-               {"BIN Offset", "wimax.compact_ulmap.bin_offset", FT_UINT16, BASE_HEX, NULL, MIDDLE_BYTE_MASK, "", HFILL}
+               {"BIN Offset", "wmx.compact_ulmap.bin_offset", FT_UINT16, BASE_HEX, NULL, MIDDLE_BYTE_MASK, "", HFILL}
        },
        {
                &hf_culmap_uiuc,
-               {"UIUC", "wimax.compact_ulmap.uiuc", FT_UINT8, BASE_HEX, NULL, MSB_NIBBLE_MASK, "", HFILL}
+               {"UIUC", "wmx.compact_ulmap.uiuc", FT_UINT8, BASE_HEX, NULL, MSB_NIBBLE_MASK, "", HFILL}
        },
        {
                &hf_culmap_uiuc_1,
-               {"UIUC", "wimax.compact_ulmap.uiuc", FT_UINT8, BASE_HEX, NULL, LSB_NIBBLE_MASK, "", HFILL}
+               {"UIUC", "wmx.compact_ulmap.uiuc", FT_UINT8, BASE_HEX, NULL, LSB_NIBBLE_MASK, "", HFILL}
        },
        {
                &hf_culmap_uiuc_ofdma_symbol_offset,
-               {"OFDMA Symbol Offset", "wimax.compact_ulmap.uiuc_ofdma_symbol_offset", FT_UINT8, BASE_DEC, NULL, 0x0, "", HFILL}
+               {"OFDMA Symbol Offset", "wmx.compact_ulmap.uiuc_ofdma_symbol_offset", FT_UINT8, BASE_DEC, NULL, 0x0, "", HFILL}
        },
        {
                &hf_culmap_uiuc_ofdma_symbol_offset_1,
-               {"OFDMA Symbol Offset", "wimax.compact_ulmap.uiuc_ofdma_symbol_offset", FT_UINT16, BASE_DEC, NULL, MIDDLE_BYTE_MASK, "", HFILL}
+               {"OFDMA Symbol Offset", "wmx.compact_ulmap.uiuc_ofdma_symbol_offset", FT_UINT16, BASE_DEC, NULL, MIDDLE_BYTE_MASK, "", HFILL}
        },
        {
                &hf_culmap_uiuc_subchannel_offset_7,
-               {"Subchannel Offset", "wimax.compact_ulmap.uiuc_subchannel_offset", FT_UINT24, BASE_DEC, NULL, 0xFE0000, "", HFILL}
+               {"Subchannel Offset", "wmx.compact_ulmap.uiuc_subchannel_offset", FT_UINT24, BASE_DEC, NULL, 0xFE0000, "", HFILL}
        },
        {
                &hf_culmap_uiuc_num_of_ofdma_symbols_7,
-               {"Number Of OFDMA Symbols", "wimax.compact_ulmap.uiuc_num_of_ofdma_symbols", FT_UINT24, BASE_DEC, NULL, 0x01FC00, "", HFILL}
+               {"Number Of OFDMA Symbols", "wmx.compact_ulmap.uiuc_num_of_ofdma_symbols", FT_UINT24, BASE_DEC, NULL, 0x01FC00, "", HFILL}
        },
        {
                &hf_culmap_uiuc_num_of_subchannels_7,
-               {"Number Of Subchannels", "wimax.compact_ulmap.uiuc_num_of_subchannels", FT_UINT24, BASE_DEC, NULL, 0x0003F8, "", HFILL}
+               {"Number Of Subchannels", "wmx.compact_ulmap.uiuc_num_of_subchannels", FT_UINT24, BASE_DEC, NULL, 0x0003F8, "", HFILL}
        },
        {
                &hf_culmap_uiuc_ranging_method,
-               {"Ranging Method", "wimax.compact_ulmap.uiuc_ranging_method", FT_UINT24, BASE_DEC, NULL, 0x000006, "", HFILL}
+               {"Ranging Method", "wmx.compact_ulmap.uiuc_ranging_method", FT_UINT24, BASE_DEC, NULL, 0x000006, "", HFILL}
        },
        {
                &hf_culmap_uiuc_reserved,
-               {"Reserved", "wimax.compact_ulmap.uiuc_reserved", FT_UINT24, BASE_HEX, NULL, 0x000001, "", HFILL}
+               {"Reserved", "wmx.compact_ulmap.uiuc_reserved", FT_UINT24, BASE_HEX, NULL, 0x000001, "", HFILL}
        },
        {
                &hf_culmap_uiuc_subchannel_offset_7_1,
-               {"Subchannel Offset", "wimax.compact_ulmap.uiuc_subchannel_offset", FT_UINT32, BASE_DEC, NULL, 0x00FE0000, "", HFILL}
+               {"Subchannel Offset", "wmx.compact_ulmap.uiuc_subchannel_offset", FT_UINT32, BASE_DEC, NULL, 0x00FE0000, "", HFILL}
        },
        {
                &hf_culmap_uiuc_num_of_ofdma_symbols_7_1,
-               {"Number Of OFDMA Symbols", "wimax.compact_ulmap.uiuc_num_of_ofdma_symbols", FT_UINT32, BASE_DEC, NULL, 0x0001FC00, "", HFILL}
+               {"Number Of OFDMA Symbols", "wmx.compact_ulmap.uiuc_num_of_ofdma_symbols", FT_UINT32, BASE_DEC, NULL, 0x0001FC00, "", HFILL}
        },
        {
                &hf_culmap_uiuc_num_of_subchannels_7_1,
-               {"Number Of Subchannels", "wimax.compact_ulmap.uiuc_num_of_subchannels", FT_UINT32, BASE_DEC, NULL, 0x000003F80, "", HFILL}
+               {"Number Of Subchannels", "wmx.compact_ulmap.uiuc_num_of_subchannels", FT_UINT32, BASE_DEC, NULL, 0x000003F80, "", HFILL}
        },
        {
                &hf_culmap_uiuc_ranging_method_1,
-               {"Ranging Method", "wimax.compact_ulmap.uiuc_ranging_method", FT_UINT32, BASE_DEC, NULL, 0x00000006, "", HFILL}
+               {"Ranging Method", "wmx.compact_ulmap.uiuc_ranging_method", FT_UINT32, BASE_DEC, NULL, 0x00000006, "", HFILL}
        },
        {
                &hf_culmap_uiuc_reserved_1,
-               {"Reserved", "wimax.compact_ulmap.uiuc_reserved", FT_UINT32, BASE_HEX, NULL, 0x00000001, "", HFILL}
+               {"Reserved", "wmx.compact_ulmap.uiuc_reserved", FT_UINT32, BASE_HEX, NULL, 0x00000001, "", HFILL}
        },
        {
                &hf_culmap_uiuc_repetition_coding_indication,
-               {"Repetition Coding Indication", "wimax.compact_ulmap.uiuc_repetition_coding_indication", FT_UINT8, BASE_DEC, VALS(vals_repetitions), ALLOCATION_MODE_MASK, "", HFILL}
+               {"Repetition Coding Indication", "wmx.compact_ulmap.uiuc_repetition_coding_indication", FT_UINT8, BASE_DEC, VALS(vals_repetitions), ALLOCATION_MODE_MASK, "", HFILL}
        },
        {
                &hf_culmap_uiuc_repetition_coding_indication_1,
-               {"Repetition Coding Indication", "wimax.compact_ulmap.uiuc_repetition_coding_indication", FT_UINT8, BASE_DEC, VALS(vals_repetitions), ALLOCATION_MODE_MASK_1, "", HFILL}
+               {"Repetition Coding Indication", "wmx.compact_ulmap.uiuc_repetition_coding_indication", FT_UINT8, BASE_DEC, VALS(vals_repetitions), ALLOCATION_MODE_MASK_1, "", HFILL}
        },
        {
                &hf_culmap_uiuc_reserved1,
-               {"Reserved", "wimax.compact_ulmap.uiuc_reserved1", FT_UINT8, BASE_HEX, NULL, 0x30, "", HFILL}
+               {"Reserved", "wmx.compact_ulmap.uiuc_reserved1", FT_UINT8, BASE_HEX, NULL, 0x30, "", HFILL}
        },
        {
                &hf_culmap_uiuc_reserved11_1,
-               {"Reserved", "wimax.compact_ulmap.uiuc_reserved1", FT_UINT8, BASE_HEX, NULL, 0x03, "", HFILL}
+               {"Reserved", "wmx.compact_ulmap.uiuc_reserved1", FT_UINT8, BASE_HEX, NULL, 0x03, "", HFILL}
        },
 
        {
                &hf_culmap_uiuc_subchannel_offset,
-               {"Subchannel Offset", "wimax.compact_ulmap.uiuc_subchannel_offset", FT_UINT8, BASE_DEC, NULL, 0x0, "", HFILL}
+               {"Subchannel Offset", "wmx.compact_ulmap.uiuc_subchannel_offset", FT_UINT8, BASE_DEC, NULL, 0x0, "", HFILL}
        },
        {
                &hf_culmap_uiuc_subchannel_offset_1,
-               {"Subchannel Offset", "wimax.compact_ulmap.uiuc_subchannel_offset", FT_UINT16, BASE_DEC, NULL, MIDDLE_BYTE_MASK, "", HFILL}
+               {"Subchannel Offset", "wmx.compact_ulmap.uiuc_subchannel_offset", FT_UINT16, BASE_DEC, NULL, MIDDLE_BYTE_MASK, "", HFILL}
        },
        {
                &hf_culmap_uiuc_num_of_ofdma_symbols,
-               {"Number Of OFDMA Symbols", "wimax.compact_ulmap.uiuc_num_of_ofdma_symbols", FT_UINT8, BASE_DEC, NULL, 0x0, "", HFILL}
+               {"Number Of OFDMA Symbols", "wmx.compact_ulmap.uiuc_num_of_ofdma_symbols", FT_UINT8, BASE_DEC, NULL, 0x0, "", HFILL}
        },
        {
                &hf_culmap_uiuc_num_of_ofdma_symbols_1,
-               {"Number Of OFDMA Symbols", "wimax.compact_ulmap.uiuc_num_of_ofdma_symbols", FT_UINT16, BASE_DEC, NULL, MIDDLE_BYTE_MASK, "", HFILL}
+               {"Number Of OFDMA Symbols", "wmx.compact_ulmap.uiuc_num_of_ofdma_symbols", FT_UINT16, BASE_DEC, NULL, MIDDLE_BYTE_MASK, "", HFILL}
        },
        {
                &hf_culmap_uiuc_num_of_subchannels,
-               {"Number Of Subchannels", "wimax.compact_ulmap.uiuc_num_of_subchannels", FT_UINT8, BASE_DEC, NULL, 0x0, "", HFILL}
+               {"Number Of Subchannels", "wmx.compact_ulmap.uiuc_num_of_subchannels", FT_UINT8, BASE_DEC, NULL, 0x0, "", HFILL}
        },
        {
                &hf_culmap_uiuc_num_of_subchannels_1,
-               {"Number Of Subchannels", "wimax.compact_ulmap.uiuc_num_of_subchannels", FT_UINT16, BASE_DEC, NULL, MIDDLE_BYTE_MASK, "", HFILL}
+               {"Number Of Subchannels", "wmx.compact_ulmap.uiuc_num_of_subchannels", FT_UINT16, BASE_DEC, NULL, MIDDLE_BYTE_MASK, "", HFILL}
        },
        {
                &hf_culmap_harq_region_change_indication,
-               {"HARQ Region Change Indication", "wimax.compact_ulmap.harq_region_change_indication", FT_BOOLEAN, 8, TFS(&tfs_region_change), 0x10, "", HFILL}
+               {"HARQ Region Change Indication", "wmx.compact_ulmap.harq_region_change_indication", FT_BOOLEAN, 8, TFS(&tfs_region_change), 0x10, "", HFILL}
        },
        {
                &hf_culmap_harq_region_change_indication_1,
-               {"HARQ Region Change Indication", "wimax.compact_ulmap.harq_region_change_indication", FT_BOOLEAN, 8, TFS(&tfs_region_change), 0x01, "", HFILL}
+               {"HARQ Region Change Indication", "wmx.compact_ulmap.harq_region_change_indication", FT_BOOLEAN, 8, TFS(&tfs_region_change), 0x01, "", HFILL}
        },
        {
                &hf_culmap_cqi_region_change_indication,
-               {"CQI Region Change Indication", "wimax.compact_ulmap.cqi_region_change_indication", FT_BOOLEAN, 8, TFS(&tfs_region_change), 0x10, "", HFILL}
+               {"CQI Region Change Indication", "wmx.compact_ulmap.cqi_region_change_indication", FT_BOOLEAN, 8, TFS(&tfs_region_change), 0x10, "", HFILL}
        },
        {
                &hf_culmap_cqi_region_change_indication_1,
-               {"CQI Region Change Indication", "wimax.compact_ulmap.cqi_region_change_indication", FT_BOOLEAN, 8, TFS(&tfs_region_change), 0x01, "", HFILL}
+               {"CQI Region Change Indication", "wmx.compact_ulmap.cqi_region_change_indication", FT_BOOLEAN, 8, TFS(&tfs_region_change), 0x01, "", HFILL}
        },
        {
                &hf_culmap_reserved_type,
-               {"UL-MAP Reserved Type", "wimax.compact_ulmap.reserved_type", FT_UINT8, BASE_DEC, NULL, UL_MAP_TYPE_MASK, "", HFILL}
+               {"UL-MAP Reserved Type", "wmx.compact_ulmap.reserved_type", FT_UINT8, BASE_DEC, NULL, UL_MAP_TYPE_MASK, "", HFILL}
        },
        {
                &hf_culmap_reserved_type_1,
-               {"UL-MAP Reserved Type", "wimax.compact_ulmap.reserved_type", FT_UINT8, BASE_DEC, NULL, UL_MAP_TYPE_MASK_1, "", HFILL}
+               {"UL-MAP Reserved Type", "wmx.compact_ulmap.reserved_type", FT_UINT8, BASE_DEC, NULL, UL_MAP_TYPE_MASK_1, "", HFILL}
        }
 };
 
@@ -466,51 +466,51 @@ static hf_register_info hf_rcid[] =
 {
        {
                &hf_rcid_ie_normal_cid,
-               {"Normal CID", "wimax.harq_map.rcid_ie.normal_cid", FT_UINT16, BASE_HEX, NULL, 0x0, "", HFILL}
+               {"Normal CID", "wmx.harq_map.rcid_ie.normal_cid", FT_UINT16, BASE_HEX, NULL, 0x0, "", HFILL}
        },
        {
                &hf_rcid_ie_normal_cid_1,
-               {"Normal CID", "wimax.harq_map.rcid_ie.normal_cid", FT_UINT24, BASE_HEX, NULL, WIMAX_RCID_IE_NORMAL_CID_MASK_1, "", HFILL}
+               {"Normal CID", "wmx.harq_map.rcid_ie.normal_cid", FT_UINT24, BASE_HEX, NULL, WIMAX_RCID_IE_NORMAL_CID_MASK_1, "", HFILL}
        },
        {
                &hf_rcid_ie_prefix,
-               {"Prefix", "wimax.harq_map.rcid_ie.prefix", FT_UINT16, BASE_HEX, NULL, WIMAX_RCID_IE_PREFIX_MASK, "", HFILL}
+               {"Prefix", "wmx.harq_map.rcid_ie.prefix", FT_UINT16, BASE_HEX, NULL, WIMAX_RCID_IE_PREFIX_MASK, "", HFILL}
        },
        {
                &hf_rcid_ie_prefix_1,
-               {"Prefix", "wimax.harq_map.rcid_ie.prefix", FT_UINT16, BASE_HEX, NULL, WIMAX_RCID_IE_PREFIX_MASK_1, "", HFILL}
+               {"Prefix", "wmx.harq_map.rcid_ie.prefix", FT_UINT16, BASE_HEX, NULL, WIMAX_RCID_IE_PREFIX_MASK_1, "", HFILL}
        },
        {
                &hf_rcid_ie_cid3,
-               {"3 LSB Of Basic CID", "wimax.harq_map.rcid_ie.cid3", FT_UINT16, BASE_HEX, NULL, WIMAX_RCID_IE_CID3_MASK, "", HFILL}
+               {"3 LSB Of Basic CID", "wmx.harq_map.rcid_ie.cid3", FT_UINT16, BASE_HEX, NULL, WIMAX_RCID_IE_CID3_MASK, "", HFILL}
        },
        {
                &hf_rcid_ie_cid3_1,
-               {"3 LSB Of Basic CID", "wimax.harq_map.rcid_ie.cid3", FT_UINT16, BASE_HEX, NULL, WIMAX_RCID_IE_CID3_MASK_1, "", HFILL}
+               {"3 LSB Of Basic CID", "wmx.harq_map.rcid_ie.cid3", FT_UINT16, BASE_HEX, NULL, WIMAX_RCID_IE_CID3_MASK_1, "", HFILL}
        },
        {
                &hf_rcid_ie_cid7,
-               {"7 LSB Of Basic CID", "wimax.harq_map.rcid_ie.cid7", FT_UINT16, BASE_HEX, NULL, WIMAX_RCID_IE_CID7_MASK, "", HFILL}
+               {"7 LSB Of Basic CID", "wmx.harq_map.rcid_ie.cid7", FT_UINT16, BASE_HEX, NULL, WIMAX_RCID_IE_CID7_MASK, "", HFILL}
        },
        {
                &hf_rcid_ie_cid7_1,
-               {"7 LSB Of Basic CID", "wimax.harq_map.rcid_ie.cid7", FT_UINT16, BASE_HEX, NULL, WIMAX_RCID_IE_CID7_MASK_1, "", HFILL}
+               {"7 LSB Of Basic CID", "wmx.harq_map.rcid_ie.cid7", FT_UINT16, BASE_HEX, NULL, WIMAX_RCID_IE_CID7_MASK_1, "", HFILL}
        },
        {
                &hf_rcid_ie_cid11,
-               {"11 LSB Of Basic CID", "wimax.harq_map.rcid_ie.cid11", FT_UINT16, BASE_HEX, NULL, WIMAX_RCID_IE_CID11_MASK, "", HFILL}
+               {"11 LSB Of Basic CID", "wmx.harq_map.rcid_ie.cid11", FT_UINT16, BASE_HEX, NULL, WIMAX_RCID_IE_CID11_MASK, "", HFILL}
        },
        {
                &hf_rcid_ie_cid11_1,
-               {"11 LSB Of Basic CID", "wimax.harq_map.rcid_ie.cid11", FT_UINT16, BASE_HEX, NULL, WIMAX_RCID_IE_CID11_MASK_1, "", HFILL}
+               {"11 LSB Of Basic CID", "wmx.harq_map.rcid_ie.cid11", FT_UINT16, BASE_HEX, NULL, WIMAX_RCID_IE_CID11_MASK_1, "", HFILL}
        },
        {
                &hf_rcid_ie_cid11_2,
-               {"11 LSB Of Multicast, AAS or Broadcast CID", "wimax.harq_map.rcid_ie.cid11", FT_UINT16, BASE_HEX, NULL, WIMAX_RCID_IE_CID11_MASK, "", HFILL}
+               {"11 LSB Of Multicast, AAS or Broadcast CID", "wmx.harq_map.rcid_ie.cid11", FT_UINT16, BASE_HEX, NULL, WIMAX_RCID_IE_CID11_MASK, "", HFILL}
        },
        {
                &hf_rcid_ie_cid11_3,
-               {"11 LSB Of Multicast, AAS or Broadcast CID", "wimax.harq_map.rcid_ie.cid11", FT_UINT16, BASE_HEX, NULL, WIMAX_RCID_IE_CID11_MASK_1, "", HFILL}
+               {"11 LSB Of Multicast, AAS or Broadcast CID", "wmx.harq_map.rcid_ie.cid11", FT_UINT16, BASE_HEX, NULL, WIMAX_RCID_IE_CID11_MASK_1, "", HFILL}
        }
 };
 
@@ -543,43 +543,43 @@ static hf_register_info hf_harq_control[] =
 {
        {
                &hf_harq_control_ie_prefix,
-               {"Prefix", "wimax.harq_map.harq_control_ie.prefix", FT_BOOLEAN, 8, TFS(&tfs_prefix), WIMAX_HARQ_CONTROL_IE_PREFIX_MASK, "", HFILL}
+               {"Prefix", "wmx.harq_map.harq_control_ie.prefix", FT_BOOLEAN, 8, TFS(&tfs_prefix), WIMAX_HARQ_CONTROL_IE_PREFIX_MASK, "", HFILL}
        },
        {
                &hf_harq_control_ie_ai_sn,
-               {"HARQ ID Sequence Number(AI_SN)", "wimax.harq_map.harq_control_ie.ai_sn", FT_UINT8, BASE_HEX, NULL, WIMAX_HARQ_CONTROL_IE_AI_SN_MASK, "", HFILL}
+               {"HARQ ID Sequence Number(AI_SN)", "wmx.harq_map.harq_control_ie.ai_sn", FT_UINT8, BASE_HEX, NULL, WIMAX_HARQ_CONTROL_IE_AI_SN_MASK, "", HFILL}
        },
        {
                &hf_harq_control_ie_spid,
-               {"Subpacket ID (SPID)", "wimax.harq_map.harq_control_ie.spid", FT_UINT8, BASE_HEX, NULL, WIMAX_HARQ_CONTROL_IE_SPID_MASK, "", HFILL}
+               {"Subpacket ID (SPID)", "wmx.harq_map.harq_control_ie.spid", FT_UINT8, BASE_HEX, NULL, WIMAX_HARQ_CONTROL_IE_SPID_MASK, "", HFILL}
        },
        {
                &hf_harq_control_ie_acid,
-               {"HARQ CH ID (ACID)", "wimax.harq_map.harq_control_ie.acid", FT_UINT8, BASE_HEX, NULL, WIMAX_HARQ_CONTROL_IE_ACID_MASK, "", HFILL}
+               {"HARQ CH ID (ACID)", "wmx.harq_map.harq_control_ie.acid", FT_UINT8, BASE_HEX, NULL, WIMAX_HARQ_CONTROL_IE_ACID_MASK, "", HFILL}
        },
        {
                &hf_harq_control_ie_reserved,
-               {"Reserved", "wimax.harq_map.harq_control_ie.reserved", FT_UINT8, BASE_HEX, NULL, WIMAX_HARQ_CONTROL_IE_RESERVED_MASK, "", HFILL}
+               {"Reserved", "wmx.harq_map.harq_control_ie.reserved", FT_UINT8, BASE_HEX, NULL, WIMAX_HARQ_CONTROL_IE_RESERVED_MASK, "", HFILL}
        },
        {
                &hf_harq_control_ie_prefix_1,
-               {"Prefix", "wimax.harq_map.harq_control_ie.prefix", FT_BOOLEAN, 16, TFS(&tfs_prefix), WIMAX_HARQ_CONTROL_IE_PREFIX_MASK_1, "", HFILL}
+               {"Prefix", "wmx.harq_map.harq_control_ie.prefix", FT_BOOLEAN, 16, TFS(&tfs_prefix), WIMAX_HARQ_CONTROL_IE_PREFIX_MASK_1, "", HFILL}
        },
        {
                &hf_harq_control_ie_ai_sn_1,
-               {"HARQ ID Sequence Number(AI_SN)", "wimax.harq_map.harq_control_ie.ai_sn", FT_UINT16, BASE_HEX, NULL, WIMAX_HARQ_CONTROL_IE_AI_SN_MASK_1, "", HFILL}
+               {"HARQ ID Sequence Number(AI_SN)", "wmx.harq_map.harq_control_ie.ai_sn", FT_UINT16, BASE_HEX, NULL, WIMAX_HARQ_CONTROL_IE_AI_SN_MASK_1, "", HFILL}
        },
        {
                &hf_harq_control_ie_spid_1,
-               {"Subpacket ID (SPID)", "wimax.harq_map.harq_control_ie.spid", FT_UINT16, BASE_HEX, NULL, WIMAX_HARQ_CONTROL_IE_SPID_MASK_1, "", HFILL}
+               {"Subpacket ID (SPID)", "wmx.harq_map.harq_control_ie.spid", FT_UINT16, BASE_HEX, NULL, WIMAX_HARQ_CONTROL_IE_SPID_MASK_1, "", HFILL}
        },
        {
                &hf_harq_control_ie_acid_1,
-               {"HARQ CH ID (ACID)", "wimax.harq_map.harq_control_ie.acid", FT_UINT16, BASE_HEX, NULL, WIMAX_HARQ_CONTROL_IE_ACID_MASK_1, "", HFILL}
+               {"HARQ CH ID (ACID)", "wmx.harq_map.harq_control_ie.acid", FT_UINT16, BASE_HEX, NULL, WIMAX_HARQ_CONTROL_IE_ACID_MASK_1, "", HFILL}
        },
        {
                &hf_harq_control_ie_reserved_1,
-               {"Reserved", "wimax.harq_map.harq_control_ie.reserved", FT_UINT16, BASE_HEX, NULL, WIMAX_HARQ_CONTROL_IE_RESERVED_MASK_1, "", HFILL}
+               {"Reserved", "wmx.harq_map.harq_control_ie.reserved", FT_UINT16, BASE_HEX, NULL, WIMAX_HARQ_CONTROL_IE_RESERVED_MASK_1, "", HFILL}
        }
 };
 
@@ -609,51 +609,51 @@ static hf_register_info hf_extension_type[] =
 {
        {
                &hf_culmap_extension_type,
-               {"UL-MAP Type", "wimax.extension_type.ul_map_type", FT_UINT16, BASE_DEC, NULL, EXTENSION_TYPE_MASK, "", HFILL}
+               {"UL-MAP Type", "wmx.extension_type.ul_map_type", FT_UINT16, BASE_DEC, NULL, EXTENSION_TYPE_MASK, "", HFILL}
        },
        {
                &hf_culmap_extension_type_1,
-               {"UL-MAP Type", "wimax.extension_type.ul_map_type", FT_UINT16, BASE_DEC, NULL, EXTENSION_TYPE_MASK_1, "", HFILL}
+               {"UL-MAP Type", "wmx.extension_type.ul_map_type", FT_UINT16, BASE_DEC, NULL, EXTENSION_TYPE_MASK_1, "", HFILL}
        },
        {
                &hf_culmap_extension_subtype,
-               {"Extension Subtype", "wimax.extension_type.subtype", FT_UINT16, BASE_DEC, NULL, EXTENSION_SUBTYPE_MASK, "", HFILL}
+               {"Extension Subtype", "wmx.extension_type.subtype", FT_UINT16, BASE_DEC, NULL, EXTENSION_SUBTYPE_MASK, "", HFILL}
        },
        {
                &hf_culmap_extension_subtype_1,
-               {"Extension Subtype", "wimax.extension_type.subtype", FT_UINT16, BASE_DEC, NULL, EXTENSION_SUBTYPE_MASK_1, "", HFILL}
+               {"Extension Subtype", "wmx.extension_type.subtype", FT_UINT16, BASE_DEC, NULL, EXTENSION_SUBTYPE_MASK_1, "", HFILL}
        },
        {
                &hf_culmap_extension_length,
-               {"Extension Length", "wimax.extension_type.length", FT_UINT16, BASE_DEC, NULL, EXTENSION_LENGTH_MASK, "", HFILL}
+               {"Extension Length", "wmx.extension_type.length", FT_UINT16, BASE_DEC, NULL, EXTENSION_LENGTH_MASK, "", HFILL}
        },
        {
                &hf_culmap_extension_length_1,
-               {"Extension Length", "wimax.extension_type.length", FT_UINT16, BASE_DEC, NULL, EXTENSION_LENGTH_MASK_1, "", HFILL}
+               {"Extension Length", "wmx.extension_type.length", FT_UINT16, BASE_DEC, NULL, EXTENSION_LENGTH_MASK_1, "", HFILL}
        },
        {
                &hf_culmap_extension_time_diversity_mbs,
-               {"Time Diversity MBS", "wimax.extension_type.time_diversity_mbs", FT_BYTES, BASE_HEX, NULL, 0x0, "", HFILL}
+               {"Time Diversity MBS", "wmx.extension_type.time_diversity_mbs", FT_BYTES, BASE_HEX, NULL, 0x0, "", HFILL}
        },
        {
                &hf_culmap_extension_time_diversity_mbs_1,
-               {"Time Diversity MBS", "wimax.extension_type.time_diversity_mbs", FT_BYTES, BASE_HEX, NULL, 0x0, "", HFILL}
+               {"Time Diversity MBS", "wmx.extension_type.time_diversity_mbs", FT_BYTES, BASE_HEX, NULL, 0x0, "", HFILL}
        },
        {
                &hf_culmap_extension_harq_mode_1,
-               {"HARQ Mode Switch", "wimax.extension_type.harq_mode", FT_UINT16, BASE_HEX, NULL, 0x000F, "", HFILL}
+               {"HARQ Mode Switch", "wmx.extension_type.harq_mode", FT_UINT16, BASE_HEX, NULL, 0x000F, "", HFILL}
        },
        {
                &hf_culmap_extension_harq_mode,
-               {"HARQ Mode Switch", "wimax.extension_type.harq_mode", FT_UINT8, BASE_HEX, NULL, MSB_NIBBLE_MASK, "", HFILL}
+               {"HARQ Mode Switch", "wmx.extension_type.harq_mode", FT_UINT8, BASE_HEX, NULL, MSB_NIBBLE_MASK, "", HFILL}
        },
        {
                &hf_culmap_extension_unknown_sub_type,
-               {"Unknown Extension Subtype", "wimax.extension_type.unknown_sub_type", FT_BYTES, BASE_HEX, NULL, 0x0, "", HFILL}
+               {"Unknown Extension Subtype", "wmx.extension_type.unknown_sub_type", FT_BYTES, BASE_HEX, NULL, 0x0, "", HFILL}
        },
        {
                &hf_culmap_extension_unknown_sub_type_1,
-               {"Unknown Extension Subtype", "wimax.extension_type.unknown_sub_type", FT_BYTES, BASE_HEX, NULL, 0x0, "", HFILL}
+               {"Unknown Extension Subtype", "wmx.extension_type.unknown_sub_type", FT_BYTES, BASE_HEX, NULL, 0x0, "", HFILL}
        }
 };
 
@@ -696,67 +696,67 @@ static hf_register_info hf_cdma_allocation[] =
 {
        {       /* display the Duration */
                &hf_cdma_allocation_duration,
-               {"Duration", "wimax.cdma_allocation.duration", FT_UINT16, BASE_DEC, NULL, CDMA_ALLOCATION_DURATION_MASK, "", HFILL}
+               {"Duration", "wmx.cdma_allocation.duration", FT_UINT16, BASE_DEC, NULL, CDMA_ALLOCATION_DURATION_MASK, "", HFILL}
        },
        {       /* display the UIUC */
                &hf_cdma_allocation_uiuc,
-               {"UIUC For Transmission", "wimax.cdma_allocation.uiuc", FT_UINT16, BASE_DEC, NULL, CDMA_ALLOCATION_UIUC_MASK, "", HFILL}
+               {"UIUC For Transmission", "wmx.cdma_allocation.uiuc", FT_UINT16, BASE_DEC, NULL, CDMA_ALLOCATION_UIUC_MASK, "", HFILL}
        },
        {       /* display the Repetition Coding Indication */
                &hf_cdma_allocation_repetition,
-               {"Repetition Coding Indication", "wimax.cdma_allocation.allocation_repetition", FT_UINT16, BASE_DEC, VALS(vals_repetitions), CDMA_ALLOCATION_REPETITION_CODE_MASK, "", HFILL}
+               {"Repetition Coding Indication", "wmx.cdma_allocation.allocation_repetition", FT_UINT16, BASE_DEC, VALS(vals_repetitions), CDMA_ALLOCATION_REPETITION_CODE_MASK, "", HFILL}
        },
        {       /* display the Frame Number Index */
                &hf_cdma_allocation_frame_number_index,
-               {"Frame Number Index (LSBs of relevant frame number)", "wimax.cdma_allocation.frame_number_index", FT_UINT16, BASE_DEC, NULL, CDMA_ALLOCATION_FRAME_NUMBER_INDEX_MASK, "", HFILL}
+               {"Frame Number Index (LSBs of relevant frame number)", "wmx.cdma_allocation.frame_number_index", FT_UINT16, BASE_DEC, NULL, CDMA_ALLOCATION_FRAME_NUMBER_INDEX_MASK, "", HFILL}
        },
        {       /* display the Ranging Code */
                &hf_cdma_allocation_ranging_code,
-               {"Ranging Code", "wimax.cdma_allocation.ranging_code", FT_UINT8, BASE_DEC, NULL, 0x0, "", HFILL}
+               {"Ranging Code", "wmx.cdma_allocation.ranging_code", FT_UINT8, BASE_DEC, NULL, 0x0, "", HFILL}
        },
        {       /* display the Ranging Symbol */
                &hf_cdma_allocation_ranging_symbol,
-               {"Ranging Symbol", "wimax.cdma_allocation.ranging_symbol", FT_UINT8, BASE_DEC, NULL, 0x0, "", HFILL}
+               {"Ranging Symbol", "wmx.cdma_allocation.ranging_symbol", FT_UINT8, BASE_DEC, NULL, 0x0, "", HFILL}
        },
        {       /* display the Ranging Subchannel */
                &hf_cdma_allocation_ranging_subchannel,
-               {"Ranging Subchannel", "wimax.cdma_allocation.ranging_subchannel", FT_UINT8, BASE_DEC, NULL, CDMA_ALLOCATION_RANGING_SUBCHANNEL_MASK, "", HFILL}
+               {"Ranging Subchannel", "wmx.cdma_allocation.ranging_subchannel", FT_UINT8, BASE_DEC, NULL, CDMA_ALLOCATION_RANGING_SUBCHANNEL_MASK, "", HFILL}
        },
        {       /* display the BW Request Mandatory */
                &hf_cdma_allocation_bw_req,
-               {"BW Request Mandatory", "wimax.cdma_allocation.bw_req", FT_UINT8, BASE_DEC, TFS(&tfs_yes_no_ie), CDMA_ALLOCATION_BW_REQUEST_MANDATORY_MASK, "", HFILL}
+               {"BW Request Mandatory", "wmx.cdma_allocation.bw_req", FT_UINT8, BASE_DEC, TFS(&tfs_yes_no_ie), CDMA_ALLOCATION_BW_REQUEST_MANDATORY_MASK, "", HFILL}
        },
        {       /* display the Duration */
                &hf_cdma_allocation_duration_1,
-               {"Duration", "wimax.cdma_allocation.duration", FT_UINT16, BASE_DEC, NULL, CDMA_ALLOCATION_DURATION_MASK_1, "", HFILL}
+               {"Duration", "wmx.cdma_allocation.duration", FT_UINT16, BASE_DEC, NULL, CDMA_ALLOCATION_DURATION_MASK_1, "", HFILL}
        },
        {       /* display the UIUC */
                &hf_cdma_allocation_uiuc_1,
-               {"UIUC For Transmission", "wimax.cdma_allocation.uiuc", FT_UINT16, BASE_DEC, NULL, CDMA_ALLOCATION_UIUC_MASK_1, "", HFILL}
+               {"UIUC For Transmission", "wmx.cdma_allocation.uiuc", FT_UINT16, BASE_DEC, NULL, CDMA_ALLOCATION_UIUC_MASK_1, "", HFILL}
        },
        {       /* display the Repetition Coding Indication */
                &hf_cdma_allocation_repetition_1,
-               {"Repetition Coding Indication", "wimax.cdma_allocation.allocation_repetition", FT_UINT16, BASE_DEC, VALS(vals_repetitions), CDMA_ALLOCATION_REPETITION_CODE_MASK_1, "", HFILL}
+               {"Repetition Coding Indication", "wmx.cdma_allocation.allocation_repetition", FT_UINT16, BASE_DEC, VALS(vals_repetitions), CDMA_ALLOCATION_REPETITION_CODE_MASK_1, "", HFILL}
        },
        {       /* display the Frame Number Index */
                &hf_cdma_allocation_frame_number_index_1,
-               {"Frame Number Index (LSBs of relevant frame number)", "wimax.cdma_allocation.frame_number_index", FT_UINT32, BASE_DEC, NULL, CDMA_ALLOCATION_FRAME_NUMBER_INDEX_MASK_1, "", HFILL}
+               {"Frame Number Index (LSBs of relevant frame number)", "wmx.cdma_allocation.frame_number_index", FT_UINT32, BASE_DEC, NULL, CDMA_ALLOCATION_FRAME_NUMBER_INDEX_MASK_1, "", HFILL}
        },
        {       /* display the Ranging Code */
                &hf_cdma_allocation_ranging_code_1,
-               {"Ranging Code", "wimax.cdma_allocation.ranging_code", FT_UINT32, BASE_DEC, NULL, CDMA_ALLOCATION_RANGING_CODE_MASK_1, "", HFILL}
+               {"Ranging Code", "wmx.cdma_allocation.ranging_code", FT_UINT32, BASE_DEC, NULL, CDMA_ALLOCATION_RANGING_CODE_MASK_1, "", HFILL}
        },
        {       /* display the Ranging Symbol */
                &hf_cdma_allocation_ranging_symbol_1,
-               {"Ranging Symbol", "wimax.cdma_allocation.ranging_symbol", FT_UINT32, BASE_DEC, NULL, CDMA_ALLOCATION_RANGING_SYMBOL_MASK_1, "", HFILL}
+               {"Ranging Symbol", "wmx.cdma_allocation.ranging_symbol", FT_UINT32, BASE_DEC, NULL, CDMA_ALLOCATION_RANGING_SYMBOL_MASK_1, "", HFILL}
        },
        {       /* display the Ranging Subchannel */
                &hf_cdma_allocation_ranging_subchannel_1,
-               {"Ranging Subchannel", "wimax.cdma_allocation.ranging_subchannel", FT_UINT32, BASE_DEC, NULL, CDMA_ALLOCATION_RANGING_SUBCHANNEL_MASK_1, "", HFILL}
+               {"Ranging Subchannel", "wmx.cdma_allocation.ranging_subchannel", FT_UINT32, BASE_DEC, NULL, CDMA_ALLOCATION_RANGING_SUBCHANNEL_MASK_1, "", HFILL}
        },
        {       /* display the BW Request Mandatory */
                &hf_cdma_allocation_bw_req_1,
-               {"BW Request Mandatory", "wimax.cdma_allocation.bw_req", FT_UINT32, BASE_DEC, TFS(&tfs_yes_no_ie), CDMA_ALLOCATION_BW_REQUEST_MANDATORY_MASK_1, "", HFILL}
+               {"BW Request Mandatory", "wmx.cdma_allocation.bw_req", FT_UINT32, BASE_DEC, TFS(&tfs_yes_no_ie), CDMA_ALLOCATION_BW_REQUEST_MANDATORY_MASK_1, "", HFILL}
        }
 };
 
@@ -822,148 +822,148 @@ static hf_register_info hf_extended_uiuc[] =
 {
        {       /* 8.4.5.4.4 Extended UIUC */
                &hf_extended_uiuc_ie_uiuc,
-               {"Extended UIUC", "wimax.extended_uiuc_ie.uiuc", FT_UINT8, BASE_HEX, NULL, MSB_NIBBLE_MASK, "", HFILL }
+               {"Extended UIUC", "wmx.extended_uiuc_ie.uiuc", FT_UINT8, BASE_HEX, NULL, MSB_NIBBLE_MASK, "", HFILL }
        },
        {       /* 8.4.5.4.4 Extended UIUC */
                &hf_extended_uiuc_ie_uiuc_1,
-               {"Extended UIUC", "wimax.extended_uiuc_ie.uiuc", FT_UINT8, BASE_HEX, NULL, LSB_NIBBLE_MASK, "", HFILL }
+               {"Extended UIUC", "wmx.extended_uiuc_ie.uiuc", FT_UINT8, BASE_HEX, NULL, LSB_NIBBLE_MASK, "", HFILL }
        },
        {       /* 8.4.5.4.4 IE Length */
                &hf_extended_uiuc_ie_length,
-               {"Length", "wimax.extended_uiuc_ie.length", FT_UINT8, BASE_DEC, NULL, MSB_NIBBLE_MASK, "", HFILL }
+               {"Length", "wmx.extended_uiuc_ie.length", FT_UINT8, BASE_DEC, NULL, MSB_NIBBLE_MASK, "", HFILL }
        },
        {       /* 8.4.5.4.4 IE Length */
                &hf_extended_uiuc_ie_length_1,
-               {"Length", "wimax.extended_uiuc_ie.length", FT_UINT24, BASE_DEC, NULL, LSB_NIBBLE_MASK, "", HFILL }
+               {"Length", "wmx.extended_uiuc_ie.length", FT_UINT24, BASE_DEC, NULL, LSB_NIBBLE_MASK, "", HFILL }
        },
        {       /* 8.4.5.4.5 Power Control IE */
                &hf_extended_uiuc_ie_power_control,
-               {"Power Control", "wimax.extended_uiuc_ie.power_control", FT_UINT8, BASE_HEX, NULL, 0x0, "", HFILL }
+               {"Power Control", "wmx.extended_uiuc_ie.power_control", FT_UINT8, BASE_HEX, NULL, 0x0, "", HFILL }
        },
        {       /* 8.4.5.4.5 Power Control IE */
                &hf_extended_uiuc_ie_power_control_24,
-               {"Power Control", "wimax.extended_uiuc_ie.power_control", FT_UINT24, BASE_HEX, NULL, 0x0, "", HFILL }
+               {"Power Control", "wmx.extended_uiuc_ie.power_control", FT_UINT24, BASE_HEX, NULL, 0x0, "", HFILL }
        },
        {
                &hf_extended_uiuc_ie_power_measurement_frame,
-               {"Power Measurement Frame", "wimax.extended_uiuc_ie.power_measurement_frame", FT_UINT8, BASE_HEX, NULL, 0x0, "", HFILL }
+               {"Power Measurement Frame", "wmx.extended_uiuc_ie.power_measurement_frame", FT_UINT8, BASE_HEX, NULL, 0x0, "", HFILL }
        },
        {
                &hf_extended_uiuc_ie_power_measurement_frame_24,
-               {"Power Measurement Frame", "wimax.extended_uiuc_ie.power_measurement_frame", FT_UINT24, BASE_HEX, NULL, 0x0, "", HFILL }
+               {"Power Measurement Frame", "wmx.extended_uiuc_ie.power_measurement_frame", FT_UINT24, BASE_HEX, NULL, 0x0, "", HFILL }
        },
        {       /* 8.4.5.4.8 Mini Subchannel Allocation IE */
                &hf_extended_uiuc_ie_mini_subchannel_alloc_ctype,
-               {"C Type", "wimax.extended_uiuc_ie.mini_subchannel_alloc.ctype", FT_UINT8, BASE_HEX, VALS(vals_ctypes), MINI_SUBCHANNEL_CTYPE_MASK, "", HFILL }
+               {"C Type", "wmx.extended_uiuc_ie.mini_subchannel_alloc.ctype", FT_UINT8, BASE_HEX, VALS(vals_ctypes), MINI_SUBCHANNEL_CTYPE_MASK, "", HFILL }
        },
        {
                &hf_extended_uiuc_ie_mini_subchannel_alloc_ctype_16,
-               {"C Type", "wimax.extended_uiuc_ie.mini_subchannel_alloc.ctype", FT_UINT16, BASE_HEX, VALS(vals_ctypes), MINI_SUBCHANNEL_CTYPE_MASK_16, "", HFILL }
+               {"C Type", "wmx.extended_uiuc_ie.mini_subchannel_alloc.ctype", FT_UINT16, BASE_HEX, VALS(vals_ctypes), MINI_SUBCHANNEL_CTYPE_MASK_16, "", HFILL }
        },
        {
                &hf_extended_uiuc_ie_mini_subchannel_alloc_duration,
-               {"Duration", "wimax.extended_uiuc_ie.mini_subchannel_alloc.duration", FT_UINT8, BASE_DEC, NULL, MINI_SUBCHANNEL_DURATION_MASK, "", HFILL }
+               {"Duration", "wmx.extended_uiuc_ie.mini_subchannel_alloc.duration", FT_UINT8, BASE_DEC, NULL, MINI_SUBCHANNEL_DURATION_MASK, "", HFILL }
        },
        {
                &hf_extended_uiuc_ie_mini_subchannel_alloc_duration_16,
-               {"Duration", "wimax.extended_uiuc_ie.mini_subchannel_alloc.duration", FT_UINT16, BASE_DEC, NULL, MINI_SUBCHANNEL_DURATION_MASK_16, "", HFILL }
+               {"Duration", "wmx.extended_uiuc_ie.mini_subchannel_alloc.duration", FT_UINT16, BASE_DEC, NULL, MINI_SUBCHANNEL_DURATION_MASK_16, "", HFILL }
        },
        {
                &hf_extended_uiuc_ie_mini_subchannel_alloc_cid,
-               {"CID", "wimax.extended_uiuc_ie.mini_subchannel_alloc.cid", FT_UINT24, BASE_HEX, NULL, MINI_SUBCHANNEL_CID_MASK, "", HFILL }
+               {"CID", "wmx.extended_uiuc_ie.mini_subchannel_alloc.cid", FT_UINT24, BASE_HEX, NULL, MINI_SUBCHANNEL_CID_MASK, "", HFILL }
        },
        {
                &hf_extended_uiuc_ie_mini_subchannel_alloc_uiuc,
-               {"UIUC", "wimax.extended_uiuc_ie.mini_subchannel_alloc.uiuc", FT_UINT24, BASE_HEX, NULL, MINI_SUBCHANNEL_UIUC_MASK, "", HFILL }
+               {"UIUC", "wmx.extended_uiuc_ie.mini_subchannel_alloc.uiuc", FT_UINT24, BASE_HEX, NULL, MINI_SUBCHANNEL_UIUC_MASK, "", HFILL }
        },
        {
                &hf_extended_uiuc_ie_mini_subchannel_alloc_repetition,
-               {"Repetition", "wimax.extended_uiuc_ie.mini_subchannel_alloc.repetition", FT_UINT24, BASE_HEX, VALS(vals_repetitions), MINI_SUBCHANNEL_REPETITION_MASK, "", HFILL }
+               {"Repetition", "wmx.extended_uiuc_ie.mini_subchannel_alloc.repetition", FT_UINT24, BASE_HEX, VALS(vals_repetitions), MINI_SUBCHANNEL_REPETITION_MASK, "", HFILL }
        },
        {
                &hf_extended_uiuc_ie_mini_subchannel_alloc_cid_1,
-               {"CID", "wimax.extended_uiuc_ie.mini_subchannel_alloc.cid", FT_UINT24, BASE_HEX, NULL, MINI_SUBCHANNEL_CID_MASK_1, "", HFILL }
+               {"CID", "wmx.extended_uiuc_ie.mini_subchannel_alloc.cid", FT_UINT24, BASE_HEX, NULL, MINI_SUBCHANNEL_CID_MASK_1, "", HFILL }
        },
        {
                &hf_extended_uiuc_ie_mini_subchannel_alloc_uiuc_1,
-               {"UIUC", "wimax.extended_uiuc_ie.mini_subchannel_alloc.uiuc", FT_UINT24, BASE_HEX, NULL, MINI_SUBCHANNEL_UIUC_MASK_1, "", HFILL }
+               {"UIUC", "wmx.extended_uiuc_ie.mini_subchannel_alloc.uiuc", FT_UINT24, BASE_HEX, NULL, MINI_SUBCHANNEL_UIUC_MASK_1, "", HFILL }
        },
        {
                &hf_extended_uiuc_ie_mini_subchannel_alloc_repetition_1,
-               {"Repetition", "wimax.extended_uiuc_ie.mini_subchannel_alloc.repetition", FT_UINT24, BASE_HEX, VALS(vals_repetitions), MINI_SUBCHANNEL_REPETITION_MASK_1, "", HFILL }
+               {"Repetition", "wmx.extended_uiuc_ie.mini_subchannel_alloc.repetition", FT_UINT24, BASE_HEX, VALS(vals_repetitions), MINI_SUBCHANNEL_REPETITION_MASK_1, "", HFILL }
        },
        {
                &hf_extended_uiuc_ie_mini_subchannel_alloc_cid_2,
-               {"CID", "wimax.extended_uiuc_ie.mini_subchannel_alloc.cid", FT_UINT24, BASE_HEX, NULL, MINI_SUBCHANNEL_CID_MASK_2, "", HFILL }
+               {"CID", "wmx.extended_uiuc_ie.mini_subchannel_alloc.cid", FT_UINT24, BASE_HEX, NULL, MINI_SUBCHANNEL_CID_MASK_2, "", HFILL }
        },
        {
                &hf_extended_uiuc_ie_mini_subchannel_alloc_uiuc_2,
-               {"UIUC", "wimax.extended_uiuc_ie.mini_subchannel_alloc.uiuc", FT_UINT24, BASE_HEX, NULL, MINI_SUBCHANNEL_UIUC_MASK_2, "", HFILL }
+               {"UIUC", "wmx.extended_uiuc_ie.mini_subchannel_alloc.uiuc", FT_UINT24, BASE_HEX, NULL, MINI_SUBCHANNEL_UIUC_MASK_2, "", HFILL }
        },
        {
                &hf_extended_uiuc_ie_mini_subchannel_alloc_repetition_2,
-               {"Repetition", "wimax.extended_uiuc_ie.mini_subchannel_alloc.repetition", FT_UINT24, BASE_HEX, VALS(vals_repetitions), MINI_SUBCHANNEL_REPETITION_MASK_2, "", HFILL }
+               {"Repetition", "wmx.extended_uiuc_ie.mini_subchannel_alloc.repetition", FT_UINT24, BASE_HEX, VALS(vals_repetitions), MINI_SUBCHANNEL_REPETITION_MASK_2, "", HFILL }
        },
        {
                &hf_extended_uiuc_ie_mini_subchannel_alloc_cid_3,
-               {"CID", "wimax.extended_uiuc_ie.mini_subchannel_alloc.cid", FT_UINT24, BASE_HEX, NULL, MINI_SUBCHANNEL_CID_MASK_3, "", HFILL }
+               {"CID", "wmx.extended_uiuc_ie.mini_subchannel_alloc.cid", FT_UINT24, BASE_HEX, NULL, MINI_SUBCHANNEL_CID_MASK_3, "", HFILL }
        },
        {
                &hf_extended_uiuc_ie_mini_subchannel_alloc_uiuc_3,
-               {"UIUC", "wimax.extended_uiuc_ie.mini_subchannel_alloc.uiuc", FT_UINT24, BASE_HEX, NULL, MINI_SUBCHANNEL_UIUC_MASK_2, "", HFILL }
+               {"UIUC", "wmx.extended_uiuc_ie.mini_subchannel_alloc.uiuc", FT_UINT24, BASE_HEX, NULL, MINI_SUBCHANNEL_UIUC_MASK_2, "", HFILL }
        },
        {
                &hf_extended_uiuc_ie_mini_subchannel_alloc_repetition_3,
-               {"Repetition", "wimax.extended_uiuc_ie.mini_subchannel_alloc.repetition", FT_UINT24, BASE_HEX, VALS(vals_repetitions), MINI_SUBCHANNEL_REPETITION_MASK_3, "", HFILL }
+               {"Repetition", "wmx.extended_uiuc_ie.mini_subchannel_alloc.repetition", FT_UINT24, BASE_HEX, VALS(vals_repetitions), MINI_SUBCHANNEL_REPETITION_MASK_3, "", HFILL }
        },
        {
                &hf_extended_uiuc_ie_mini_subchannel_alloc_padding,
-               {"Padding", "wimax.extended_uiuc_ie.mini_subchannel_alloc.padding", FT_UINT8, BASE_HEX, NULL, MINI_SUBCHANNEL_PADDING_MASK, "", HFILL }
+               {"Padding", "wmx.extended_uiuc_ie.mini_subchannel_alloc.padding", FT_UINT8, BASE_HEX, NULL, MINI_SUBCHANNEL_PADDING_MASK, "", HFILL }
        },
        {
                &hf_extended_uiuc_ie_mini_subchannel_alloc_padding_1,
-               {"Padding", "wimax.extended_uiuc_ie.mini_subchannel_alloc.padding", FT_UINT24, BASE_HEX, NULL, MINI_SUBCHANNEL_PADDING_MASK_1, "", HFILL }
+               {"Padding", "wmx.extended_uiuc_ie.mini_subchannel_alloc.padding", FT_UINT24, BASE_HEX, NULL, MINI_SUBCHANNEL_PADDING_MASK_1, "", HFILL }
        },
        {       /* 8.4.5.4.6 AAS_UL_IE */
                &hf_extended_uiuc_ie_aas_ul,
-               {"AAS_UL_IE (not implemented)", "wimax.extended_uiuc_ie.aas_ul", FT_BYTES, BASE_HEX, NULL, 0x0, "", HFILL }
+               {"AAS_UL_IE (not implemented)", "wmx.extended_uiuc_ie.aas_ul", FT_BYTES, BASE_HEX, NULL, 0x0, "", HFILL }
        },
        {       /* 8.4.5.4.12 CQICH Allocation IE */
                &hf_extended_uiuc_ie_cqich_alloc,
-               {"CQICH Allocation IE (not implemented)", "wimax.extended_uiuc_ie.cqich_alloc", FT_BYTES, BASE_HEX, NULL, 0x0, "", HFILL }
+               {"CQICH Allocation IE (not implemented)", "wmx.extended_uiuc_ie.cqich_alloc", FT_BYTES, BASE_HEX, NULL, 0x0, "", HFILL }
        },
        {       /* 8.4.5.4.7 UL Zone IE */
                &hf_extended_uiuc_ie_ul_zone,
-               {"UL Zone IE (not implemented)", "wimax.extended_uiuc_ie.ul_zone", FT_BYTES, BASE_HEX, NULL, 0x0, "", HFILL }
+               {"UL Zone IE (not implemented)", "wmx.extended_uiuc_ie.ul_zone", FT_BYTES, BASE_HEX, NULL, 0x0, "", HFILL }
        },
 
        {       /* 8.4.5.4.14 MIMO_UL_Basic_IE */
                &hf_extended_uiuc_ie_mimo_ul_basic,
-               {"MIMO UL Basic IE (not implemented)", "wimax.extended_uiuc_ie.mimo_ul_basic", FT_BYTES, BASE_HEX, NULL, 0x0, "", HFILL }
+               {"MIMO UL Basic IE (not implemented)", "wmx.extended_uiuc_ie.mimo_ul_basic", FT_BYTES, BASE_HEX, NULL, 0x0, "", HFILL }
        },
        {       /* 8.4.5.4.22 UL-MAP Fast Tracking IE */
                &hf_extended_uiuc_ie_fast_tracking,
-               {"UL-MAP Fast Tracking IE (not implemented)", "wimax.extended_uiuc_ie.fast_tracking", FT_BYTES, BASE_HEX, NULL, 0x0, "", HFILL }
+               {"UL-MAP Fast Tracking IE (not implemented)", "wmx.extended_uiuc_ie.fast_tracking", FT_BYTES, BASE_HEX, NULL, 0x0, "", HFILL }
        },
        {       /* 8.4.5.4.21 Fast Ranging IE */
                &hf_extended_uiuc_ie_fast_ranging,
-               {"Fast Ranging IE (not implemented)", "wimax.extended_uiuc_ie.fast_ranging", FT_BYTES, BASE_HEX, NULL, 0x0, "", HFILL }
+               {"Fast Ranging IE (not implemented)", "wmx.extended_uiuc_ie.fast_ranging", FT_BYTES, BASE_HEX, NULL, 0x0, "", HFILL }
        },
        {       /* 8.4.5.4.14 UL-MAP Physical Modifier IE */
                &hf_extended_uiuc_ie_phymod_ul,
-               {"UL-MAP Physical Modifier IE (not implemented)", "wimax.extended_uiuc_ie.phymod_ul", FT_BYTES, BASE_HEX, NULL, 0x0, "", HFILL }
+               {"UL-MAP Physical Modifier IE (not implemented)", "wmx.extended_uiuc_ie.phymod_ul", FT_BYTES, BASE_HEX, NULL, 0x0, "", HFILL }
        },
        {       /* 8.4.5.4.17 UL PUSC Burst Allocation in Other Segment IE */
                &hf_extended_uiuc_ie_ul_pusc_burst_allocation,
-               {"UL_PUSC_Burst_Allocation_in_Other_Segment_IE (not implemented)", "wimax.extended_uiuc_ie.ul_pusc_burst_allocation", FT_BYTES, BASE_HEX, NULL, 0x0, "", HFILL }
+               {"UL_PUSC_Burst_Allocation_in_Other_Segment_IE (not implemented)", "wmx.extended_uiuc_ie.ul_pusc_burst_allocation", FT_BYTES, BASE_HEX, NULL, 0x0, "", HFILL }
        },
        {       /* 8.4.5.4.15 UL Allocation Start IE */
                &hf_extended_uiuc_ie_ul_allocation_start,
-               {"UL Allocation Start IE (not implemented)", "wimax.extended_uiuc_ie.ul_allocation_start", FT_BYTES, BASE_HEX, NULL, 0x0, "", HFILL }
+               {"UL Allocation Start IE (not implemented)", "wmx.extended_uiuc_ie.ul_allocation_start", FT_BYTES, BASE_HEX, NULL, 0x0, "", HFILL }
        },
        {       /* unknown UIUC */
                &hf_extended_uiuc_ie_unknown_uiuc,
-               {"Unknown Extended UIUC", "wimax.extended_uiuc.unknown_uiuc", FT_BYTES, BASE_HEX, NULL, 0x0, "", HFILL }
+               {"Unknown Extended UIUC", "wmx.extended_uiuc.unknown_uiuc", FT_BYTES, BASE_HEX, NULL, 0x0, "", HFILL }
        }
 };
 
index adbbee1c71e76f158cf82c10c5de7ba76967c78a..fdfe790fbd8d364bbfcf1745dedb5155715be57b 100644 (file)
@@ -111,7 +111,7 @@ static hf_register_info hf[] =
        {
                &hf_fch_used_subchannel_group0,
                {
-                       "Sub-Channel Group 0", "wimax.fch.subchannel_group0",
+                       "Sub-Channel Group 0", "wmx.fch.subchannel_group0",
                        FT_UINT24, BASE_DEC, VALS(used_or_not_used), USED_SUB_CHANNEL_GROUP_0,
                        "", HFILL
                }
@@ -119,7 +119,7 @@ static hf_register_info hf[] =
        {
                &hf_fch_used_subchannel_group1,
                {
-                       "Sub-Channel Group 1", "wimax.fch.subchannel_group1",
+                       "Sub-Channel Group 1", "wmx.fch.subchannel_group1",
                        FT_UINT24, BASE_DEC, VALS(used_or_not_used), USED_SUB_CHANNEL_GROUP_1,
                        "", HFILL
                }
@@ -127,7 +127,7 @@ static hf_register_info hf[] =
        {
                &hf_fch_used_subchannel_group2,
                {
-                       "Sub-Channel Group 2", "wimax.fch.subchannel_group2",
+                       "Sub-Channel Group 2", "wmx.fch.subchannel_group2",
                        FT_UINT24, BASE_DEC, VALS(used_or_not_used), USED_SUB_CHANNEL_GROUP_2,
                        "", HFILL
                }
@@ -135,7 +135,7 @@ static hf_register_info hf[] =
        {
                &hf_fch_used_subchannel_group3,
                {
-                       "Sub-Channel Group 3", "wimax.fch.subchannel_group3",
+                       "Sub-Channel Group 3", "wmx.fch.subchannel_group3",
                        FT_UINT24, BASE_DEC, VALS(used_or_not_used), USED_SUB_CHANNEL_GROUP_3,
                        "", HFILL
                }
@@ -143,7 +143,7 @@ static hf_register_info hf[] =
        {
                &hf_fch_used_subchannel_group4,
                {
-                       "Sub-Channel Group 4", "wimax.fch.subchannel_group4",
+                       "Sub-Channel Group 4", "wmx.fch.subchannel_group4",
                        FT_UINT24, BASE_DEC, VALS(used_or_not_used), USED_SUB_CHANNEL_GROUP_4,
                        "", HFILL
                }
@@ -151,7 +151,7 @@ static hf_register_info hf[] =
        {
                &hf_fch_used_subchannel_group5,
                {
-                       "Sub-Channel Group 5", "wimax.fch.subchannel_group5",
+                       "Sub-Channel Group 5", "wmx.fch.subchannel_group5",
                        FT_UINT24, BASE_DEC, VALS(used_or_not_used), USED_SUB_CHANNEL_GROUP_5,
                        "", HFILL
                }
@@ -159,7 +159,7 @@ static hf_register_info hf[] =
        {
                &hf_fch_reserved_1,
                {
-                       "Reserved", "wimax.fch.reserved1",
+                       "Reserved", "wmx.fch.reserved1",
                        FT_UINT24, BASE_DEC, NULL, FCH_RESERVED_1,
                        "", HFILL
                }
@@ -167,7 +167,7 @@ static hf_register_info hf[] =
        {
                &hf_fch_repetition_coding_indication,
                {
-                       "Repetition Coding Indication", "wimax.fch.repetition_coding_indication",
+                       "Repetition Coding Indication", "wmx.fch.repetition_coding_indication",
                        FT_UINT24, BASE_DEC, VALS(repetition_coding_indications), REPETITION_CODING_INDICATION,
                        "", HFILL
                }
@@ -175,7 +175,7 @@ static hf_register_info hf[] =
        {
                &hf_fch_coding_indication,
                {
-                       "Coding Indication", "wimax.fch.coding_indication",
+                       "Coding Indication", "wmx.fch.coding_indication",
                        FT_UINT24, BASE_DEC, VALS(coding_indications), CODING_INDICATION,
                        "", HFILL
                }
@@ -183,7 +183,7 @@ static hf_register_info hf[] =
        {
                &hf_fch_dlmap_length,
                {
-                       "DL Map Length", "wimax.fch.dl_map_length",
+                       "DL Map Length", "wmx.fch.dl_map_length",
                        FT_UINT24, BASE_DEC, NULL, DL_MAP_LENGTH,
                        "", HFILL
                }
@@ -191,7 +191,7 @@ static hf_register_info hf[] =
        {
                &hf_fch_reserved_2,
                {
-                       "Reserved", "wimax.fch.reserved2",
+                       "Reserved", "wmx.fch.reserved2",
                        FT_UINT24, BASE_DEC, NULL, FCH_RESERVED_2,
                        "", HFILL
                }
index f54c786745b18e58c2626c0491664b43221ce904..841bb38635a435efbd479c9e4d33312665f7d389 100644 (file)
@@ -62,27 +62,27 @@ static hf_register_info hf[] =
 {
        {
                &hf_ffb_burst,
-               {"Fast Feedback Burst", "wimax.ffb.burst", FT_BYTES, BASE_HEX, NULL, 0x0, "", HFILL}
+               {"Fast Feedback Burst", "wmx.ffb.burst", FT_BYTES, BASE_HEX, NULL, 0x0, "", HFILL}
        },
        {
                &hf_ffb_num_of_ffbs,
-               {"Number Of Fast Feedback", "wimax.ffb.num_of_ffbs", FT_UINT8, BASE_DEC, NULL, 0x0, "", HFILL}
+               {"Number Of Fast Feedback", "wmx.ffb.num_of_ffbs", FT_UINT8, BASE_DEC, NULL, 0x0, "", HFILL}
        },
        {
                &hf_ffb_type,
-               {"Fast Feedback Type", "wimax.ffb.ffb_type", FT_UINT8, BASE_HEX, NULL, 0x0, "", HFILL}
+               {"Fast Feedback Type", "wmx.ffb.ffb_type", FT_UINT8, BASE_HEX, NULL, 0x0, "", HFILL}
        },
        {
                &hf_ffb_subchannel,
-               {"Physical Subchannel", "wimax.ffb.subchannel", FT_UINT8, BASE_DEC, NULL, 0x0, "", HFILL}
+               {"Physical Subchannel", "wmx.ffb.subchannel", FT_UINT8, BASE_DEC, NULL, 0x0, "", HFILL}
        },
        {
                &hf_ffb_symboloffset,
-               {"Symbol Offset", "wimax.ffb.symbol_offset", FT_UINT8, BASE_DEC, NULL, 0x0, "", HFILL}
+               {"Symbol Offset", "wmx.ffb.symbol_offset", FT_UINT8, BASE_DEC, NULL, 0x0, "", HFILL}
        },
        {
                &hf_ffb_value,
-               {"Fast Feedback Value", "wimax.ffb.ffb_value", FT_UINT8, BASE_HEX, NULL, 0x0, "", HFILL}
+               {"Fast Feedback Value", "wmx.ffb.ffb_value", FT_UINT8, BASE_HEX, NULL, 0x0, "", HFILL}
        }
 };
 
index 00e22c1a8069aa5cbf89f22361fd21102464706b..684e628fda3cd884aa87f8cf915552e91e51b19a 100644 (file)
@@ -75,27 +75,27 @@ static hf_register_info hf[] =
 {
        {
                &hf_hack_burst,
-               {"HARQ ACK Burst", "wimax.hack.burst", FT_BYTES, BASE_HEX, NULL, 0x0, "", HFILL}
+               {"HARQ ACK Burst", "wmx.hack.burst", FT_BYTES, BASE_HEX, NULL, 0x0, "", HFILL}
        },
        {
                &hf_hack_num_of_hacks,
-               {"Number Of HARQ ACKs/NACKs", "wimax.hack.num_of_hacks", FT_UINT8, BASE_DEC, NULL, 0x0, "", HFILL}
+               {"Number Of HARQ ACKs/NACKs", "wmx.hack.num_of_hacks", FT_UINT8, BASE_DEC, NULL, 0x0, "", HFILL}
        },
        {
                &hf_hack_subchannel,
-               {"Physical Subchannel", "wimax.hack.subchannel", FT_UINT8, BASE_DEC, NULL, 0x0, "", HFILL}
+               {"Physical Subchannel", "wmx.hack.subchannel", FT_UINT8, BASE_DEC, NULL, 0x0, "", HFILL}
        },
        {
                &hf_hack_symboloffset,
-               {"Symbol Offset", "wimax.hack.symbol_offset", FT_UINT8, BASE_DEC, NULL, 0x0, "", HFILL}
+               {"Symbol Offset", "wmx.hack.symbol_offset", FT_UINT8, BASE_DEC, NULL, 0x0, "", HFILL}
        },
        {
                &hf_hack_half_slot_flag,
-               {"Half-Slot Flag", "wimax.hack.half_slot_flag", FT_UINT8, BASE_DEC, VALS(vals_flags), 0x0, "", HFILL}
+               {"Half-Slot Flag", "wmx.hack.half_slot_flag", FT_UINT8, BASE_DEC, VALS(vals_flags), 0x0, "", HFILL}
        },
        {
                &hf_hack_value,
-               {"ACK Value", "wimax.hack.hack_value", FT_UINT8, BASE_DEC, VALS(vals_values), 0x0, "", HFILL}
+               {"ACK Value", "wmx.hack.hack_value", FT_UINT8, BASE_DEC, VALS(vals_values), 0x0, "", HFILL}
        }
 };
 
index 48f12c89cef52415532a08a700c5a0c200ddb1be..5ef9c041cedbc0f216e6c7398e90e89f93432478 100644 (file)
@@ -80,27 +80,27 @@ static hf_register_info hf_harq_map[] =
 {
        {
                &hf_harq_map_indicator,
-               {"HARQ MAP Indicator", "wimax.harq_map.indicator", FT_UINT24, BASE_HEX, NULL, WIMAX_HARQ_MAP_INDICATOR_MASK, "", HFILL}
+               {"HARQ MAP Indicator", "wmx.harq_map.indicator", FT_UINT24, BASE_HEX, NULL, WIMAX_HARQ_MAP_INDICATOR_MASK, "", HFILL}
        },
        {
                &hf_harq_ul_map_appended,
-               {"HARQ UL-MAP Appended", "wimax.harq_map.ul_map_appended", FT_UINT24, BASE_HEX, NULL, WIMAX_HARQ_UL_MAP_APPENDED_MASK, "", HFILL}
+               {"HARQ UL-MAP Appended", "wmx.harq_map.ul_map_appended", FT_UINT24, BASE_HEX, NULL, WIMAX_HARQ_UL_MAP_APPENDED_MASK, "", HFILL}
        },
        {
                &hf_harq_map_reserved,
-               {"Reserved", "wimax.harq_map.reserved", FT_UINT24, BASE_HEX, NULL, WIMAX_HARQ_MAP_RESERVED_MASK, "", HFILL}
+               {"Reserved", "wmx.harq_map.reserved", FT_UINT24, BASE_HEX, NULL, WIMAX_HARQ_MAP_RESERVED_MASK, "", HFILL}
        },
        {
                &hf_harq_map_msg_length,
-               {"Map Message Length", "wimax.harq_map.msg_length", FT_UINT24, BASE_DEC, NULL, WIMAX_HARQ_MAP_MSG_LENGTH_MASK, "", HFILL}
+               {"Map Message Length", "wmx.harq_map.msg_length", FT_UINT24, BASE_DEC, NULL, WIMAX_HARQ_MAP_MSG_LENGTH_MASK, "", HFILL}
        },
        {
                &hf_harq_dl_ie_count,
-               {"DL IE Count", "wimax.harq_map.dl_ie_count", FT_UINT24, BASE_DEC, NULL, WIMAX_HARQ_MAP_DL_IE_COUNT_MASK, "", HFILL}
+               {"DL IE Count", "wmx.harq_map.dl_ie_count", FT_UINT24, BASE_DEC, NULL, WIMAX_HARQ_MAP_DL_IE_COUNT_MASK, "", HFILL}
        },
        {
                &hf_harq_map_msg_crc,
-               {"HARQ MAP Message CRC", "wimax.harq_map.msg_crc", FT_UINT32, BASE_HEX, NULL, 0x0, "", HFILL}
+               {"HARQ MAP Message CRC", "wmx.harq_map.msg_crc", FT_UINT32, BASE_HEX, NULL, 0x0, "", HFILL}
        }
 };
 
index c22f80c0f0a71a742c815044009e79709c39d0be..a59d0a7054bb22a2b3957753c83b72f8f6b7187d 100644 (file)
@@ -84,7 +84,7 @@ static hf_register_info hf[] =
        {
                &hf_wimax_value_bytes,
                {
-                       "Values", "wimax.pdu.value",
+                       "Values", "wmx.pdu.value",
                        FT_BYTES, BASE_HEX, NULL, 0x0,
                        "", HFILL
                }
index c54761db66d48001c75830742e967cbd5fcf7724..47a262272175711696557a82f42d7e1f1328e17c 100644 (file)
@@ -93,35 +93,35 @@ static hf_register_info hf[] =
 {
        {
                &hf_phy_attributes_subchannelization_type,
-               {"Subchannelization Type", "wimax.phy_attributes.subchannelization_type", FT_UINT8, BASE_DEC, VALS(vals_subchannel_types), 0x0, "", HFILL}
+               {"Subchannelization Type", "wmx.phy_attributes.subchannelization_type", FT_UINT8, BASE_DEC, VALS(vals_subchannel_types), 0x0, "", HFILL}
        },
        {
                &hf_phy_attributes_permbase,
-               {"Permbase", "wimax.phy_attributes.permbase", FT_UINT8, BASE_HEX, NULL, 0x0, "", HFILL}
+               {"Permbase", "wmx.phy_attributes.permbase", FT_UINT8, BASE_HEX, NULL, 0x0, "", HFILL}
        },
        {
                &hf_phy_attributes_modulation_rate,
-               {"Modulation Rate", "wimax.phy_attributes.modulation_rate", FT_UINT8, BASE_DEC, VALS(vals_modulation_rates), 0x0, "", HFILL}
+               {"Modulation Rate", "wmx.phy_attributes.modulation_rate", FT_UINT8, BASE_DEC, VALS(vals_modulation_rates), 0x0, "", HFILL}
        },
        {
                &hf_phy_attributes_encoding_type,
-               {"Encoding Type", "wimax.phy_attributes.encoding_type", FT_UINT8, BASE_DEC, VALS(vals_encoding_types), 0x0, "", HFILL}
+               {"Encoding Type", "wmx.phy_attributes.encoding_type", FT_UINT8, BASE_DEC, VALS(vals_encoding_types), 0x0, "", HFILL}
        },
        {
                &hf_phy_attributes_num_repeat,
-               {"numRepeat", "wimax.phy_attributes.num_repeat", FT_UINT8, BASE_DEC, NULL, 0x0, "", HFILL}
+               {"numRepeat", "wmx.phy_attributes.num_repeat", FT_UINT8, BASE_DEC, NULL, 0x0, "", HFILL}
        },
        {
                &hf_phy_attributes_symbol_offset,
-               {"Symbol Offset", "wimax.phy_attributes.symbol_offset", FT_UINT8, BASE_DEC, NULL, 0x0, "", HFILL}
+               {"Symbol Offset", "wmx.phy_attributes.symbol_offset", FT_UINT8, BASE_DEC, NULL, 0x0, "", HFILL}
        },
        {
                &hf_phy_attributes_num_of_slots,
-               {"Number Of Slots", "wimax.phy_attributes.num_of_slots", FT_UINT16, BASE_DEC, NULL, 0x0, "", HFILL}
+               {"Number Of Slots", "wmx.phy_attributes.num_of_slots", FT_UINT16, BASE_DEC, NULL, 0x0, "", HFILL}
        },
        {
                &hf_phy_attributes_subchannel,
-               {"Subchannel", "wimax.phy_attributes.subchannel", FT_UINT8, BASE_HEX, NULL, 0x0, "", HFILL}
+               {"Subchannel", "wmx.phy_attributes.subchannel", FT_UINT8, BASE_HEX, NULL, 0x0, "", HFILL}
        }
 };
 
index 2c7419c2f40cdce9fc20282cc5d55879f7cbb3f7..e65a07a215d503f1373a9312485476ec20f6c577 100644 (file)
@@ -577,286 +577,286 @@ static hf_register_info hf_sfe[] =
 {
        {       /* 1 Service Flow ID */
                &hf_sfe_sf_id,
-               {"Service Flow ID", "wimax.sfe.sf_id", FT_UINT32, BASE_HEX, NULL, 0x0, "", HFILL}
+               {"Service Flow ID", "wmx.sfe.sf_id", FT_UINT32, BASE_HEX, NULL, 0x0, "", HFILL}
        },
        {       /* 2 CID */
                &hf_sfe_cid,
-               {"CID", "wimax.sfe.cid", FT_UINT16, BASE_DEC, NULL, 0x0, "", HFILL}
+               {"CID", "wmx.sfe.cid", FT_UINT16, BASE_DEC, NULL, 0x0, "", HFILL}
        },
        {       /* 3 Service Class Name */
                &hf_sfe_service_class_name,
-               {"Service Class Name", "wimax.sfe.service_class_name", FT_STRING, BASE_NONE, NULL, 0x0, "", HFILL}
+               {"Service Class Name", "wmx.sfe.service_class_name", FT_STRING, BASE_NONE, NULL, 0x0, "", HFILL}
        },
        {       /* 4 MBS Service */
                &hf_sfe_mbs_service,
-               {"MBS Service", "wimax.sfe.mbs_service", FT_UINT8, BASE_DEC, VALS(vals_mbs_service), 0x0, "", HFILL}
+               {"MBS Service", "wmx.sfe.mbs_service", FT_UINT8, BASE_DEC, VALS(vals_mbs_service), 0x0, "", HFILL}
        },
        {       /* 5 QoS Parameter Set Type */
                &hf_sfe_qos_params_set,
-               {"QoS Parameter Set Type", "wimax.sfe.qos_params_set", FT_UINT8, BASE_HEX, NULL, 0x0, "", HFILL}
+               {"QoS Parameter Set Type", "wmx.sfe.qos_params_set", FT_UINT8, BASE_HEX, NULL, 0x0, "", HFILL}
        },
        {       /* 5.1 */
                &hf_sfe_set_provisioned,
-               {"Provisioned Set", "wimax.sfe.qos_params_set.provisioned", FT_BOOLEAN, 8, NULL, SFE_QOS_PARAMS_SET_PROVISIONED_SET, "", HFILL}
+               {"Provisioned Set", "wmx.sfe.qos_params_set.provisioned", FT_BOOLEAN, 8, NULL, SFE_QOS_PARAMS_SET_PROVISIONED_SET, "", HFILL}
        },
        {       /* 5.2 */
                &hf_sfe_set_admitted,
-               {"Admitted Set", "wimax.sfe.qos_params_set.admitted", FT_BOOLEAN, 8, NULL, SFE_QOS_PARAMS_SET_ADMITTED_SET, "", HFILL}
+               {"Admitted Set", "wmx.sfe.qos_params_set.admitted", FT_BOOLEAN, 8, NULL, SFE_QOS_PARAMS_SET_ADMITTED_SET, "", HFILL}
        },
        {       /* 5.3 */
                &hf_sfe_set_active,
-               {"Active Set", "wimax.sfe.qos_params_set.active", FT_BOOLEAN, 8, NULL, SFE_QOS_PARAMS_SET_ACTIVE_SET, "", HFILL}
+               {"Active Set", "wmx.sfe.qos_params_set.active", FT_BOOLEAN, 8, NULL, SFE_QOS_PARAMS_SET_ACTIVE_SET, "", HFILL}
        },
        {       /* 5.4 */
                &hf_sfe_set_rsvd,
-               {"Reserved", "wimax.sfe.qos_params_set.rsvd", FT_UINT8, BASE_HEX, NULL, SFE_QOS_PARAMS_SET_RESERVED, "", HFILL}
+               {"Reserved", "wmx.sfe.qos_params_set.rsvd", FT_UINT8, BASE_HEX, NULL, SFE_QOS_PARAMS_SET_RESERVED, "", HFILL}
        },
        {       /* 6 Traffic Priority */
                &hf_sfe_traffic_priority,
-               {"Traffic Priority", "wimax.sfe.traffic_priority", FT_UINT8, BASE_DEC, NULL, 0x0, "", HFILL}
+               {"Traffic Priority", "wmx.sfe.traffic_priority", FT_UINT8, BASE_DEC, NULL, 0x0, "", HFILL}
        },
        {       /* 7 Maximum Sustained Traffic Rate */
                &hf_sfe_max_str,
-               {"Maximum Sustained Traffic Rate", "wimax.sfe.msr", FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL}
+               {"Maximum Sustained Traffic Rate", "wmx.sfe.msr", FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL}
        },
        {       /* 8 Maximum Traffic Burst */
                &hf_sfe_max_traffic_burst,
-               {"Maximum Traffic Burst", "wimax.sfe.max_traffic_burst", FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL}
+               {"Maximum Traffic Burst", "wmx.sfe.max_traffic_burst", FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL}
        },
        {       /* 9 Minimum Reserved Traffic Rate */
                &hf_sfe_min_rtr,
-               {"Minimum Reserved Traffic Rate", "wimax.sfe.mrr", FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL}
+               {"Minimum Reserved Traffic Rate", "wmx.sfe.mrr", FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL}
        },
        {
                /* 10 Reserved */
                &hf_sfe_reserved_10,
-               {"Reserved", "wimax.sfe.reserved_10", FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL}
+               {"Reserved", "wmx.sfe.reserved_10", FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL}
        },
 #if 0
        {       /* 10 reserved by 16E */
                &hf_sfe_mtr,
-               {"Minimum tolerable traffic rate", "wimax.sfe.mtr", FT_UINT32, BASE_HEX, NULL, 0x0, "", HFILL}
+               {"Minimum tolerable traffic rate", "wmx.sfe.mtr", FT_UINT32, BASE_HEX, NULL, 0x0, "", HFILL}
        },
 #endif
        {       /* 11 Service Flow Scheduling Type */
                &hf_sfe_ul_grant_scheduling,
-               {"Uplink Grant Scheduling Type", "wimax.sfe.uplink_grant_scheduling", FT_UINT8, BASE_DEC, VALS(vals_ul_grant_scheduling), 0x0, "", HFILL}
+               {"Uplink Grant Scheduling Type", "wmx.sfe.uplink_grant_scheduling", FT_UINT8, BASE_DEC, VALS(vals_ul_grant_scheduling), 0x0, "", HFILL}
        },
        {       /* 12 Request/Transmission Policy */
                &hf_sfe_req_tx_policy,
-               {"Request/Transmission Policy", "wimax.sfe.req_tx_policy", FT_UINT32, BASE_HEX, NULL, 0x0, "", HFILL}
+               {"Request/Transmission Policy", "wmx.sfe.req_tx_policy", FT_UINT32, BASE_HEX, NULL, 0x0, "", HFILL}
        },
        {       /* 12.1 */
                &hf_sfe_policy_broadcast_bwr,
-               {"The Service Flow Shall Not Use Broadcast Bandwidth Request Opportunities", "wimax.sfe.policy.broadcast_bwr", FT_BOOLEAN, 8, NULL, SFE_REQ_TX_POLICY_BROADCAST_BWR, "", HFILL}
+               {"The Service Flow Shall Not Use Broadcast Bandwidth Request Opportunities", "wmx.sfe.policy.broadcast_bwr", FT_BOOLEAN, 8, NULL, SFE_REQ_TX_POLICY_BROADCAST_BWR, "", HFILL}
        },
        {       /* 12.2 */
                &hf_sfe_policy_multicast_bwr,
-               {"The Service Flow Shall Not Use Multicast Bandwidth Request Opportunities", "wimax.sfe.policy.bit1", FT_BOOLEAN, 8, NULL, SFE_REQ_TX_POLICY_MULTICAST_BWR, "", HFILL}
+               {"The Service Flow Shall Not Use Multicast Bandwidth Request Opportunities", "wmx.sfe.policy.bit1", FT_BOOLEAN, 8, NULL, SFE_REQ_TX_POLICY_MULTICAST_BWR, "", HFILL}
        },
        {       /* 12.3 */
                &hf_sfe_policy_piggyback,
-               {"The Service Flow Shall Not Piggyback Requests With Data", "wimax.sfe.policy.piggyback", FT_BOOLEAN, 8, NULL, SFE_REQ_TX_POLICY_PIGGYBACK, "", HFILL}
+               {"The Service Flow Shall Not Piggyback Requests With Data", "wmx.sfe.policy.piggyback", FT_BOOLEAN, 8, NULL, SFE_REQ_TX_POLICY_PIGGYBACK, "", HFILL}
        },
        {       /* 12.4 */
                &hf_sfe_policy_fragment,
-               {"The Service Flow Shall Not Fragment Data", "wimax.sfe.policy.fragment", FT_BOOLEAN, 8, NULL, SFE_REQ_TX_POLICY_FRAGMENT_DATA, "", HFILL}
+               {"The Service Flow Shall Not Fragment Data", "wmx.sfe.policy.fragment", FT_BOOLEAN, 8, NULL, SFE_REQ_TX_POLICY_FRAGMENT_DATA, "", HFILL}
        },
        {       /* 12.5 */
                &hf_sfe_policy_headers,
-               {"The Service Flow Shall Not Suppress Payload Headers", "wimax.sfe.policy.headers", FT_BOOLEAN, 8, NULL, SFE_REQ_TX_POLICY_PAYLOAD_HEADER, "", HFILL}
+               {"The Service Flow Shall Not Suppress Payload Headers", "wmx.sfe.policy.headers", FT_BOOLEAN, 8, NULL, SFE_REQ_TX_POLICY_PAYLOAD_HEADER, "", HFILL}
        },
        {       /* 12.6 */
                &hf_sfe_policy_packing,
-               {"The Service Flow Shall Not Pack Multiple SDUs (Or Fragments) Into Single MAC PDUs", "wimax.sfe.policy.packing", FT_BOOLEAN, 8, NULL, SFE_REQ_TX_POLICY_PACKINGS, "", HFILL}
+               {"The Service Flow Shall Not Pack Multiple SDUs (Or Fragments) Into Single MAC PDUs", "wmx.sfe.policy.packing", FT_BOOLEAN, 8, NULL, SFE_REQ_TX_POLICY_PACKINGS, "", HFILL}
        },
        {       /* 12.7 */
                &hf_sfe_policy_crc,
-               {"The Service Flow Shall Not Include CRC In The MAC PDU", "wimax.sfe.policy.crc", FT_BOOLEAN, 8, NULL, SFE_REQ_TX_POLICY_CRC, "", HFILL}
+               {"The Service Flow Shall Not Include CRC In The MAC PDU", "wmx.sfe.policy.crc", FT_BOOLEAN, 8, NULL, SFE_REQ_TX_POLICY_CRC, "", HFILL}
        },
        {       /* 12.8 */
                &hf_sfe_policy_rsvd1,
-               {"Reserved", "wimax.sfe.policy.rsvd1", FT_UINT8, BASE_HEX, NULL, SFE_REQ_TX_POLICY_RESERVED, "", HFILL}
+               {"Reserved", "wmx.sfe.policy.rsvd1", FT_UINT8, BASE_HEX, NULL, SFE_REQ_TX_POLICY_RESERVED, "", HFILL}
        },
        {       /* 13 Tolerated Jitter */
                &hf_sfe_jitter,
-               {"Tolerated Jitter", "wimax.sfe.jitter", FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL}
+               {"Tolerated Jitter", "wmx.sfe.jitter", FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL}
        },
        {       /* 14 Maximum Latency */
                &hf_sfe_max_latency,
-               {"Maximum Latency", "wimax.sfe.max_latency", FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL}
+               {"Maximum Latency", "wmx.sfe.max_latency", FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL}
        },
        {       /* 15 Fixed/Variable Length SDU */
                &hf_sfe_fixed_len_sdu,
-               {"Fixed/Variable Length SDU", "wimax.sfe.fixed_len_sdu", FT_UINT8, BASE_DEC, VALS(vals_fixed_len_sdu), 0x0, "", HFILL}
+               {"Fixed/Variable Length SDU", "wmx.sfe.fixed_len_sdu", FT_UINT8, BASE_DEC, VALS(vals_fixed_len_sdu), 0x0, "", HFILL}
        },
        {       /* 16 SDU Size */
                &hf_sfe_sdu_size,
-               {"SDU Size", "wimax.sfe.sdu_size", FT_UINT8, BASE_DEC, NULL, 0x0, "", HFILL}
+               {"SDU Size", "wmx.sfe.sdu_size", FT_UINT8, BASE_DEC, NULL, 0x0, "", HFILL}
        },
        {       /* 17 SAID Onto Which SF Is Mapped */
                &hf_sfe_target_said,
-               {"SAID Onto Which SF Is Mapped", "wimax.sfe.target_said", FT_UINT16, BASE_HEX, NULL, 0x0, "", HFILL}
+               {"SAID Onto Which SF Is Mapped", "wmx.sfe.target_said", FT_UINT16, BASE_HEX, NULL, 0x0, "", HFILL}
        },
        {       /* 18 ARQ Enable */
                &hf_sfe_arq_enable,
-               {"ARQ Enable", "wimax.arq.enable", FT_UINT8, BASE_DEC, VALS(vals_arq_enable), 0x0, "", HFILL}
+               {"ARQ Enable", "wmx.arq.enable", FT_UINT8, BASE_DEC, VALS(vals_arq_enable), 0x0, "", HFILL}
        },
        {       /* 19 ARQ Window Size */
                &hf_sfe_arq_window_size,
-               {"ARQ Window Size", "wimax.arq.window_size", FT_UINT16, BASE_DEC, NULL, 0x0, "", HFILL}
+               {"ARQ Window Size", "wmx.arq.window_size", FT_UINT16, BASE_DEC, NULL, 0x0, "", HFILL}
        },
        {       /* 20 ARQ Transmitter Delay */
                &hf_sfe_arq_transmitter_delay,
-               {"ARQ Transmitter Delay (10us granularity)", "wimax.arq.transmitter_delay", FT_UINT16, BASE_DEC, NULL, 0x0, "", HFILL}
+               {"ARQ Transmitter Delay (10us granularity)", "wmx.arq.transmitter_delay", FT_UINT16, BASE_DEC, NULL, 0x0, "", HFILL}
        },
        {       /* 21 ARQ Receiver Delay */
                &hf_sfe_arq_receiver_delay,
-               {"ARQ Receiver Delay (10us granularity)", "wimax.arq.receiver_delay", FT_UINT16, BASE_DEC, NULL, 0x0, "", HFILL}
+               {"ARQ Receiver Delay (10us granularity)", "wmx.arq.receiver_delay", FT_UINT16, BASE_DEC, NULL, 0x0, "", HFILL}
        },
        {       /* 22 ARQ Block Lifetime */
                &hf_sfe_arq_block_lifetime,
-               {"ARQ Block Lifetime (10us granularity)", "wimax.arq.block_lifetime", FT_UINT16, BASE_DEC, NULL, 0x0, "", HFILL}
+               {"ARQ Block Lifetime (10us granularity)", "wmx.arq.block_lifetime", FT_UINT16, BASE_DEC, NULL, 0x0, "", HFILL}
        },
        {       /* 23 ARQ Sync Loss Timeout */
                &hf_sfe_arq_sync_loss_timeout,
-               {"ARQ Sync Loss Timeout (10us granularity)", "wimax.arq.sync_loss_timeout", FT_UINT16, BASE_DEC, VALS(&vals_arq_sync_loss_timeout), 0x0, "", HFILL}
+               {"ARQ Sync Loss Timeout (10us granularity)", "wmx.arq.sync_loss_timeout", FT_UINT16, BASE_DEC, VALS(&vals_arq_sync_loss_timeout), 0x0, "", HFILL}
        },
        {       /* 20 ARQ Transmitter Delay */
                &hf_sfe_arq_transmitter_delay_cor2,
-               {"ARQ Transmitter Delay (100us granularity)", "wimax.arq.transmitter_delay", FT_UINT16, BASE_DEC, NULL, 0x0, "", HFILL}
+               {"ARQ Transmitter Delay (100us granularity)", "wmx.arq.transmitter_delay", FT_UINT16, BASE_DEC, NULL, 0x0, "", HFILL}
        },
        {       /* 21 ARQ Receiver Delay */
                &hf_sfe_arq_receiver_delay_cor2,
-               {"ARQ Receiver Delay (100us granularity)", "wimax.arq.receiver_delay", FT_UINT16, BASE_DEC, NULL, 0x0, "", HFILL}
+               {"ARQ Receiver Delay (100us granularity)", "wmx.arq.receiver_delay", FT_UINT16, BASE_DEC, NULL, 0x0, "", HFILL}
        },
        {       /* 22 ARQ Block Lifetime */
                &hf_sfe_arq_block_lifetime_cor2,
-               {"ARQ Block Lifetime (100us granularity)", "wimax.arq.block_lifetime", FT_UINT16, BASE_DEC, NULL, 0x0, "", HFILL}
+               {"ARQ Block Lifetime (100us granularity)", "wmx.arq.block_lifetime", FT_UINT16, BASE_DEC, NULL, 0x0, "", HFILL}
        },
        {       /* 23 ARQ Sync Loss Timeout */
                &hf_sfe_arq_sync_loss_timeout_cor2,
-               {"ARQ Sync Loss Timeout (100us granularity)", "wimax.arq.sync_loss_timeout", FT_UINT16, BASE_DEC, VALS(&vals_arq_sync_loss_timeout), 0x0, "", HFILL}
+               {"ARQ Sync Loss Timeout (100us granularity)", "wmx.arq.sync_loss_timeout", FT_UINT16, BASE_DEC, VALS(&vals_arq_sync_loss_timeout), 0x0, "", HFILL}
        },
        {       /* 24 ARQ Deliver In Order */
                &hf_sfe_arq_deliver_in_order,
-               {"ARQ Deliver In Order", "wimax.arq.deliver_in_order", FT_UINT8, BASE_DEC, VALS(&vals_arq_deliver_in_order), 0x0, "", HFILL}
+               {"ARQ Deliver In Order", "wmx.arq.deliver_in_order", FT_UINT8, BASE_DEC, VALS(&vals_arq_deliver_in_order), 0x0, "", HFILL}
        },
        {       /* 25 ARQ Purge Timeout */
                &hf_sfe_arq_rx_purge_timeout,
-               {"ARQ RX Purge Timeout (100us granularity)", "wimax.arq.rx_purge_timeout", FT_UINT16, BASE_DEC, VALS(&vals_arq_rx_purge_timeout), 0x0, "", HFILL}
+               {"ARQ RX Purge Timeout (100us granularity)", "wmx.arq.rx_purge_timeout", FT_UINT16, BASE_DEC, VALS(&vals_arq_rx_purge_timeout), 0x0, "", HFILL}
        },
        {       /* 26 ARQ Block Size */
                &hf_sfe_arq_block_size,
-               {"ARQ Block Size", "wimax.arq.block_size", FT_UINT16, BASE_DEC, NULL, 0x0, "", HFILL}
+               {"ARQ Block Size", "wmx.arq.block_size", FT_UINT16, BASE_DEC, NULL, 0x0, "", HFILL}
        },
        {       /* 26 ARQ Block Size */
                &hf_sfe_arq_block_size_cor2,
-               {"ARQ Block Size", "wimax.arq.block_size", FT_UINT8, BASE_HEX, NULL, 0x0, "", HFILL}
+               {"ARQ Block Size", "wmx.arq.block_size", FT_UINT8, BASE_HEX, NULL, 0x0, "", HFILL}
        },
        {       /* 26 ARQ Block Size for Corrigendum 2 */
                &hf_sfe_arq_min_block_size,
-               {"ARQ Minumum Block Size", "wimax.arq.min_block_size", FT_UINT8, BASE_DEC, NULL, 0x0F, "", HFILL}
+               {"ARQ Minumum Block Size", "wmx.arq.min_block_size", FT_UINT8, BASE_DEC, NULL, 0x0F, "", HFILL}
        },
        {       /* 26 ARQ Block Size for Corrigendum 2 */
                &hf_sfe_arq_max_block_size,
-               {"ARQ Maximum Block Size", "wimax.arq.max_block_size", FT_UINT8, BASE_DEC, NULL, 0xF0, "", HFILL}
+               {"ARQ Maximum Block Size", "wmx.arq.max_block_size", FT_UINT8, BASE_DEC, NULL, 0xF0, "", HFILL}
        },
 /* 27 reserved */
        {       /* 28 CS Specification */
                &hf_sfe_cs_specification,
-               {"CS Specification", "wimax.sfe.cs_specification", FT_UINT8, BASE_DEC, VALS(vals_cs_specification), 0x0, "", HFILL}
+               {"CS Specification", "wmx.sfe.cs_specification", FT_UINT8, BASE_DEC, VALS(vals_cs_specification), 0x0, "", HFILL}
        },
         {      /* 29 Type of Data Delivery Services */
                &hf_sfe_type_of_data_delivery_services,
-               {"Type of Data Delivery Services", "wimax.sfe.type_of_data_delivery_services", FT_UINT8, BASE_DEC, VALS(vals_type_of_data_delivery_services), 0x0, "", HFILL}
+               {"Type of Data Delivery Services", "wmx.sfe.type_of_data_delivery_services", FT_UINT8, BASE_DEC, VALS(vals_type_of_data_delivery_services), 0x0, "", HFILL}
        },
         {      /* 30 SDU Inter-Arrival Interval */
                &hf_sfe_sdu_inter_arrival_interval,
-               {"SDU Inter-Arrival Interval (in the resolution of 0.5 ms)", "wimax.sfe.sdu_inter_arrival_interval", FT_UINT16, BASE_DEC, NULL, 0x0, "", HFILL}
+               {"SDU Inter-Arrival Interval (in the resolution of 0.5 ms)", "wmx.sfe.sdu_inter_arrival_interval", FT_UINT16, BASE_DEC, NULL, 0x0, "", HFILL}
        },
         {      /* 31 Time Base */
                &hf_sfe_time_base,
-               {"Time Base", "wimax.sfe.time_base", FT_UINT16, BASE_DEC, NULL, 0x0, "", HFILL}
+               {"Time Base", "wmx.sfe.time_base", FT_UINT16, BASE_DEC, NULL, 0x0, "", HFILL}
        },
         {      /* 32 Paging Preference */
                &hf_sfe_paging_preference,
-               {"Paging Preference", "wimax.sfe.paging_preference", FT_UINT8, BASE_DEC, VALS(vals_paging_preference), 0x0, "", HFILL}
+               {"Paging Preference", "wmx.sfe.paging_preference", FT_UINT8, BASE_DEC, VALS(vals_paging_preference), 0x0, "", HFILL}
        },
         {      /* 33 MBS Zone Identifier */
                &hf_sfe_mbs_zone_identifier_assignment,
-               {"MBS Zone Identifier", "wimax.sfe.mbs_zone_identifier", FT_BYTES, BASE_HEX, NULL, 0x0, "", HFILL}
+               {"MBS Zone Identifier", "wmx.sfe.mbs_zone_identifier", FT_BYTES, BASE_HEX, NULL, 0x0, "", HFILL}
        },
         {      /* 34 Traffic Indication Preference */
                &hf_sfe_reserved_34,
-               {"Reserved", "wimax.sfe.reserved_34", FT_UINT8, BASE_DEC, NULL /*VALS(vals_traffic_indication_preference)*/, 0x0, "", HFILL}
+               {"Reserved", "wmx.sfe.reserved_34", FT_UINT8, BASE_DEC, NULL /*VALS(vals_traffic_indication_preference)*/, 0x0, "", HFILL}
        },
        {       /* 35 Global Service Class Name */
                &hf_sfe_global_service_class_name,
-               {"Global Service Class Name", "wimax.sfe.global_service_class_name", FT_STRING, BASE_NONE, NULL, 0x0, "", HFILL}
+               {"Global Service Class Name", "wmx.sfe.global_service_class_name", FT_STRING, BASE_NONE, NULL, 0x0, "", HFILL}
        },
 /* 36 reserved by 16E */
                /* 36 Reserved */
        {
                &hf_sfe_reserved_36,
-               {"Reserved", "wimax.sfe.reserved_36", FT_UINT8, BASE_DEC, NULL, 0x0, "", HFILL}
+               {"Reserved", "wmx.sfe.reserved_36", FT_UINT8, BASE_DEC, NULL, 0x0, "", HFILL}
        },
         {      /* 37 SN Feedback Enable */
                &hf_sfe_sn_feedback_enabled,
-               {"SN Feedback", "wimax.sfe.sn_feedback_enabled", FT_UINT8, BASE_DEC, VALS(vals_sn_fb_enable), 0x0, "", HFILL}
+               {"SN Feedback", "wmx.sfe.sn_feedback_enabled", FT_UINT8, BASE_DEC, VALS(vals_sn_fb_enable), 0x0, "", HFILL}
        },
        {       /* 38 FSN Size */
                &hf_sfe_fsn_size,
-               {"FSN Size", "wimax.sfe.fsn_size", FT_UINT8, BASE_DEC, VALS(vals_fsn_size), 0x0, "", HFILL}
+               {"FSN Size", "wmx.sfe.fsn_size", FT_UINT8, BASE_DEC, VALS(vals_fsn_size), 0x0, "", HFILL}
        },
        {       /* 39 CID allocation for Active BSs */
                &hf_sfe_cid_alloc_for_active_bs,
-               {"CID Allocation For Active BSs", "wimax.sfe.cid_alloc_for_active_bs", FT_BYTES, BASE_HEX, NULL, 0x0, "", HFILL}
+               {"CID Allocation For Active BSs", "wmx.sfe.cid_alloc_for_active_bs", FT_BYTES, BASE_HEX, NULL, 0x0, "", HFILL}
        },
        {       /* 39.1 */
                &hf_sfe_cid_alloc_for_active_bs_cid,
-               {"CID", "wimax.sfe.cid_alloc_for_active_bs_cid", FT_UINT16, BASE_DEC, NULL, 0x0, "", HFILL}
+               {"CID", "wmx.sfe.cid_alloc_for_active_bs_cid", FT_UINT16, BASE_DEC, NULL, 0x0, "", HFILL}
        },
         {      /* 40 Unsolicited Grant Interval */
                &hf_sfe_unsolicited_grant_interval,
-               {"Unsolicited Grant Interval", "wimax.sfe.unsolicited_grant_interval", FT_UINT16, BASE_DEC, NULL, 0x0, "", HFILL}
+               {"Unsolicited Grant Interval", "wmx.sfe.unsolicited_grant_interval", FT_UINT16, BASE_DEC, NULL, 0x0, "", HFILL}
        },
         {      /* 41 Unsolicited Polling Interval */
                &hf_sfe_unsolicited_polling_interval,
-               {"Unsolicited Polling Interval", "wimax.sfe.unsolicited_polling_interval", FT_UINT16, BASE_DEC, NULL, 0x0, "", HFILL}
+               {"Unsolicited Polling Interval", "wmx.sfe.unsolicited_polling_interval", FT_UINT16, BASE_DEC, NULL, 0x0, "", HFILL}
        },
        {       /* 42 PDU SN extended subheader for HARQ reordering */
                &hf_sfe_pdu_sn_ext_subheader_reorder,
-               {"PDU SN Extended Subheader For HARQ Reordering", "wimax.sfe.pdu_sn_ext_subheader_reorder", FT_UINT8, BASE_DEC, VALS(vals_pdu_sn_ext_subheader), 0x0, "", HFILL}
+               {"PDU SN Extended Subheader For HARQ Reordering", "wmx.sfe.pdu_sn_ext_subheader_reorder", FT_UINT8, BASE_DEC, VALS(vals_pdu_sn_ext_subheader), 0x0, "", HFILL}
        },
        {       /* 43 MBS contents ID */
                &hf_sfe_mbs_contents_ids,
-               {"MBS contents IDs", "wimax.sfe.mbs_contents_ids", FT_BYTES, BASE_HEX, NULL, 0x0, "", HFILL}
+               {"MBS contents IDs", "wmx.sfe.mbs_contents_ids", FT_BYTES, BASE_HEX, NULL, 0x0, "", HFILL}
        },
        {       /* 43.1 */
                &hf_sfe_mbs_contents_ids_id,
-               {"MBS Contents ID", "wimax.sfe.mbs_contents_ids_id", FT_UINT16, BASE_DEC, NULL, 0x0, "", HFILL}
+               {"MBS Contents ID", "wmx.sfe.mbs_contents_ids_id", FT_UINT16, BASE_DEC, NULL, 0x0, "", HFILL}
        },
         {      /* 44 HARQ Service Flows */
                &hf_sfe_harq_service_flows,
-               {"HARQ Service Flows", "wimax.sfe.harq_service_flows", FT_UINT8, BASE_DEC, VALS(vals_harq), 0x0, "", HFILL}
+               {"HARQ Service Flows", "wmx.sfe.harq_service_flows", FT_UINT8, BASE_DEC, VALS(vals_harq), 0x0, "", HFILL}
        },
        {       /* 45 Authorization Token */
                &hf_sfe_authorization_token,
-               {"Authorization Token", "wimax.sfe.authorization_token", FT_BYTES, BASE_HEX, NULL, 0x0, "", HFILL}
+               {"Authorization Token", "wmx.sfe.authorization_token", FT_BYTES, BASE_HEX, NULL, 0x0, "", HFILL}
        },
         {      /* 46 HARQ Channel Mapping */
                &hf_sfe_harq_channel_mapping,
-               {"HARQ Channel Mapping", "wimax.sfe.harq_channel_mapping", FT_BYTES, BASE_HEX, NULL, 0x0, "", HFILL}
+               {"HARQ Channel Mapping", "wmx.sfe.harq_channel_mapping", FT_BYTES, BASE_HEX, NULL, 0x0, "", HFILL}
        },
         {      /* 46.1 HARQ Channel Index*/
                &hf_sfe_harq_channel_mapping_index,
-               {"HARQ Channel Index", "wimax.sfe.harq_channel_mapping.index", FT_UINT8, BASE_DEC, NULL, 0x0, "", HFILL}
+               {"HARQ Channel Index", "wmx.sfe.harq_channel_mapping.index", FT_UINT8, BASE_DEC, NULL, 0x0, "", HFILL}
        },
 /* unknown types */
        {       /* unknown SFE types */
                &hf_sfe_unknown_type,
-               {"Unknown SFE TLV type", "wimax.sfe.unknown_type", FT_BYTES, BASE_HEX, NULL, 0x0, "", HFILL}
+               {"Unknown SFE TLV type", "wmx.sfe.unknown_type", FT_BYTES, BASE_HEX, NULL, 0x0, "", HFILL}
        }
 };
 
@@ -870,270 +870,270 @@ static hf_register_info hf_csper[] =
 {      /* 99 - 111 CS parameter encoding rules */
        {       /* Classifier DSC Action */
                &hf_cst_classifier_dsc_action,
-               {"Classifier DSC Action", "wimax.cst.classifier_action", FT_UINT8, BASE_DEC, VALS(vals_cst_classifier_action), 0x0, "", HFILL}
+               {"Classifier DSC Action", "wmx.cst.classifier_action", FT_UINT8, BASE_DEC, VALS(vals_cst_classifier_action), 0x0, "", HFILL}
        },
        {       /* Errored Parameter */
                &hf_cst_error_set_errored_param,
-               {"Errored Parameter", "wimax.cst.error_set.errored_param", FT_BYTES, BASE_HEX, NULL, 0x0, "", HFILL}
+               {"Errored Parameter", "wmx.cst.error_set.errored_param", FT_BYTES, BASE_HEX, NULL, 0x0, "", HFILL}
        },
        {       /* Error Code */
                &hf_cst_error_set_error_code,
-               {"Error Code", "wimax.cst.error_set.error_code", FT_UINT8, BASE_HEX, VALS(vals_cc), 0x0, "", HFILL}
+               {"Error Code", "wmx.cst.error_set.error_code", FT_UINT8, BASE_HEX, VALS(vals_cc), 0x0, "", HFILL}
        },
        {       /* Error Message */
                &hf_cst_error_set_error_msg,
-               {"Error Message", "wimax.cst.error_set.error_msg", FT_STRINGZ, BASE_NONE, NULL, 0x0, "", HFILL}
+               {"Error Message", "wmx.cst.error_set.error_msg", FT_STRINGZ, BASE_NONE, NULL, 0x0, "", HFILL}
        },
        {       /* Packet Classification Rule */
                &hf_cst_pkt_class_rule,
-               {"Packet Classification Rule", "wimax.cst.pkt_class_rule", FT_BYTES, BASE_HEX, NULL, 0x0, "", HFILL}
+               {"Packet Classification Rule", "wmx.cst.pkt_class_rule", FT_BYTES, BASE_HEX, NULL, 0x0, "", HFILL}
        },
        {       /* Classification Rule Priority */
                &hf_cst_pkt_class_rule_priority,
-               {"Classification Rule Priority", "wimax.cst.pkt_class_rule.priority", FT_UINT8, BASE_DEC, NULL, 0x0, "", HFILL}
+               {"Classification Rule Priority", "wmx.cst.pkt_class_rule.priority", FT_UINT8, BASE_DEC, NULL, 0x0, "", HFILL}
        },
        {       /* ToS/Differentiated Services Codepoint (DSCP) Range And Mask */
                &hf_cst_pkt_class_rule_range_mask,
-               {"ToS/Differentiated Services Codepoint (DSCP) Range And Mask", "wimax.cst.pkt_class_rule.range_mask", FT_BYTES, BASE_HEX, NULL, 0x0, "", HFILL}
+               {"ToS/Differentiated Services Codepoint (DSCP) Range And Mask", "wmx.cst.pkt_class_rule.range_mask", FT_BYTES, BASE_HEX, NULL, 0x0, "", HFILL}
        },
        {       /* ToS-Low */
                &hf_cst_pkt_class_rule_tos_low,
-               {"ToS-Low", "wimax.cst.pkt_class_rule.tos-low", FT_UINT8, BASE_HEX, NULL, 0x0, "", HFILL}
+               {"ToS-Low", "wmx.cst.pkt_class_rule.tos-low", FT_UINT8, BASE_HEX, NULL, 0x0, "", HFILL}
        },
        {       /* ToS-High */
                &hf_cst_pkt_class_rule_tos_high,
-               {"ToS-High", "wimax.cst.pkt_class_rule.tos-high", FT_UINT8, BASE_HEX, NULL, 0x0, "", HFILL}
+               {"ToS-High", "wmx.cst.pkt_class_rule.tos-high", FT_UINT8, BASE_HEX, NULL, 0x0, "", HFILL}
        },
        {       /* ToS-Mask */
                &hf_cst_pkt_class_rule_tos_mask,
-               {"ToS-Mask", "wimax.cst.pkt_class_rule.tos-mask", FT_UINT8, BASE_HEX, NULL, 0x0, "", HFILL}
+               {"ToS-Mask", "wmx.cst.pkt_class_rule.tos-mask", FT_UINT8, BASE_HEX, NULL, 0x0, "", HFILL}
        },
        {       /* Protocol */
                &hf_cst_pkt_class_rule_protocol,
-               {"Protocol", "wimax.cst.pkt_class_rule.protocol", FT_UINT8, BASE_HEX, NULL, 0x0, "", HFILL}
+               {"Protocol", "wmx.cst.pkt_class_rule.protocol", FT_UINT8, BASE_HEX, NULL, 0x0, "", HFILL}
        },
 #if 0 /* Removed by the changes of 802.16E 2005 */
        {       /* Protocol */
                &hf_cst_pkt_class_rule_protocol,
-               {"Protocol", "wimax.cst.pkt_class_rule.protocol", FT_BYTES, BASE_HEX, NULL, 0x0, "", HFILL}
+               {"Protocol", "wmx.cst.pkt_class_rule.protocol", FT_BYTES, BASE_HEX, NULL, 0x0, "", HFILL}
        },
        {       /* Protocol Number */
                &hf_cst_pkt_class_rule_protocol_number,
-               {"Protocol Number", "wimax.cst.pkt_class_rule.protocol.number", FT_UINT8, BASE_DEC, NULL, 0x0, "", HFILL}
+               {"Protocol Number", "wmx.cst.pkt_class_rule.protocol.number", FT_UINT8, BASE_DEC, NULL, 0x0, "", HFILL}
        },
 #endif
        {       /* IP Masked Source Address */
                &hf_cst_pkt_class_rule_ip_masked_src_address,
-               {"IP Masked Source Address", "wimax.cst.pkt_class_rule.ip_masked_src_address", FT_BYTES, BASE_HEX, NULL, 0x0, "", HFILL}
+               {"IP Masked Source Address", "wmx.cst.pkt_class_rule.ip_masked_src_address", FT_BYTES, BASE_HEX, NULL, 0x0, "", HFILL}
        },
        {       /* IP Masked Destination Address */
                &hf_cst_pkt_class_rule_ip_masked_dest_address,
-               {"IP Masked Destination Address", "wimax.cst.pkt_class_rule.ip_masked_dest_address", FT_BYTES, BASE_HEX, NULL, 0x0, "", HFILL}
+               {"IP Masked Destination Address", "wmx.cst.pkt_class_rule.ip_masked_dest_address", FT_BYTES, BASE_HEX, NULL, 0x0, "", HFILL}
        },
        {       /* IPv4 Source Address */
                &hf_cst_pkt_class_rule_src_ipv4,
-               {"IPv4 Source Address", "wimax.cst.pkt_class_rule.src_ipv4", FT_IPv4, BASE_NONE, NULL, 0x0, "", HFILL}
+               {"IPv4 Source Address", "wmx.cst.pkt_class_rule.src_ipv4", FT_IPv4, BASE_NONE, NULL, 0x0, "", HFILL}
        },
        {       /* IPv4 Destination Address */
                &hf_cst_pkt_class_rule_dest_ipv4,
-               {"IPv4 Destination Address", "wimax.cst.pkt_class_rule.dst_ipv4", FT_IPv4, BASE_NONE, NULL, 0x0, "", HFILL}
+               {"IPv4 Destination Address", "wmx.cst.pkt_class_rule.dst_ipv4", FT_IPv4, BASE_NONE, NULL, 0x0, "", HFILL}
        },
        {       /* IPv4 Mask */
                &hf_cst_pkt_class_rule_mask_ipv4,
-               {"IPv4 Mask", "wimax.cst.pkt_class_rule.mask_ipv4", FT_IPv4, BASE_NONE, NULL, 0x0, "", HFILL}
+               {"IPv4 Mask", "wmx.cst.pkt_class_rule.mask_ipv4", FT_IPv4, BASE_NONE, NULL, 0x0, "", HFILL}
        },
        {       /* IPv6 Source Address */
                &hf_cst_pkt_class_rule_src_ipv6,
-               {"IPv6 Source Address", "wimax.cst.pkt_class_rule.src_ipv6", FT_IPv6, BASE_NONE, NULL, 0x0, "", HFILL}
+               {"IPv6 Source Address", "wmx.cst.pkt_class_rule.src_ipv6", FT_IPv6, BASE_NONE, NULL, 0x0, "", HFILL}
        },
        {       /* IPv6 Destination Address */
                &hf_cst_pkt_class_rule_dest_ipv6,
-               {"IPv6 Destination Address", "wimax.cst.pkt_class_rule.dst_ipv6", FT_IPv6, BASE_NONE, NULL, 0x0, "", HFILL}
+               {"IPv6 Destination Address", "wmx.cst.pkt_class_rule.dst_ipv6", FT_IPv6, BASE_NONE, NULL, 0x0, "", HFILL}
        },
        {       /* IPv6 Mask */
                &hf_cst_pkt_class_rule_mask_ipv6,
-               {"IPv6 Mask", "wimax.cst.pkt_class_rule.mask_ipv6", FT_IPv6, BASE_NONE, NULL, 0x0, "", HFILL}
+               {"IPv6 Mask", "wmx.cst.pkt_class_rule.mask_ipv6", FT_IPv6, BASE_NONE, NULL, 0x0, "", HFILL}
        },
        {       /* Protocol Source Port Range */
                &hf_cst_pkt_class_rule_prot_src_port_range,
-               {"Protocol Source Port Range", "wimax.cst.pkt_class_rule.prot_src_port_range", FT_BYTES, BASE_HEX, NULL, 0x0, "", HFILL}
+               {"Protocol Source Port Range", "wmx.cst.pkt_class_rule.prot_src_port_range", FT_BYTES, BASE_HEX, NULL, 0x0, "", HFILL}
        },
        {       /* Src-Port Low */
                &hf_cst_pkt_class_rule_src_port_low,
-               {"Src-Port Low", "wimax.cst.pkt_class_rule.src_port_low", FT_UINT16, BASE_DEC, NULL, 0x0, "", HFILL}
+               {"Src-Port Low", "wmx.cst.pkt_class_rule.src_port_low", FT_UINT16, BASE_DEC, NULL, 0x0, "", HFILL}
        },
        {       /* Src-Port High */
                &hf_cst_pkt_class_rule_src_port_high,
-               {"Src-Port High", "wimax.cst.pkt_class_rule.src_port_high", FT_UINT16, BASE_DEC, NULL, 0x0, "", HFILL}
+               {"Src-Port High", "wmx.cst.pkt_class_rule.src_port_high", FT_UINT16, BASE_DEC, NULL, 0x0, "", HFILL}
        },
        {       /* Protocol Destination Port Range */
                &hf_cst_pkt_class_rule_prot_dest_port_range,
-               {"Protocol Destination Port Range", "wimax.cst.pkt_class_rule.prot_dest_port_range", FT_BYTES, BASE_HEX, NULL, 0x0, "", HFILL}
+               {"Protocol Destination Port Range", "wmx.cst.pkt_class_rule.prot_dest_port_range", FT_BYTES, BASE_HEX, NULL, 0x0, "", HFILL}
        },
        {       /* Dst-Port Low */
                &hf_cst_pkt_class_rule_dest_port_low,
-               {"Dst-Port Low", "wimax.cst.pkt_class_rule.dst_port_low", FT_UINT16, BASE_DEC, NULL, 0x0, "", HFILL}
+               {"Dst-Port Low", "wmx.cst.pkt_class_rule.dst_port_low", FT_UINT16, BASE_DEC, NULL, 0x0, "", HFILL}
        },
        {       /* Dst-Port High */
                &hf_cst_pkt_class_rule_dest_port_high,
-               {"Dst-Port High", "wimax.cst.pkt_class_rule.dst_port_high", FT_UINT16, BASE_DEC, NULL, 0x0, "", HFILL}
+               {"Dst-Port High", "wmx.cst.pkt_class_rule.dst_port_high", FT_UINT16, BASE_DEC, NULL, 0x0, "", HFILL}
        },
        {       /* 802.3/Ethernet Destination MAC Address */
                &hf_cst_pkt_class_rule_dest_mac_address,
-               {"802.3/Ethernet Destination MAC Address", "wimax.cst.pkt_class_rule.dest_mac_address", FT_BYTES, BASE_HEX, NULL, 0x0, "", HFILL}
+               {"802.3/Ethernet Destination MAC Address", "wmx.cst.pkt_class_rule.dest_mac_address", FT_BYTES, BASE_HEX, NULL, 0x0, "", HFILL}
        },
        {       /* Destination MAC Address */
                &hf_cst_pkt_class_rule_dest_mac,
-               {"Destination MAC Address", "wimax.cst.pkt_class_rule.dst_mac", FT_ETHER, BASE_NONE, NULL, 0x0, "", HFILL}
+               {"Destination MAC Address", "wmx.cst.pkt_class_rule.dst_mac", FT_ETHER, BASE_NONE, NULL, 0x0, "", HFILL}
        },
        {       /* 802.3/Ethernet Source MAC Address */
                &hf_cst_pkt_class_rule_src_mac_address,
-               {"802.3/Ethernet Source MAC Address", "wimax.cst.pkt_class_rule.src_mac_address", FT_BYTES, BASE_HEX, NULL, 0x0, "", HFILL}
+               {"802.3/Ethernet Source MAC Address", "wmx.cst.pkt_class_rule.src_mac_address", FT_BYTES, BASE_HEX, NULL, 0x0, "", HFILL}
        },
        {       /* Source MAC Address */
                &hf_cst_pkt_class_rule_src_mac,
-               {"Source MAC Address", "wimax.cst.pkt_class_rule.src_mac", FT_ETHER, BASE_NONE, NULL, 0x0, "", HFILL}
+               {"Source MAC Address", "wmx.cst.pkt_class_rule.src_mac", FT_ETHER, BASE_NONE, NULL, 0x0, "", HFILL}
        },
        {       /* MAC Address Mask */
                &hf_cst_pkt_class_rule_mask_mac,
-               {"MAC Address Mask", "wimax.cst.pkt_class_rule.mask_mac", FT_ETHER, BASE_NONE, NULL, 0x0, "", HFILL}
+               {"MAC Address Mask", "wmx.cst.pkt_class_rule.mask_mac", FT_ETHER, BASE_NONE, NULL, 0x0, "", HFILL}
        },
        {       /* Ethertype/IEEE Std 802.2-1998 SAP */
                &hf_cst_pkt_class_rule_ethertype,
-               {"Ethertype/IEEE Std 802.2-1998 SAP", "wimax.cst.pkt_class_rule.ethertype", FT_BYTES, BASE_HEX, NULL, 0x0, "", HFILL}
+               {"Ethertype/IEEE Std 802.2-1998 SAP", "wmx.cst.pkt_class_rule.ethertype", FT_BYTES, BASE_HEX, NULL, 0x0, "", HFILL}
        },
        {       /* Ethertype */
                &hf_cst_pkt_class_rule_etype,
-               {"Ethertype", "wimax.cst.pkt_class_rule.ethertype", FT_UINT8, BASE_DEC, NULL, 0x0, "", HFILL}
+               {"Ethertype", "wmx.cst.pkt_class_rule.ethertype", FT_UINT8, BASE_DEC, NULL, 0x0, "", HFILL}
        },
        {       /* Eprot1 */
                &hf_cst_pkt_class_rule_eprot1,
-               {"Eprot1", "wimax.cst.pkt_class_rule.eprot1", FT_UINT8, BASE_HEX, NULL, 0x0, "", HFILL}
+               {"Eprot1", "wmx.cst.pkt_class_rule.eprot1", FT_UINT8, BASE_HEX, NULL, 0x0, "", HFILL}
        },
        {       /* Eprot2 */
                &hf_cst_pkt_class_rule_eprot2,
-               {"Eprot2", "wimax.cst.pkt_class_rule.eprot2", FT_UINT8, BASE_HEX, NULL, 0x0, "", HFILL}
+               {"Eprot2", "wmx.cst.pkt_class_rule.eprot2", FT_UINT8, BASE_HEX, NULL, 0x0, "", HFILL}
        },
        {       /* IEEE Std 802.1D-1998 User_Priority */
                &hf_cst_pkt_class_rule_user_priority,
-               {"IEEE Std 802.1D-1998 User_Priority", "wimax.cst.pkt_class_rule.user_priority", FT_BYTES, BASE_HEX, NULL, 0x0, "", HFILL}
+               {"IEEE Std 802.1D-1998 User_Priority", "wmx.cst.pkt_class_rule.user_priority", FT_BYTES, BASE_HEX, NULL, 0x0, "", HFILL}
        },
        {
                &hf_cst_pkt_class_rule_pri_low,
-               {"Pri-Low", "wimax.cst.pkt_class_rule.pri-low", FT_UINT8, BASE_DEC, NULL, 0x0, "", HFILL}
+               {"Pri-Low", "wmx.cst.pkt_class_rule.pri-low", FT_UINT8, BASE_DEC, NULL, 0x0, "", HFILL}
        },
        {
                &hf_cst_pkt_class_rule_pri_high,
-               {"Pri-High", "wimax.cst.pkt_class_rule.pri-high", FT_UINT8, BASE_DEC, NULL, 0x0, "", HFILL}
+               {"Pri-High", "wmx.cst.pkt_class_rule.pri-high", FT_UINT8, BASE_DEC, NULL, 0x0, "", HFILL}
        },
        {       /* IEEE Std 802.1Q-1998 VLAN_ID */
                &hf_cst_pkt_class_rule_vlan_id,
-               {"IEEE Std 802.1Q-1998 VLAN_ID", "wimax.cst.pkt_class_rule.vlan_id", FT_BYTES, BASE_HEX, NULL, 0x0, "", HFILL}
+               {"IEEE Std 802.1Q-1998 VLAN_ID", "wmx.cst.pkt_class_rule.vlan_id", FT_BYTES, BASE_HEX, NULL, 0x0, "", HFILL}
        },
        {       /* Vlan_Id1 */
                &hf_cst_pkt_class_rule_vlan_id1,
-               {"Vlan_Id1", "wimax.cst.pkt_class_rule.vlan_id1", FT_UINT8, BASE_HEX, NULL, 0x0, "", HFILL}
+               {"Vlan_Id1", "wmx.cst.pkt_class_rule.vlan_id1", FT_UINT8, BASE_HEX, NULL, 0x0, "", HFILL}
        },
        {       /* Vlan_Id2 */
                &hf_cst_pkt_class_rule_vlan_id2,
-               {"Vlan_Id2", "wimax.cst.pkt_class_rule.vlan_id2", FT_UINT8, BASE_HEX, NULL, 0x0, "", HFILL}
+               {"Vlan_Id2", "wmx.cst.pkt_class_rule.vlan_id2", FT_UINT8, BASE_HEX, NULL, 0x0, "", HFILL}
        },
        {       /* Associated PHSI */
                &hf_cst_pkt_class_rule_phsi,
-               {"Associated PHSI", "wimax.cst.pkt_class_rule.phsi", FT_UINT8, BASE_DEC, NULL, 0x0, "", HFILL}
+               {"Associated PHSI", "wmx.cst.pkt_class_rule.phsi", FT_UINT8, BASE_DEC, NULL, 0x0, "", HFILL}
        },
        {       /* Packet Classifier Rule Index */
                &hf_cst_pkt_class_rule_index,
-               {"Packet Classifier Rule Index (PCRI)", "wimax.cst.pkt_class_rule.index", FT_UINT16, BASE_DEC, NULL, 0x0, "", HFILL}
+               {"Packet Classifier Rule Index (PCRI)", "wmx.cst.pkt_class_rule.index", FT_UINT16, BASE_DEC, NULL, 0x0, "", HFILL}
        },
        {       /* Large Context ID for ROHC/ECRTP Compressed Packet or ROHC Feedback Packet */
                &hf_cst_large_context_id,
-               {"Large Context ID", "wimax.cst.large_context_id", FT_UINT16, BASE_DEC, NULL, 0x0, "", HFILL}
+               {"Large Context ID", "wmx.cst.large_context_id", FT_UINT16, BASE_DEC, NULL, 0x0, "", HFILL}
        },
        {       /* Short-Format Context ID for ROHC/ECRTP Compressed Packet or ROHC Feedback Packet */
                &hf_cst_short_format_context_id,
-               {"Short-Format Context ID", "wimax.cst.short_format_context_id", FT_UINT16, BASE_DEC, NULL, 0x0, "", HFILL}
+               {"Short-Format Context ID", "wmx.cst.short_format_context_id", FT_UINT16, BASE_DEC, NULL, 0x0, "", HFILL}
        },
        {       /* Vendor-Specific Classifier Parameters */
                &hf_cst_pkt_class_rule_vendor_spec,
-               {"Vendor-Specific Classifier Parameters", "wimax.cst.pkt_class_rule.vendor_spec", FT_BYTES, BASE_HEX, NULL, 0x0, "", HFILL}
+               {"Vendor-Specific Classifier Parameters", "wmx.cst.pkt_class_rule.vendor_spec", FT_BYTES, BASE_HEX, NULL, 0x0, "", HFILL}
        },
        {       /* Classifier Action Rule */
                &hf_cst_pkt_class_rule_classifier_action_rule,
-               {"Classifier Action Rule", "wimax.cst.pkt_class_rule.classifier.action.rule", FT_UINT8, BASE_HEX, NULL, 0x0, "", HFILL}
+               {"Classifier Action Rule", "wmx.cst.pkt_class_rule.classifier.action.rule", FT_UINT8, BASE_HEX, NULL, 0x0, "", HFILL}
        },
        {
                &hf_cst_pkt_class_rule_classifier_action_rule_bit0,
-               {"Bit #0", "wimax.cst.pkt_class_rule.classifier.action.rule.bit0", FT_UINT8, BASE_HEX, VALS(vals_classification_action_rule), CST_PKT_CLASS_RULE_CLASSIFIER_ACTION_RULE_BIT0, "", HFILL}
+               {"Bit #0", "wmx.cst.pkt_class_rule.classifier.action.rule.bit0", FT_UINT8, BASE_HEX, VALS(vals_classification_action_rule), CST_PKT_CLASS_RULE_CLASSIFIER_ACTION_RULE_BIT0, "", HFILL}
        },
        {
                &hf_cst_pkt_class_rule_classifier_action_rule_bit1,
-               {"Reserved", "wimax.cst.pkt_class_rule.classifier.action.rule.reserved", FT_UINT8, BASE_HEX, NULL, CST_PKT_CLASS_RULE_CLASSIFIER_ACTION_RULE_RSV, "", HFILL}
+               {"Reserved", "wmx.cst.pkt_class_rule.classifier.action.rule.reserved", FT_UINT8, BASE_HEX, NULL, CST_PKT_CLASS_RULE_CLASSIFIER_ACTION_RULE_RSV, "", HFILL}
        },
        {       /* PHS DSC action */
                &hf_cst_phs_dsc_action,
-               {"PHS DSC action", "wimax.cst.phs_dsc_action", FT_UINT8, BASE_DEC, VALS(vals_cst_phs_dsc_action), 0x0, "", HFILL}
+               {"PHS DSC action", "wmx.cst.phs_dsc_action", FT_UINT8, BASE_DEC, VALS(vals_cst_phs_dsc_action), 0x0, "", HFILL}
        },
        {       /* PHS Rule */
                &hf_cst_phs_rule,
-               {"PHS Rule", "wimax.cst.phs_rule", FT_BYTES, BASE_HEX, NULL, 0x0, "", HFILL}
+               {"PHS Rule", "wmx.cst.phs_rule", FT_BYTES, BASE_HEX, NULL, 0x0, "", HFILL}
        },
        {       /* PHS Rule 1 */
                &hf_cst_phs_phsi,
-               {"PHSI", "wimax.cst.phs_rule.phsi", FT_UINT8, BASE_DEC, NULL, 0x0, "", HFILL}
+               {"PHSI", "wmx.cst.phs_rule.phsi", FT_UINT8, BASE_DEC, NULL, 0x0, "", HFILL}
        },
        {       /* PHS Rule 2 */
                &hf_cst_phs_phsf,
-               {"PHSF", "wimax.cst.phs_rule.phsf", FT_BYTES, BASE_HEX, NULL, 0x0, "", HFILL}
+               {"PHSF", "wmx.cst.phs_rule.phsf", FT_BYTES, BASE_HEX, NULL, 0x0, "", HFILL}
        },
        {       /* PHS Rule 3 */
                &hf_cst_phs_phsm,
-               {"PHSM (bit x: 0-don't suppress the (x+1) byte; 1-suppress the (x+1) byte)", "wimax.cst.phs_rule.phsm", FT_BYTES, BASE_HEX, NULL, 0x0, "", HFILL}
+               {"PHSM (bit x: 0-don't suppress the (x+1) byte; 1-suppress the (x+1) byte)", "wmx.cst.phs_rule.phsm", FT_BYTES, BASE_HEX, NULL, 0x0, "", HFILL}
        },
        {       /* PHS Rule 4 */
                &hf_cst_phs_phss,
-               {"PHSS", "wimax.cst.phs_rule.phss", FT_UINT8, BASE_DEC, NULL, 0x0, "", HFILL}
+               {"PHSS", "wmx.cst.phs_rule.phss", FT_UINT8, BASE_DEC, NULL, 0x0, "", HFILL}
        },
        {       /* PHS Rule 5 */
                &hf_cst_phs_phsv,
-               {"PHSV", "wimax.cst.phs_rule.phsv", FT_UINT8, BASE_DEC, VALS(vals_verify), 0x0, "", HFILL}
+               {"PHSV", "wmx.cst.phs_rule.phsv", FT_UINT8, BASE_DEC, VALS(vals_verify), 0x0, "", HFILL}
        },
        {       /* PHS Rule 143 */
                &hf_cst_phs_vendor_spec,
-               {"Vendor-Specific PHS Parameters", "wimax.cst.phs.vendor_spec", FT_BYTES, BASE_HEX, NULL, 0x0, "", HFILL}
+               {"Vendor-Specific PHS Parameters", "wmx.cst.phs.vendor_spec", FT_BYTES, BASE_HEX, NULL, 0x0, "", HFILL}
        },
        {       /* IPv6 Flow Label */
                &hf_cst_pkt_class_rule_ipv6_flow_label,
-               {"IPv6 Flow Label", "wimax.cst.pkt_class_rule.ipv6_flow_label", FT_UINT24, BASE_HEX, NULL, 0x0, "", HFILL}
+               {"IPv6 Flow Label", "wmx.cst.pkt_class_rule.ipv6_flow_label", FT_UINT24, BASE_HEX, NULL, 0x0, "", HFILL}
        },
        {       /* ATM Switching Encoding */
                &hf_csper_atm_switching_encoding,
-               {"ATM Switching Encoding", "wimax.csper.atm_switching_encoding", FT_UINT8, BASE_DEC, VALS(vals_atm_switching_encodings), 0x0, "", HFILL}
+               {"ATM Switching Encoding", "wmx.csper.atm_switching_encoding", FT_UINT8, BASE_DEC, VALS(vals_atm_switching_encodings), 0x0, "", HFILL}
        },
        {       /* ATM Classifier TLV */
                &hf_csper_atm_classifier,
-               {"ATM Classifier TLV", "wimax.csper.atm_classifier", FT_BYTES, BASE_HEX, NULL, 0x0, "", HFILL}
+               {"ATM Classifier TLV", "wmx.csper.atm_classifier", FT_BYTES, BASE_HEX, NULL, 0x0, "", HFILL}
        },
        {       /* ATM VPI Classifier */
                &hf_csper_atm_classifier_vpi,
-               {"VPI Classifier", "wimax.csper.atm_classifier_vpi", FT_UINT16, BASE_HEX, NULL, 0x0, "", HFILL}
+               {"VPI Classifier", "wmx.csper.atm_classifier_vpi", FT_UINT16, BASE_HEX, NULL, 0x0, "", HFILL}
        },
        {       /* ATM VCI Classifier */
                &hf_csper_atm_classifier_vci,
-               {"VCI Classifier", "wimax.csper.atm_classifier_vci", FT_UINT16, BASE_HEX, NULL, 0x0, "", HFILL}
+               {"VCI Classifier", "wmx.csper.atm_classifier_vci", FT_UINT16, BASE_HEX, NULL, 0x0, "", HFILL}
        },
        {       /* ATM Classifier ID */
                &hf_csper_atm_classifier_id,
-               {"Classifier ID", "wimax.csper.atm_classifier_tlv", FT_UINT16, BASE_DEC, NULL, 0x0, "", HFILL}
+               {"Classifier ID", "wmx.csper.atm_classifier_tlv", FT_UINT16, BASE_DEC, NULL, 0x0, "", HFILL}
        },
 /* unknown types */
        {       /* unknown CSPER types */
                &hf_csper_unknown_type,
-               {"Unknown CSPER TLV type", "wimax.csper.unknown_type", FT_BYTES, BASE_HEX, NULL, 0x0, "", HFILL}
+               {"Unknown CSPER TLV type", "wmx.csper.unknown_type", FT_BYTES, BASE_HEX, NULL, 0x0, "", HFILL}
        },
        {
                &hf_cst_invalid_tlv,
-               {"Invalid TLV", "wimax.cst.invalid_tlv", FT_BYTES, BASE_HEX, NULL, 0x0, "", HFILL}
+               {"Invalid TLV", "wmx.cst.invalid_tlv", FT_BYTES, BASE_HEX, NULL, 0x0, "", HFILL}
        }
 };
 
@@ -1147,27 +1147,27 @@ static hf_register_info hf_xmac[] =
 {
        {
                &hf_xmac_tuple_rsvd,
-               {"Reserved", "wimax.xmac_tuple.reserved", FT_UINT8, BASE_HEX, NULL, XMAC_TUPLE_RESERVED, "", HFILL}
+               {"Reserved", "wmx.xmac_tuple.reserved", FT_UINT8, BASE_HEX, NULL, XMAC_TUPLE_RESERVED, "", HFILL}
        },
        {
                &hf_xmac_tuple_key_seq_num,
-               {"Key Sequence Number", "wimax.xmac_tuple.key_sn", FT_UINT8, BASE_DEC, NULL, XMAC_TUPLE_KEY_SEQ_NUM, "", HFILL}
+               {"Key Sequence Number", "wmx.xmac_tuple.key_sn", FT_UINT8, BASE_DEC, NULL, XMAC_TUPLE_KEY_SEQ_NUM, "", HFILL}
        },
        {
                &hf_hmac_tuple_hmac_digest,
-               {"HMAC Digest", "wimax.xmac_tuple.hmac_digest", FT_BYTES, BASE_HEX, NULL, 0x0, "", HFILL}
+               {"HMAC Digest", "wmx.xmac_tuple.hmac_digest", FT_BYTES, BASE_HEX, NULL, 0x0, "", HFILL}
        },
        {
                &hf_cmac_tuple_bsid,
-               {"BSID", "wimax.cmac_tuple.bsid", FT_ETHER, BASE_HEX, NULL, 0x0, "", HFILL}
+               {"BSID", "wmx.cmac_tuple.bsid", FT_ETHER, BASE_HEX, NULL, 0x0, "", HFILL}
        },
        {
                &hf_cmac_tuple_cmac_value,
-               {"CMAC Value", "wimax.cmac_tuple.cmac.value", FT_BYTES, BASE_HEX, NULL, 0x0, "", HFILL}
+               {"CMAC Value", "wmx.cmac_tuple.cmac.value", FT_BYTES, BASE_HEX, NULL, 0x0, "", HFILL}
        },
        {
                &hf_packet_number_counter,
-               {"Packet Number Counter", "wimax.xmac_tuple.packet_number_count", FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL}
+               {"Packet Number Counter", "wmx.xmac_tuple.packet_number_count", FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL}
        }
 };
 
@@ -1228,111 +1228,111 @@ static hf_register_info hf_snp[] =
 {
        {       /* 11.8.4.1 */
                &hf_snp_pkm_version_support,
-               {"PKM Version Support", "wimax.security_negotiation_parameters.pkm_version_support",FT_UINT8, BASE_HEX, NULL, 0x0, "", HFILL}
+               {"PKM Version Support", "wmx.security_negotiation_parameters.pkm_version_support",FT_UINT8, BASE_HEX, NULL, 0x0, "", HFILL}
        },
        {
                &hf_snp_pkm_version_support_bit0,
-               {"PKM version 1", "wimax.security_negotiation_parameters.pkm_version_support.bit0",FT_BOOLEAN, 8, TFS(&tfs_supported), SNP_PKM_VERSION_SUPPORT_BIT0, "", HFILL}
+               {"PKM version 1", "wmx.security_negotiation_parameters.pkm_version_support.bit0",FT_BOOLEAN, 8, TFS(&tfs_supported), SNP_PKM_VERSION_SUPPORT_BIT0, "", HFILL}
        },
        {
                &hf_snp_pkm_version_support_bit1,
-               {"PKM version 2", "wimax.security_negotiation_parameters.pkm_version_support.bit1",FT_BOOLEAN, 8, TFS(&tfs_supported), SNP_PKM_VERSION_SUPPORT_BIT1, "", HFILL}
+               {"PKM version 2", "wmx.security_negotiation_parameters.pkm_version_support.bit1",FT_BOOLEAN, 8, TFS(&tfs_supported), SNP_PKM_VERSION_SUPPORT_BIT1, "", HFILL}
        },
        {
                &hf_snp_pkm_version_support_reserved,
-               {"Reserved", "wimax.security_negotiation_parameters.pkm_version_support.reserved",FT_UINT8, BASE_HEX, NULL, SNP_PKM_VERSION_SUPPORT_RSV, "", HFILL}
+               {"Reserved", "wmx.security_negotiation_parameters.pkm_version_support.reserved",FT_UINT8, BASE_HEX, NULL, SNP_PKM_VERSION_SUPPORT_RSV, "", HFILL}
        },
        {       /* 11.8.4.2 */
                &hf_snp_auth_policy_support,
-               {"Authorization Policy Support", "wimax.security_negotiation_parameters.auth_policy_support",FT_UINT8, BASE_HEX, NULL, 0x0, "", HFILL}
+               {"Authorization Policy Support", "wmx.security_negotiation_parameters.auth_policy_support",FT_UINT8, BASE_HEX, NULL, 0x0, "", HFILL}
        },
        {
                &hf_snp_auth_policy_support_bit0,
-               {"RSA-based Authorization At The Initial Network Entry", "wimax.security_negotiation_parameters.auth_policy_support.bit0",FT_BOOLEAN, 8, TFS(&tfs_supported), SNP_AUTH_POLICY_SUPPORT_BIT0, "", HFILL}
+               {"RSA-based Authorization At The Initial Network Entry", "wmx.security_negotiation_parameters.auth_policy_support.bit0",FT_BOOLEAN, 8, TFS(&tfs_supported), SNP_AUTH_POLICY_SUPPORT_BIT0, "", HFILL}
        },
        {
                &hf_snp_auth_policy_support_bit1,
-               {"EAP-based Authorization At The Initial Network Entry", "wimax.security_negotiation_parameters.auth_policy_support.bit1",FT_BOOLEAN, 8, TFS(&tfs_supported), SNP_AUTH_POLICY_SUPPORT_BIT1, "", HFILL}
+               {"EAP-based Authorization At The Initial Network Entry", "wmx.security_negotiation_parameters.auth_policy_support.bit1",FT_BOOLEAN, 8, TFS(&tfs_supported), SNP_AUTH_POLICY_SUPPORT_BIT1, "", HFILL}
        },
        {
                &hf_snp_auth_policy_support_bit2,
-               {"Authenticated EAP-based Authorization At The Initial Network Entry", "wimax.security_negotiation_parameters.auth_policy_support.bit2",FT_BOOLEAN, 8, TFS(&tfs_supported), SNP_AUTH_POLICY_SUPPORT_BIT2, "", HFILL}
+               {"Authenticated EAP-based Authorization At The Initial Network Entry", "wmx.security_negotiation_parameters.auth_policy_support.bit2",FT_BOOLEAN, 8, TFS(&tfs_supported), SNP_AUTH_POLICY_SUPPORT_BIT2, "", HFILL}
        },
        {
                &hf_snp_auth_policy_support_bit3,
-               {"Reserved", "wimax.security_negotiation_parameters.auth_policy_support.bit3",FT_UINT8, BASE_HEX, NULL, SNP_AUTH_POLICY_SUPPORT_BIT3, "", HFILL}
+               {"Reserved", "wmx.security_negotiation_parameters.auth_policy_support.bit3",FT_UINT8, BASE_HEX, NULL, SNP_AUTH_POLICY_SUPPORT_BIT3, "", HFILL}
        },
        {
                &hf_snp_auth_policy_support_bit4,
-               {"RSA-based Authorization At Re-entry", "wimax.security_negotiation_parameters.auth_policy_support.bit4",FT_BOOLEAN, 8, TFS(&tfs_supported), SNP_AUTH_POLICY_SUPPORT_BIT4, "", HFILL}
+               {"RSA-based Authorization At Re-entry", "wmx.security_negotiation_parameters.auth_policy_support.bit4",FT_BOOLEAN, 8, TFS(&tfs_supported), SNP_AUTH_POLICY_SUPPORT_BIT4, "", HFILL}
        },
        {
                &hf_snp_auth_policy_support_bit5,
-               {"EAP-based Authorization At Re-entry", "wimax.security_negotiation_parameters.auth_policy_support.bit5",FT_BOOLEAN, 8, TFS(&tfs_supported), SNP_AUTH_POLICY_SUPPORT_BIT5, "", HFILL}
+               {"EAP-based Authorization At Re-entry", "wmx.security_negotiation_parameters.auth_policy_support.bit5",FT_BOOLEAN, 8, TFS(&tfs_supported), SNP_AUTH_POLICY_SUPPORT_BIT5, "", HFILL}
        },
        {
                &hf_snp_auth_policy_support_bit6,
-               {"Authenticated EAP-based Authorization At Re-entry", "wimax.security_negotiation_parameters.auth_policy_support.bit6",FT_BOOLEAN, 8, TFS(&tfs_supported), SNP_AUTH_POLICY_SUPPORT_BIT6, "", HFILL}
+               {"Authenticated EAP-based Authorization At Re-entry", "wmx.security_negotiation_parameters.auth_policy_support.bit6",FT_BOOLEAN, 8, TFS(&tfs_supported), SNP_AUTH_POLICY_SUPPORT_BIT6, "", HFILL}
        },
        {
                &hf_snp_auth_policy_support_bit7,
-               {"Reserved", "wimax.security_negotiation_parameters.auth_policy_support.bit7",FT_UINT8, BASE_HEX, NULL, SNP_AUTH_POLICY_SUPPORT_BIT7, "", HFILL}
+               {"Reserved", "wmx.security_negotiation_parameters.auth_policy_support.bit7",FT_UINT8, BASE_HEX, NULL, SNP_AUTH_POLICY_SUPPORT_BIT7, "", HFILL}
        },
        {       /* 11.8.4.3 */
                &hf_snp_mac_mode,
-               {"MAC (Message Authentication Code) Mode", "wimax.security_negotiation_parameters.mac_mode",FT_UINT8, BASE_HEX, NULL, 0x0, "", HFILL}
+               {"MAC (Message Authentication Code) Mode", "wmx.security_negotiation_parameters.mac_mode",FT_UINT8, BASE_HEX, NULL, 0x0, "", HFILL}
        },
        {
                &hf_snp_mac_mode_bit0,
-               {"HMAC", "wimax.security_negotiation_parameters.mac_mode.bit0",FT_BOOLEAN, 8, TFS(&tfs_supported), SNP_MAC_MODE_BIT0, "", HFILL}
+               {"HMAC", "wmx.security_negotiation_parameters.mac_mode.bit0",FT_BOOLEAN, 8, TFS(&tfs_supported), SNP_MAC_MODE_BIT0, "", HFILL}
        },
        {
                &hf_snp_mac_mode_bit1,
-               {"CMAC", "wimax.security_negotiation_parameters.mac_mode.bit1",FT_BOOLEAN, 8, TFS(&tfs_supported), SNP_MAC_MODE_BIT1, "", HFILL}
+               {"CMAC", "wmx.security_negotiation_parameters.mac_mode.bit1",FT_BOOLEAN, 8, TFS(&tfs_supported), SNP_MAC_MODE_BIT1, "", HFILL}
        },
        {
                &hf_snp_mac_mode_bit1_rsvd,
-               {"Reserved", "wimax.security_negotiation_parameters.mac_mode.bit1_rsvd",FT_BOOLEAN, 8, TFS(&tfs_supported), SNP_MAC_MODE_BIT1, "", HFILL}
+               {"Reserved", "wmx.security_negotiation_parameters.mac_mode.bit1_rsvd",FT_BOOLEAN, 8, TFS(&tfs_supported), SNP_MAC_MODE_BIT1, "", HFILL}
        },
        {
                &hf_snp_mac_mode_bit2,
-               {"64-bit Short-HMAC", "wimax.security_negotiation_parameters.mac_mode.bit2",FT_BOOLEAN, 8, TFS(&tfs_supported), SNP_MAC_MODE_BIT2, "", HFILL}
+               {"64-bit Short-HMAC", "wmx.security_negotiation_parameters.mac_mode.bit2",FT_BOOLEAN, 8, TFS(&tfs_supported), SNP_MAC_MODE_BIT2, "", HFILL}
        },
        {
                &hf_snp_mac_mode_bit3,
-               {"80-bit Short-HMAC", "wimax.security_negotiation_parameters.mac_mode.bit3",FT_BOOLEAN, 8, TFS(&tfs_supported), SNP_MAC_MODE_BIT3, "", HFILL}
+               {"80-bit Short-HMAC", "wmx.security_negotiation_parameters.mac_mode.bit3",FT_BOOLEAN, 8, TFS(&tfs_supported), SNP_MAC_MODE_BIT3, "", HFILL}
        },
        {
                &hf_snp_mac_mode_bit4,
-               {"96-bit Short-HMAC", "wimax.security_negotiation_parameters.mac_mode.bit4",FT_BOOLEAN, 8, TFS(&tfs_supported), SNP_MAC_MODE_BIT4, "", HFILL}
+               {"96-bit Short-HMAC", "wmx.security_negotiation_parameters.mac_mode.bit4",FT_BOOLEAN, 8, TFS(&tfs_supported), SNP_MAC_MODE_BIT4, "", HFILL}
        },
        {
                &hf_snp_mac_mode_bit5,
-               {"CMAC", "wimax.security_negotiation_parameters.mac_mode.bit5",FT_BOOLEAN, 8, TFS(&tfs_supported), SNP_MAC_MODE_BIT5, "", HFILL}
+               {"CMAC", "wmx.security_negotiation_parameters.mac_mode.bit5",FT_BOOLEAN, 8, TFS(&tfs_supported), SNP_MAC_MODE_BIT5, "", HFILL}
        },
        {
                &hf_snp_mac_mode_reserved,
-               {"Reserved", "wimax.security_negotiation_parameters.mac_mode.reserved",FT_UINT8, BASE_HEX, NULL, SNP_MAC_MODE_RSV, "", HFILL}
+               {"Reserved", "wmx.security_negotiation_parameters.mac_mode.reserved",FT_UINT8, BASE_HEX, NULL, SNP_MAC_MODE_RSV, "", HFILL}
        },
        {
                &hf_snp_mac_mode_reserved1,
-               {"Reserved", "wimax.security_negotiation_parameters.mac_mode.reserved",FT_UINT8, BASE_HEX, NULL, SNP_MAC_MODE_RSV1, "", HFILL}
+               {"Reserved", "wmx.security_negotiation_parameters.mac_mode.reserved",FT_UINT8, BASE_HEX, NULL, SNP_MAC_MODE_RSV1, "", HFILL}
        },
        {       /* 11.8.4.4 */
                &hf_snp_pn_window_size,
-               {"PN Window Size", "wimax.security_negotiation_parameters.pn_window_size",FT_UINT16, BASE_DEC, NULL, 0x0, "", HFILL}
+               {"PN Window Size", "wmx.security_negotiation_parameters.pn_window_size",FT_UINT16, BASE_DEC, NULL, 0x0, "", HFILL}
        },
        {       /* 11.8.4.5 */
                &hf_snp_max_conc_transactions,
-               {"Maximum concurrent transactions (0 indicates no limit)", "wimax.security_negotiation_parameters.max_conc_transactions",FT_UINT8, BASE_DEC, NULL, 0x0, "", HFILL}
+               {"Maximum concurrent transactions (0 indicates no limit)", "wmx.security_negotiation_parameters.max_conc_transactions",FT_UINT8, BASE_DEC, NULL, 0x0, "", HFILL}
        },
        {       /* 11.8.4.6 */
                &hf_snp_max_suppt_sec_assns,
-               {"Maximum number of security associations supported by the SS", "wimax.security_negotiation_parameters.max_suppt_sec_assns",FT_UINT8, BASE_DEC, NULL, 0x0, "", HFILL}
+               {"Maximum number of security associations supported by the SS", "wmx.security_negotiation_parameters.max_suppt_sec_assns",FT_UINT8, BASE_DEC, NULL, 0x0, "", HFILL}
        },
        {
                &hf_snp_unknown_type,
-               {"Unknown Security Negotiation Parameter type", "wimax.security_negotiation_parameters.unknown.type",FT_BYTES, BASE_HEX, NULL, 0x0,     "", HFILL}
+               {"Unknown Security Negotiation Parameter type", "wmx.security_negotiation_parameters.unknown.type",FT_BYTES, BASE_HEX, NULL, 0x0,       "", HFILL}
        }
 };
 
@@ -1390,239 +1390,239 @@ static hf_register_info hf_pkm[] =
 {
        {       /* 11.9.1 - type 6 */
                &hf_pkm_msg_attr_display,
-               {"Display String", "wimax.pkm_msg.pkm_attr.display_string", FT_STRING, BASE_NONE, NULL, 0x0, "", HFILL}
+               {"Display String", "wmx.pkm_msg.pkm_attr.display_string", FT_STRING, BASE_NONE, NULL, 0x0, "", HFILL}
        },
        {       /* 11.9.2 - type 7 */
                &hf_pkm_msg_attr_auth_key,
-               {"Auth Key", "wimax.pkm_msg.pkm_attr.auth_key", FT_BYTES, BASE_HEX, NULL, 0x0, "", HFILL}
+               {"Auth Key", "wmx.pkm_msg.pkm_attr.auth_key", FT_BYTES, BASE_HEX, NULL, 0x0, "", HFILL}
        },
        {       /* 11.9.3 - type 8 */
                &hf_pkm_msg_attr_tek,
-               {"TEK", "wimax.pkm_msg.pkm_attr.tek", FT_BYTES, BASE_HEX, NULL, 0x0, "", HFILL}
+               {"TEK", "wmx.pkm_msg.pkm_attr.tek", FT_BYTES, BASE_HEX, NULL, 0x0, "", HFILL}
        },
        {       /* 11.9.4 - type 9 */
                &hf_pkm_msg_attr_key_life_time,
-               {"Key Lifetime", "wimax.pkm_msg.pkm_attr.key_life_time", FT_UINT32, BASE_HEX, NULL, 0x0, "", HFILL}
+               {"Key Lifetime", "wmx.pkm_msg.pkm_attr.key_life_time", FT_UINT32, BASE_HEX, NULL, 0x0, "", HFILL}
        },
        {       /* 11.9.5 - type 10 */
                &hf_pkm_msg_attr_key_seq_num,
-               {"Key Sequence Number", "wimax.pkm_msg.pkm_attr.key_seq_num", FT_UINT8, BASE_DEC, NULL, 0x0, "", HFILL}
+               {"Key Sequence Number", "wmx.pkm_msg.pkm_attr.key_seq_num", FT_UINT8, BASE_DEC, NULL, 0x0, "", HFILL}
        },
        {       /* 11.9.6 - type 11 */
                &hf_pkm_msg_attr_hmac_digest,
-               {"HMAC-Digest", "wimax.pkm_msg.pkm_attr.hmac_digest", FT_BYTES, BASE_HEX, NULL, 0x0, "", HFILL}
+               {"HMAC-Digest", "wmx.pkm_msg.pkm_attr.hmac_digest", FT_BYTES, BASE_HEX, NULL, 0x0, "", HFILL}
        },
        {       /* 11.9.7 - type 12 */
                &hf_pkm_msg_attr_said,
-               {"SAID", "wimax.pkm_msg.pkm_attr.said", FT_UINT16, BASE_HEX, NULL, 0x0, "", HFILL}
+               {"SAID", "wmx.pkm_msg.pkm_attr.said", FT_UINT16, BASE_HEX, NULL, 0x0, "", HFILL}
        },
 #if 0  /* not been used */
        {       /* 11.9.8 - type 13 */
                &hf_pkm_msg_attr_tek_param,
-               {"TEK Parameters", "wimax.pkm_msg.pkm_attr.tek_parameters", FT_BYTES, BASE_HEX, NULL, 0x0, "", HFILL}
+               {"TEK Parameters", "wmx.pkm_msg.pkm_attr.tek_parameters", FT_BYTES, BASE_HEX, NULL, 0x0, "", HFILL}
        },
 #endif
        {       /* 11.9.9 - type 15 */
                &hf_pkm_msg_attr_cbc_iv,
-               {"CBC IV", "wimax.pkm_msg.pkm_attr.cbc_iv", FT_BYTES, BASE_HEX, NULL, 0x0, "", HFILL}
+               {"CBC IV", "wmx.pkm_msg.pkm_attr.cbc_iv", FT_BYTES, BASE_HEX, NULL, 0x0, "", HFILL}
        },
        {       /* 11.9.10 - type 16 */
                &hf_pkm_msg_attr_error_code,
-               {"Error Code", "wimax.pkm_msg.pkm_attr.error_code", FT_UINT8, BASE_DEC, VALS(vals_pkm_attr_error_codes), 0x0, "", HFILL}
+               {"Error Code", "wmx.pkm_msg.pkm_attr.error_code", FT_UINT8, BASE_DEC, VALS(vals_pkm_attr_error_codes), 0x0, "", HFILL}
        },
        {       /* 11.9.11 - type 17 */
                &hf_pkm_msg_attr_ca_certificate,
-               {"CA Certificate", "wimax.pkm_msg.pkm_attr.ca_certificate", FT_BYTES, BASE_HEX, NULL, 0x0, "", HFILL}
+               {"CA Certificate", "wmx.pkm_msg.pkm_attr.ca_certificate", FT_BYTES, BASE_HEX, NULL, 0x0, "", HFILL}
        },
        {       /* 11.9.12 - type 18 */
                &hf_pkm_msg_attr_ss_certificate,
-               {"SS Certificate", "wimax.pkm_msg.pkm_attr.ss_certificate", FT_BYTES, BASE_HEX, NULL, 0x0, "", HFILL}
+               {"SS Certificate", "wmx.pkm_msg.pkm_attr.ss_certificate", FT_BYTES, BASE_HEX, NULL, 0x0, "", HFILL}
        },
 #if 0  /* not been used */
        {       /* 11.9.13 - type 19 */
                &hf_pkm_msg_attr_security_capabilities,
-               {"Security Capabilities", "wimax.pkm_msg.pkm_attr.security_capabilities", FT_BYTES, BASE_HEX, NULL, 0x0, "", HFILL}
+               {"Security Capabilities", "wmx.pkm_msg.pkm_attr.security_capabilities", FT_BYTES, BASE_HEX, NULL, 0x0, "", HFILL}
        },
 #endif
        {       /* 11.9.14 - type 20 */
                &hf_pkm_msg_crypto_suite,
-               {"Cryptography", "wimax.pkm_msg.pkm_attr.crypto_suite", FT_BYTES, BASE_HEX, NULL, 0x0, "", HFILL}
+               {"Cryptography", "wmx.pkm_msg.pkm_attr.crypto_suite", FT_BYTES, BASE_HEX, NULL, 0x0, "", HFILL}
        },
        {
                &hf_pkm_msg_crypto_suite_msb,
-               {"Data Encryption Algorithm Identifiers", "wimax.pkm_msg.pkm_attr.crypto_suite.msb", FT_UINT8, BASE_DEC, VALS(vals_data_encryption_ids), 0x0, "", HFILL}
+               {"Data Encryption Algorithm Identifiers", "wmx.pkm_msg.pkm_attr.crypto_suite.msb", FT_UINT8, BASE_DEC, VALS(vals_data_encryption_ids), 0x0, "", HFILL}
        },
        {
                &hf_pkm_msg_crypto_suite_middle,
-               {"Data Authentication Algorithm Identifiers", "wimax.pkm_msg.pkm_attr.crypto_suite.middle", FT_UINT8, BASE_DEC, VALS(vals_data_authentication_ids), 0x0, "", HFILL}
+               {"Data Authentication Algorithm Identifiers", "wmx.pkm_msg.pkm_attr.crypto_suite.middle", FT_UINT8, BASE_DEC, VALS(vals_data_authentication_ids), 0x0, "", HFILL}
        },
        {
                &hf_pkm_msg_crypto_suite_lsb,
-               {"TEK Encryption Algorithm Identifiers", "wimax.pkm_msg.pkm_attr.crypto_suite.lsb", FT_UINT8, BASE_DEC, VALS(vals_tek_encryption_ids), 0x0, "", HFILL}
+               {"TEK Encryption Algorithm Identifiers", "wmx.pkm_msg.pkm_attr.crypto_suite.lsb", FT_UINT8, BASE_DEC, VALS(vals_tek_encryption_ids), 0x0, "", HFILL}
        },
 #if 0  /* not been used */
        {       /* 11.9.15 - type 21 */
                &hf_pkm_msg_crypto_list,
-               {"Cryptographic-Suite List", "wimax.pkm_msg.pkm_attr.crypto_suite_list", FT_BYTES, BASE_HEX, NULL, 0x0, "", HFILL}
+               {"Cryptographic-Suite List", "wmx.pkm_msg.pkm_attr.crypto_suite_list", FT_BYTES, BASE_HEX, NULL, 0x0, "", HFILL}
        },
 #endif
 #if 0  /* deleted by 802.16E */
        {       /* 11.9.16 - type 22 */
                &hf_pkm_msg_version,
-               {"Reserved ", "wimax.pkm_msg.pkm_attr.version", FT_UINT8, BASE_HEX, NULL, 0x0, "", HFILL}
+               {"Reserved ", "wmx.pkm_msg.pkm_attr.version", FT_UINT8, BASE_HEX, NULL, 0x0, "", HFILL}
        },
 #endif
 #if 0  /* not been used */
        {       /* 11.9.17 - type 23 */
                &hf_pkm_msg_sa_descriptor,
-               {"SA Descriptor", "wimax.pkm_msg.pkm_attr.sa_descriptor", FT_BYTES, BASE_HEX, NULL, 0x0, "", HFILL}
+               {"SA Descriptor", "wmx.pkm_msg.pkm_attr.sa_descriptor", FT_BYTES, BASE_HEX, NULL, 0x0, "", HFILL}
        },
 #endif
        {       /* 11.9.18 - type 24 */
                &hf_pkm_sa_type,
-               {"SA Type", "wimax.pkm_msg.pkm_attr.sa_type", FT_UINT8, BASE_DEC, VALS(vs_sa_type), 0x0, "", HFILL}
+               {"SA Type", "wmx.pkm_msg.pkm_attr.sa_type", FT_UINT8, BASE_DEC, VALS(vs_sa_type), 0x0, "", HFILL}
        },
 #if 0  /* not been used */
        {       /* 11.9.?? - type 25 */
                &hf_pkm_attr_security_negotiation_parameters,
-               {"Security Negotiation Parameters", "wimax.pkm_msg.pkm_attr.security_negotiation_parameters", FT_BYTES, BASE_HEX, NULL, 0x0, "", HFILL}
+               {"Security Negotiation Parameters", "wmx.pkm_msg.pkm_attr.security_negotiation_parameters", FT_BYTES, BASE_HEX, NULL, 0x0, "", HFILL}
        },
 #endif
 #if 0  /* not been used */
        {       /* 11.9.19 - type 27 */
                &hf_pkm_attr_config_settings,
-               {"PKM Configuration Settings", "wimax.pkm_msg.pkm_attr.config_settings", FT_BYTES, BASE_HEX, NULL, 0x0, "", HFILL}
+               {"PKM Configuration Settings", "wmx.pkm_msg.pkm_attr.config_settings", FT_BYTES, BASE_HEX, NULL, 0x0, "", HFILL}
        },
 #endif
        {       /* 11.9.19.1 */
                &hf_pkm_config_settings_authorize_waitout,
-               {"Authorize Wait Timeout (in seconds)", "wimax.pkm_msg.pkm_attr.config_settings.authorize_waitout", FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL}
+               {"Authorize Wait Timeout (in seconds)", "wmx.pkm_msg.pkm_attr.config_settings.authorize_waitout", FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL}
        },
        {       /* 11.9.19.2 */
                &hf_pkm_config_settings_reauthorize_waitout,
-               {"Reauthorize Wait Timeout (in seconds)", "wimax.pkm_msg.pkm_attr.config_settings.reauthorize_waitout", FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL}
+               {"Reauthorize Wait Timeout (in seconds)", "wmx.pkm_msg.pkm_attr.config_settings.reauthorize_waitout", FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL}
        },
        {       /* 11.9.19.3 */
                &hf_pkm_config_settings_grace_time,
-               {"Authorization Grace Time (in seconds)", "wimax.pkm_msg.pkm_attr.config_settings.grace_time", FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL}
+               {"Authorization Grace Time (in seconds)", "wmx.pkm_msg.pkm_attr.config_settings.grace_time", FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL}
        },
        {       /* 11.9.19.4 */
                &hf_pkm_config_settings_operational_waittime,
-               {"Operational Wait Timeout (in seconds)", "wimax.pkm_msg.pkm_attr.config_settings.operational_wait_timeout", FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL}
+               {"Operational Wait Timeout (in seconds)", "wmx.pkm_msg.pkm_attr.config_settings.operational_wait_timeout", FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL}
        },
        {       /* 11.9.19.5 */
                &hf_pkm_config_settings_rekey_wait_timeout,
-               {"Rekey Wait Timeout (in seconds)", "wimax.pkm_msg.pkm_attr.config_settings.rekey_wait_timeout", FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL}
+               {"Rekey Wait Timeout (in seconds)", "wmx.pkm_msg.pkm_attr.config_settings.rekey_wait_timeout", FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL}
        },
        {       /* 11.9.19.6 */
                &hf_pkm_config_settings_tek_grace_time,
-               {"TEK Grace Time (in seconds)", "wimax.pkm_msg.pkm_attr.config_settings.tek_grace_time", FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL}
+               {"TEK Grace Time (in seconds)", "wmx.pkm_msg.pkm_attr.config_settings.tek_grace_time", FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL}
        },
        {       /* 11.9.19.7 */
                &hf_pkm_config_settings_authorize_reject_wait_timeout,
-               {"Authorize Reject Wait Timeout(in seconds)", "wimax.pkm_msg.pkm_attr.config_settings.authorize_reject_wait_timeout", FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL}
+               {"Authorize Reject Wait Timeout(in seconds)", "wmx.pkm_msg.pkm_attr.config_settings.authorize_reject_wait_timeout", FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL}
        },
        {       /* 11.9.20 - type 29 */
                &hf_pkm_attr_nonce,
-               {"Nonce", "wimax.pkm_msg.pkm_attr.nonce", FT_BYTES, BASE_HEX, NULL, 0x0, "", HFILL}
+               {"Nonce", "wmx.pkm_msg.pkm_attr.nonce", FT_BYTES, BASE_HEX, NULL, 0x0, "", HFILL}
        },
        {       /* 11.9.21 - type 33 */
                &hf_pkm_attr_ss_random,
-               {"SS_RANDOM", "wimax.pkm_msg.pkm_attr.ss_random", FT_BYTES, BASE_HEX, NULL, 0x0, "", HFILL}
+               {"SS_RANDOM", "wmx.pkm_msg.pkm_attr.ss_random", FT_BYTES, BASE_HEX, NULL, 0x0, "", HFILL}
        },
        {       /* 11.9.22 - type 34 */
                &hf_pkm_attr_bs_random,
-               {"BS_RANDOM", "wimax.pkm_msg.pkm_attr.bs_random", FT_BYTES, BASE_HEX, NULL, 0x0, "", HFILL}
+               {"BS_RANDOM", "wmx.pkm_msg.pkm_attr.bs_random", FT_BYTES, BASE_HEX, NULL, 0x0, "", HFILL}
        },
        {       /* 11.9.23 - type 35 */
                &hf_pkm_attr_pre_pak,
-               {"Pre-PAK", "wimax.pkm_msg.pkm_attr.pre_pak", FT_BYTES, BASE_HEX, NULL, 0x0, "", HFILL}
+               {"Pre-PAK", "wmx.pkm_msg.pkm_attr.pre_pak", FT_BYTES, BASE_HEX, NULL, 0x0, "", HFILL}
        },
 #if 1  /* no definition */
        {       /* 11.9.?? - type 36 */
                &hf_pkm_attr_pak_ak_seq_number,
-               {"PAK/AK Sequence Number", "wimax.pkm_msg.pkm_attr.pak_ak_seq_number", FT_BYTES, BASE_HEX, NULL, 0x0, "", HFILL}
+               {"PAK/AK Sequence Number", "wmx.pkm_msg.pkm_attr.pak_ak_seq_number", FT_BYTES, BASE_HEX, NULL, 0x0, "", HFILL}
        },
 #endif
        {       /* 11.9.24 - type 37 */
                &hf_pkm_attr_bs_certificate,
-               {"BS Certificate", "wimax.pkm_msg.pkm_attr.bs_certificate", FT_BYTES, BASE_HEX, NULL, 0x0, "", HFILL}
+               {"BS Certificate", "wmx.pkm_msg.pkm_attr.bs_certificate", FT_BYTES, BASE_HEX, NULL, 0x0, "", HFILL}
        },
        {       /* 11.9.25 - type 38 */
                &hf_pkm_attr_sig_bs,
-               {"SigBS", "wimax.pkm_msg.pkm_attr.sig_bs",FT_BYTES, BASE_HEX, NULL, 0x0, "", HFILL}
+               {"SigBS", "wmx.pkm_msg.pkm_attr.sig_bs",FT_BYTES, BASE_HEX, NULL, 0x0, "", HFILL}
        },
        {       /* 11.9.26 - type 39 */
                &hf_pkm_attr_ms_mac_address,
-               {"MS-MAC Address", "wimax.pkm_msg.pkm_attr.ms_mac_address",FT_ETHER, BASE_HEX, NULL, 0x0, "", HFILL}
+               {"MS-MAC Address", "wmx.pkm_msg.pkm_attr.ms_mac_address",FT_ETHER, BASE_HEX, NULL, 0x0, "", HFILL}
        },
        {       /* 11.9.27 - type 40 */
                &hf_pkm_attr_cmac_digest,
-               {"CMAC Digest", "wimax.pkm_msg.pkm_attr.cmac_digest",FT_BYTES, BASE_HEX, NULL, 0x0, "", HFILL}
+               {"CMAC Digest", "wmx.pkm_msg.pkm_attr.cmac_digest",FT_BYTES, BASE_HEX, NULL, 0x0, "", HFILL}
        },
        {
                &hf_pkm_attr_cmac_digest_pn,
-               {"CMAC Packet Number counter, CMAC_PN_*", "wimax.pkm_msg.pkm_attr.cmac_digest.pn",FT_UINT32, BASE_HEX, NULL, 0x0, "", HFILL}
+               {"CMAC Packet Number counter, CMAC_PN_*", "wmx.pkm_msg.pkm_attr.cmac_digest.pn",FT_UINT32, BASE_HEX, NULL, 0x0, "", HFILL}
        },
        {
                &hf_pkm_attr_cmac_digest_value,
-               {"CMAC Value", "wimax.pkm_msg.pkm_attr.cmac_digest.value",FT_BYTES, BASE_HEX, NULL, 0x0, "", HFILL}
+               {"CMAC Value", "wmx.pkm_msg.pkm_attr.cmac_digest.value",FT_BYTES, BASE_HEX, NULL, 0x0, "", HFILL}
        },
        {       /* 11.9.28 - type 41 */
                &hf_pkm_attr_push_modes,
-               {"Key Push Modes", "wimax.pkm_msg.pkm_attr.key_push_modes",FT_UINT8, BASE_DEC, VALS(va_key_push_modes), 0x0, "", HFILL}
+               {"Key Push Modes", "wmx.pkm_msg.pkm_attr.key_push_modes",FT_UINT8, BASE_DEC, VALS(va_key_push_modes), 0x0, "", HFILL}
        },
        {       /* 11.9.29 - type 42 */
                &hf_pkm_attr_key_push_counter,
-               {"Key Push Counter", "wimax.pkm_msg.pkm_attr.key_push_counter",FT_UINT16, BASE_DEC, NULL, 0x0, "", HFILL}
+               {"Key Push Counter", "wmx.pkm_msg.pkm_attr.key_push_counter",FT_UINT16, BASE_DEC, NULL, 0x0, "", HFILL}
        },
        {       /* 11.9.30 - type 43 */
                &hf_pkm_attr_gkek,
-               {"GKEK", "wimax.pkm_msg.pkm_attr.gkek",FT_BYTES, BASE_HEX, NULL, 0x0, "", HFILL}
+               {"GKEK", "wmx.pkm_msg.pkm_attr.gkek",FT_BYTES, BASE_HEX, NULL, 0x0, "", HFILL}
        },
        {       /* 11.9.31 - type 44 */
                &hf_pkm_attr_sig_ss,
-               {"SigSS", "wimax.pkm_msg.pkm_attr.sig_ss",FT_BYTES, BASE_HEX, NULL, 0x0, "", HFILL}
+               {"SigSS", "wmx.pkm_msg.pkm_attr.sig_ss",FT_BYTES, BASE_HEX, NULL, 0x0, "", HFILL}
        },
        {       /* 11.9.32 - type 45 */
                &hf_pkm_attr_akid,
-               {"AKID", "wimax.pkm_msg.pkm_attr.akid",FT_BYTES, BASE_HEX, NULL, 0x0, "", HFILL}
+               {"AKID", "wmx.pkm_msg.pkm_attr.akid",FT_BYTES, BASE_HEX, NULL, 0x0, "", HFILL}
        },
        {       /* 11.9.33 - type 28 */
                &hf_pkm_attr_eap_payload,
-               {"EAP Payload", "wimax.pkm_msg.pkm_attr.eap_payload", FT_BYTES, BASE_HEX, NULL, 0x0, "", HFILL}
+               {"EAP Payload", "wmx.pkm_msg.pkm_attr.eap_payload", FT_BYTES, BASE_HEX, NULL, 0x0, "", HFILL}
        },
        {       /* 11.9.34 - type 30 */
                &hf_pkm_attr_auth_result_code,
-               {"Auth Result Code", "wimax.pkm_msg.pkm_attr.auth_result_code", FT_UINT8, BASE_DEC, VALS(vs_success_reject), 0x0, "", HFILL}
+               {"Auth Result Code", "wmx.pkm_msg.pkm_attr.auth_result_code", FT_UINT8, BASE_DEC, VALS(vs_success_reject), 0x0, "", HFILL}
        },
        {       /* 11.9.35 - type 31 */
                &hf_pkm_attr_sa_service_type,
-               {"SA Service Type", "wimax.pkm_msg.pkm_attr.sa_service_type", FT_UINT8, BASE_DEC, VALS(vs_sa_service_type), 0x0, "", HFILL}
+               {"SA Service Type", "wmx.pkm_msg.pkm_attr.sa_service_type", FT_UINT8, BASE_DEC, VALS(vs_sa_service_type), 0x0, "", HFILL}
        },
 #if 0  /* same as 11.9.19 */
        {       /* 11.9.36 - type 27 */
                &hf_pkm_attr_config_settings,
-               {"PKMv2 Configuration Settings", "wimax.pkm_msg.pkm_attr.config_settings", FT_BYTES, BASE_HEX, NULL, 0x0, "", HFILL}
+               {"PKMv2 Configuration Settings", "wmx.pkm_msg.pkm_attr.config_settings", FT_BYTES, BASE_HEX, NULL, 0x0, "", HFILL}
        },
 #endif
        {       /* 11.9.37 - type 32 */
                &hf_pkm_attr_frame_number,
-               {"Frame Number", "wimax.pkm_msg.pkm_attr.frame_number", FT_UINT24, BASE_DEC, NULL, 0x0, "", HFILL}
+               {"Frame Number", "wmx.pkm_msg.pkm_attr.frame_number", FT_UINT24, BASE_DEC, NULL, 0x0, "", HFILL}
        },
 #if 1  /* no definitions */
        {       /* 11.9.?? - type 46 */
                &hf_pkm_attr_associated_gkek_seq_number,
-               {"Associated GKEK Sequence Number", "wimax.pkm_msg.pkm_attr.associated_gkek_seq_number",FT_BYTES, BASE_HEX, NULL, 0x0, "", HFILL}
+               {"Associated GKEK Sequence Number", "wmx.pkm_msg.pkm_attr.associated_gkek_seq_number",FT_BYTES, BASE_HEX, NULL, 0x0, "", HFILL}
        },
        {       /* 11.9.?? - type 47 */
                &hf_pkm_attr_gkek_params,
-               {"GKEK Parameters", "wimax.pkm_msg.pkm_attr.gkek_params",FT_BYTES, BASE_HEX, NULL, 0x0, "", HFILL}
+               {"GKEK Parameters", "wmx.pkm_msg.pkm_attr.gkek_params",FT_BYTES, BASE_HEX, NULL, 0x0, "", HFILL}
        },
 #endif
        {
                &hf_pkm_msg_unknown_type,
-               {"Unknown Type", "wimax.pkm.unknown.type", FT_BYTES, BASE_HEX, NULL, 0x0, "", HFILL}
+               {"Unknown Type", "wmx.pkm.unknown.type", FT_BYTES, BASE_HEX, NULL, 0x0, "", HFILL}
        }
 };
 
@@ -1639,35 +1639,35 @@ static hf_register_info hf_common_tlv[] =
 {
        {
                &hf_common_tlv_mac_version,
-               { "MAC Version", "wimax.common_tlv.mac_version", FT_UINT8, BASE_DEC, VALS(vals_dcd_mac_version), 0x0, "", HFILL}
+               { "MAC Version", "wmx.common_tlv.mac_version", FT_UINT8, BASE_DEC, VALS(vals_dcd_mac_version), 0x0, "", HFILL}
        },
        {
                &hf_common_tlv_vendor_id,
-               { "Vendor ID Encoding", "wimax.common_tlv.vendor_id_encoding", FT_BYTES, BASE_HEX, NULL, 0x0, "", HFILL}
+               { "Vendor ID Encoding", "wmx.common_tlv.vendor_id_encoding", FT_BYTES, BASE_HEX, NULL, 0x0, "", HFILL}
        },
        {
                &hf_common_tlv_vendor_specific_type,
-               { "Vendor Specific Type", "wimax.common_tlv.vendor_specific_type", FT_UINT8, BASE_HEX, NULL, 0x0, "", HFILL}
+               { "Vendor Specific Type", "wmx.common_tlv.vendor_specific_type", FT_UINT8, BASE_HEX, NULL, 0x0, "", HFILL}
        },
        {
                &hf_common_tlv_vendor_specific_length_size,
                {
-                       "Vendor Specific Length Size", "wimax.common_tlv.vendor_specific_length_size",
+                       "Vendor Specific Length Size", "wmx.common_tlv.vendor_specific_length_size",
                        FT_UINT8, BASE_HEX, NULL, 0x0,
                        "", HFILL
                }
        },
        {
                &hf_common_tlv_vendor_specific_length,
-               { "Vendor Specific Length", "wimax.common_tlv.vendor_specific_length", FT_UINT16, BASE_DEC, NULL, 0x0, "", HFILL}
+               { "Vendor Specific Length", "wmx.common_tlv.vendor_specific_length", FT_UINT16, BASE_DEC, NULL, 0x0, "", HFILL}
        },
        {
                &hf_common_tlv_vendor_specific_value,
-               { "Vendor Specific Value", "wimax.common_tlv.vendor_specific_value", FT_BYTES, BASE_HEX, NULL, 0x0, "", HFILL}
+               { "Vendor Specific Value", "wmx.common_tlv.vendor_specific_value", FT_BYTES, BASE_HEX, NULL, 0x0, "", HFILL}
        },
        {
                &hf_common_tlv_unknown_type,
-               {"Unknown Common TLV Type", "wimax.common_tlv.unknown_type", FT_BYTES, BASE_HEX, NULL, 0x0, "", HFILL}
+               {"Unknown Common TLV Type", "wmx.common_tlv.unknown_type", FT_BYTES, BASE_HEX, NULL, 0x0, "", HFILL}
        }
 };
 
@@ -1679,7 +1679,7 @@ void proto_register_wimax_utility_decoders(void)
                proto_wimax_utility_decoders = proto_register_protocol (
                                                        "WiMax Sub-TLV Messages", /* name */
                                                        "WiMax Sub-TLV (sub)", /* short name */
-                                                       "sub" /* abbrev */
+                                                       "wmx.sub" /* abbrev */
                                                        );
 
                proto_register_subtree_array(ett, array_length(ett));