aboutsummaryrefslogtreecommitdiffstats
path: root/epan
diff options
context:
space:
mode:
authorJoerg Mayer <jmayer@loplof.de>2016-10-16 14:00:41 +0200
committerJörg Mayer <jmayer@loplof.de>2016-10-16 12:03:39 +0000
commit9711d2220ce1584a37e9e7d7df3ebf3c8e57b23d (patch)
treeb8183b36b041aea33dba30c40e3c50570e5b8815 /epan
parentc59f7fc8fec4e8c9fca27053e3c63a93adca3cb5 (diff)
Get rid of wlan_mgt. Handle these elements as part of wlan. The separation was artificial
and irritiating. Change-Id: I45d4c3f5d518466df1d0b88ba6e10226662ee6e1 Reviewed-on: https://code.wireshark.org/review/18214 Reviewed-by: Jörg Mayer <jmayer@loplof.de>
Diffstat (limited to 'epan')
-rw-r--r--epan/dissectors/packet-ieee80211.c2416
1 files changed, 1204 insertions, 1212 deletions
diff --git a/epan/dissectors/packet-ieee80211.c b/epan/dissectors/packet-ieee80211.c
index 59f60eb93c..4a15eafb99 100644
--- a/epan/dissectors/packet-ieee80211.c
+++ b/epan/dissectors/packet-ieee80211.c
@@ -2994,7 +2994,6 @@ static int hf_ieee80211_fragment_count = -1;
static int hf_ieee80211_reassembled_in = -1;
static int hf_ieee80211_reassembled_length = -1;
-static int proto_wlan_mgt = -1;
static int proto_wlan_ext = -1;
/* ************************************************************************* */
@@ -16121,12 +16120,12 @@ dissect_ieee80211_mgt(guint16 fcf, tvbuff_t *tvb, packet_info *pinfo, proto_tree
ieee80211_tvb_invalid = FALSE;
/* check protocol activation */
- if (!proto_is_protocol_enabled(find_protocol_by_id(proto_wlan_mgt))) {
+ if (!proto_is_protocol_enabled(find_protocol_by_id(proto_wlan))) {
call_data_dissector(tvb, pinfo, tree);
return;
}
- ti = proto_tree_add_item(tree, proto_wlan_mgt, tvb, 0, -1, ENC_NA);
+ ti = proto_tree_add_item(tree, proto_wlan, tvb, 0, -1, ENC_NA);
mgt_tree = proto_item_add_subtree(ti, ett_80211_mgt);
switch (COMPOSE_FRAME_TYPE(fcf))
@@ -19361,181 +19360,181 @@ proto_register_ieee80211(void)
NULL, HFILL }},
{&hf_ieee80211_ff_tdls_action_code,
- {"Action code", "wlan_mgt.fixed.action_code",
+ {"Action code", "wlan.fixed.action_code",
FT_UINT8, BASE_DEC|BASE_EXT_STRING, &tdls_action_codes_ext, 0,
"Management action code", HFILL }},
{&hf_ieee80211_ff_target_channel,
- {"Target Channel", "wlan_mgt.fixed.target_channel",
+ {"Target Channel", "wlan.fixed.target_channel",
FT_UINT8, BASE_DEC, NULL, 0,
NULL, HFILL }},
{&hf_ieee80211_ff_operating_class,
- {"Operating Class", "wlan_mgt.fixed.operating_class",
+ {"Operating Class", "wlan.fixed.operating_class",
FT_UINT8, BASE_DEC, NULL, 0,
NULL, HFILL }},
{&hf_ieee80211_ff_wnm_action_code,
- {"Action code", "wlan_mgt.fixed.action_code",
+ {"Action code", "wlan.fixed.action_code",
FT_UINT8, BASE_DEC|BASE_EXT_STRING, &wnm_action_codes_ext, 0,
"Management action code", HFILL }},
{&hf_ieee80211_ff_unprotected_wnm_action_code,
- {"Action code", "wlan_mgt.fixed.action_code",
+ {"Action code", "wlan.fixed.action_code",
FT_UINT8, BASE_DEC|BASE_EXT_STRING, &unprotected_wnm_action_codes_ext, 0,
"Management action code", HFILL }},
{&hf_ieee80211_ff_key_data,
- {"Key Data", "wlan_mgt.fixed.key_data",
+ {"Key Data", "wlan.fixed.key_data",
FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
{&hf_ieee80211_ff_key_data_length,
- {"Key Data Length", "wlan_mgt.fixed.key_data_length",
+ {"Key Data Length", "wlan.fixed.key_data_length",
FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
{&hf_ieee80211_ff_wnm_notification_type,
- {"WNM-Notification type", "wlan_mgt.fixed.wnm_notification_type",
+ {"WNM-Notification type", "wlan.fixed.wnm_notification_type",
FT_UINT8, BASE_DEC|BASE_EXT_STRING, &wnm_notification_types_ext, 0,
NULL, HFILL }},
{&hf_ieee80211_ff_rm_action_code,
- {"Action code", "wlan_mgt.rm.action_code",
+ {"Action code", "wlan.rm.action_code",
FT_UINT8, BASE_DEC|BASE_EXT_STRING, &rm_action_codes_ext, 0,
"Radio Measurement Action", HFILL }},
{&hf_ieee80211_ff_rm_dialog_token,
- {"Dialog token", "wlan_mgt.rm.dialog_token",
+ {"Dialog token", "wlan.rm.dialog_token",
FT_UINT8, BASE_DEC, NULL, 0,
"Non-zero Dialog Token identifies request/report transaction", HFILL }},
{&hf_ieee80211_ff_rm_repetitions,
- {"Repetitions", "wlan_mgt.rm.repetitions",
+ {"Repetitions", "wlan.rm.repetitions",
FT_UINT16, BASE_DEC, NULL, 0,
"Numer of Repetitions, 65535 indicates repeat until cancellation", HFILL }},
{&hf_ieee80211_ff_rm_tx_power,
- {"Transmit Power Used", "wlan_mgt.rm.tx_power",
+ {"Transmit Power Used", "wlan.rm.tx_power",
FT_INT8, BASE_DEC, NULL, 0,
NULL, HFILL }},
{&hf_ieee80211_ff_rm_max_tx_power,
- {"Max Transmit Power", "wlan_mgt.rm.max_tx_power",
+ {"Max Transmit Power", "wlan.rm.max_tx_power",
FT_INT8, BASE_DEC, NULL, 0,
NULL, HFILL }},
{&hf_ieee80211_ff_tpc,
- {"TPC Report", "wlan_mgt.rm.tpc",
+ {"TPC Report", "wlan.rm.tpc",
FT_NONE, BASE_NONE, NULL, 0,
NULL, HFILL }},
{&hf_ieee80211_ff_tpc_element_id,
- {"TPC Element ID", "wlan_mgt.rm.tpc.element_id",
+ {"TPC Element ID", "wlan.rm.tpc.element_id",
FT_UINT8, BASE_DEC, NULL, 0,
NULL, HFILL }},
{&hf_ieee80211_ff_tpc_length,
- {"TPC Length", "wlan_mgt.rm.tpc.length",
+ {"TPC Length", "wlan.rm.tpc.length",
FT_UINT8, BASE_DEC, NULL, 0,
"Length of TPC Report element (always 2)", HFILL }},
{&hf_ieee80211_ff_tpc_tx_power,
- {"TPC Transmit Power", "wlan_mgt.rm.tpc.tx_power",
+ {"TPC Transmit Power", "wlan.rm.tpc.tx_power",
FT_INT8, BASE_DEC, NULL, 0,
NULL, HFILL }},
{&hf_ieee80211_ff_tpc_link_margin,
- {"TPC Link Margin", "wlan_mgt.rm.tpc.link_margin",
+ {"TPC Link Margin", "wlan.rm.tpc.link_margin",
FT_INT8, BASE_DEC, NULL, 0,
NULL, HFILL }},
{&hf_ieee80211_ff_rm_rx_antenna_id,
- {"Receive Antenna ID", "wlan_mgt.rm.rx_antenna_id",
+ {"Receive Antenna ID", "wlan.rm.rx_antenna_id",
FT_UINT8, BASE_DEC, NULL, 0,
NULL, HFILL }},
{&hf_ieee80211_ff_rm_tx_antenna_id,
- {"Transmit Antenna ID", "wlan_mgt.rm.tx_antenna_id",
+ {"Transmit Antenna ID", "wlan.rm.tx_antenna_id",
FT_UINT8, BASE_DEC, NULL, 0,
NULL, HFILL }},
{&hf_ieee80211_ff_rm_rcpi,
- {"Received Channel Power", "wlan_mgt.rm.rcpi",
+ {"Received Channel Power", "wlan.rm.rcpi",
FT_UINT8, BASE_DEC, NULL, 0,
NULL, HFILL }},
{&hf_ieee80211_ff_rm_rsni,
- {"Received Signal to noise indication", "wlan_mgt.rm.rsni",
+ {"Received Signal to noise indication", "wlan.rm.rsni",
FT_UINT8, BASE_DEC, NULL, 0,
NULL, HFILL }},
{&hf_ieee80211_ff_request_mode_pref_cand,
- {"Preferred Candidate List Included", "wlan_mgt.fixed.request_mode.pref_cand",
+ {"Preferred Candidate List Included", "wlan.fixed.request_mode.pref_cand",
FT_UINT8, BASE_DEC, NULL, 0x01,
NULL, HFILL }},
{&hf_ieee80211_ff_request_mode_abridged,
- {"Abridged", "wlan_mgt.fixed.request_mode.abridged",
+ {"Abridged", "wlan.fixed.request_mode.abridged",
FT_UINT8, BASE_DEC, NULL, 0x02,
NULL, HFILL }},
{&hf_ieee80211_ff_request_mode_disassoc_imminent,
- {"Disassociation Imminent", "wlan_mgt.fixed.request_mode.disassoc_imminent",
+ {"Disassociation Imminent", "wlan.fixed.request_mode.disassoc_imminent",
FT_UINT8, BASE_DEC, NULL, 0x04,
NULL, HFILL }},
{&hf_ieee80211_ff_request_mode_bss_term_included,
- {"BSS Termination Included", "wlan_mgt.fixed.request_mode.bss_term_included",
+ {"BSS Termination Included", "wlan.fixed.request_mode.bss_term_included",
FT_UINT8, BASE_DEC, NULL, 0x08,
NULL, HFILL }},
{&hf_ieee80211_ff_request_mode_ess_disassoc_imminent,
- {"ESS Disassociation Imminent", "wlan_mgt.fixed.request_mode.ess_disassoc_imminent",
+ {"ESS Disassociation Imminent", "wlan.fixed.request_mode.ess_disassoc_imminent",
FT_UINT8, BASE_DEC, NULL, 0x10,
NULL, HFILL }},
{&hf_ieee80211_ff_disassoc_timer,
- {"Disassociation Timer", "wlan_mgt.fixed.disassoc_timer",
+ {"Disassociation Timer", "wlan.fixed.disassoc_timer",
FT_UINT16, BASE_DEC, NULL, 0,
NULL, HFILL }},
{&hf_ieee80211_ff_bss_termination_delay,
- {"BSS Termination Delay", "wlan_mgt.fixed.bss_termination_delay",
+ {"BSS Termination Delay", "wlan.fixed.bss_termination_delay",
FT_UINT8, BASE_DEC, NULL, 0,
NULL, HFILL }},
{&hf_ieee80211_ff_bss_transition_status_code,
- {"BSS Transition Status Code", "wlan_mgt.fixed.bss_transition_status_code",
+ {"BSS Transition Status Code", "wlan.fixed.bss_transition_status_code",
FT_UINT8, BASE_DEC, NULL, 0,
NULL, HFILL }},
{&hf_ieee80211_ff_validity_interval,
- {"Validity Interval", "wlan_mgt.fixed.validity_interval",
+ {"Validity Interval", "wlan.fixed.validity_interval",
FT_UINT8, BASE_DEC, NULL, 0,
NULL, HFILL }},
{&hf_ieee80211_ff_bss_termination_duration,
- {"BSS Termination Duration", "wlan_mgt.fixed.bss_termination_duration",
+ {"BSS Termination Duration", "wlan.fixed.bss_termination_duration",
FT_BYTES, BASE_NONE, NULL, 0,
NULL, HFILL }},
{&hf_ieee80211_ff_url_len,
{"Session Information URL Length",
- "wlan_mgt.fixed.session_information.url_length",
+ "wlan.fixed.session_information.url_length",
FT_UINT8, BASE_DEC, NULL, 0,
NULL, HFILL }},
{&hf_ieee80211_ff_url,
- {"Session Information URL", "wlan_mgt.fixed.session_information.url",
+ {"Session Information URL", "wlan.fixed.session_information.url",
FT_STRING, BASE_NONE, NULL, 0,
NULL, HFILL }},
{&hf_ieee80211_ff_target_bss,
- {"BSS Transition Target BSS", "wlan_mgt.fixed.bss_transition_target_bss",
+ {"BSS Transition Target BSS", "wlan.fixed.bss_transition_target_bss",
FT_ETHER, BASE_NONE, NULL, 0,
NULL, HFILL }},
{&hf_ieee80211_ff_bss_transition_candidate_list_entries,
- {"BSS Transition Candidate List Entries", "wlan_mgt.fixed.bss_transition_candidate_list_entries",
+ {"BSS Transition Candidate List Entries", "wlan.fixed.bss_transition_candidate_list_entries",
FT_BYTES, BASE_NONE, NULL, 0,
NULL, HFILL }},
@@ -20473,12 +20472,12 @@ proto_register_ieee80211(void)
NULL, HFILL }},
{&hf_ieee80211_ff_dmg_action_code,
- {"DMG Action", "wlan_mgt.fixed.dmg_act",
+ {"DMG Action", "wlan.fixed.dmg_act",
FT_UINT8, BASE_HEX, VALS(ff_dmg_action_flags), 0,
"Action Code", HFILL }},
{&hf_ieee80211_ff_unprotected_dmg_action_code,
- {"Unprotected DMG Action", "wlan_mgt.fixed.unprotected_dmg_act",
+ {"Unprotected DMG Action", "wlan.fixed.unprotected_dmg_act",
FT_UINT8, BASE_HEX, VALS(ff_unprotected_dmg_action_flags), 0,
"Action Code", HFILL }},
@@ -20941,766 +20940,763 @@ proto_register_ieee80211(void)
{"LLT Type", "wlan.switching_stream.llt_type",
FT_BOOLEAN, 16, NULL, 0x0010,
NULL, HFILL }},
- };
-
- static hf_register_info ff[] = {
{&hf_ieee80211_ff_timestamp,
- {"Timestamp", "wlan_mgt.fixed.timestamp",
+ {"Timestamp", "wlan.fixed.timestamp",
FT_UINT64, BASE_HEX, NULL, 0,
NULL, HFILL }},
{&hf_ieee80211_ff_auth_alg,
- {"Authentication Algorithm", "wlan_mgt.fixed.auth.alg",
+ {"Authentication Algorithm", "wlan.fixed.auth.alg",
FT_UINT16, BASE_DEC, VALS(auth_alg), 0,
NULL, HFILL }},
{&hf_ieee80211_ff_beacon_interval,
- {"Beacon Interval", "wlan_mgt.fixed.beacon",
+ {"Beacon Interval", "wlan.fixed.beacon",
FT_UINT32, BASE_CUSTOM, CF_FUNC(beacon_interval_base_custom), 0,
NULL, HFILL }},
{&hf_ieee80211_fixed_parameters,
- {"Fixed parameters", "wlan_mgt.fixed.all",
+ {"Fixed parameters", "wlan.fixed.all",
FT_NONE, BASE_NONE, NULL, 0,
NULL, HFILL }},
{&hf_ieee80211_tagged_parameters,
- {"Tagged parameters", "wlan_mgt.tagged.all",
+ {"Tagged parameters", "wlan.tagged.all",
FT_NONE, BASE_NONE, NULL, 0,
NULL, HFILL }},
{&hf_ieee80211_tag_ssid,
- {"SSID", "wlan_mgt.ssid",
+ {"SSID", "wlan.ssid",
FT_STRING, BASE_NONE, NULL, 0,
"Indicates the identity of an ESS or IBSS", HFILL }},
{&hf_ieee80211_tag_supp_rates,
- {"Supported Rates", "wlan_mgt.supported_rates",
+ {"Supported Rates", "wlan.supported_rates",
FT_UINT8, BASE_HEX|BASE_EXT_STRING, &ieee80211_supported_rates_vals_ext, 0x0,
"In Mbit/sec, (B) for Basic Rates", HFILL }},
{&hf_ieee80211_tag_fh_dwell_time,
- {"Dwell Time", "wlan_mgt.fh.dwell_time",
+ {"Dwell Time", "wlan.fh.dwell_time",
FT_UINT16, BASE_HEX, NULL, 0x0,
"In Time Unit (TU)", HFILL }},
{&hf_ieee80211_tag_fh_hop_set,
- {"Hop Set", "wlan_mgt.fh.hop_set",
+ {"Hop Set", "wlan.fh.hop_set",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL }},
{&hf_ieee80211_tag_fh_hop_pattern,
- {"Hop Pattern", "wlan_mgt.fh.hop_pattern",
+ {"Hop Pattern", "wlan.fh.hop_pattern",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL }},
{&hf_ieee80211_tag_fh_hop_index,
- {"Hop Index", "wlan_mgt.fh.hop_index",
+ {"Hop Index", "wlan.fh.hop_index",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL }},
{&hf_ieee80211_ff_block_ack_params,
- {"Block Ack Parameters", "wlan_mgt.fixed.baparams",
+ {"Block Ack Parameters", "wlan.fixed.baparams",
FT_UINT16, BASE_HEX, NULL, 0,
NULL, HFILL }},
{&hf_ieee80211_ff_block_ack_params_amsdu_permitted,
- {"A-MSDUs", "wlan_mgt.fixed.baparams.amsdu",
+ {"A-MSDUs", "wlan.fixed.baparams.amsdu",
FT_BOOLEAN, 16, TFS(&ff_block_ack_params_amsdu_permitted_flag), 0x0001,
"A-MSDU Permitted in QoS Data MPDUs", HFILL }},
{&hf_ieee80211_ff_block_ack_params_policy,
- {"Block Ack Policy", "wlan_mgt.fixed.baparams.policy",
+ {"Block Ack Policy", "wlan.fixed.baparams.policy",
FT_BOOLEAN, 16, TFS(&ff_block_ack_params_policy_flag), 0x0002,
NULL, HFILL }},
{&hf_ieee80211_ff_block_ack_params_tid,
- {"Traffic Identifier", "wlan_mgt.fixed.baparams.tid",
+ {"Traffic Identifier", "wlan.fixed.baparams.tid",
FT_UINT16, BASE_HEX, NULL, 0x003C,
NULL, HFILL }},
{&hf_ieee80211_ff_block_ack_params_buffer_size,
- {"Number of Buffers (1 Buffer = 2304 Bytes)", "wlan_mgt.fixed.baparams.buffersize",
+ {"Number of Buffers (1 Buffer = 2304 Bytes)", "wlan.fixed.baparams.buffersize",
FT_UINT16, BASE_DEC, NULL, 0xFFC0,
"Number of Buffers", HFILL }},
{&hf_ieee80211_ff_block_ack_timeout,
- {"Block Ack Timeout", "wlan_mgt.fixed.batimeout",
+ {"Block Ack Timeout", "wlan.fixed.batimeout",
FT_UINT16, BASE_HEX, NULL, 0,
NULL, HFILL }},
{&hf_ieee80211_ff_block_ack_ssc,
- {"Block Ack Starting Sequence Control (SSC)", "wlan_mgt.fixed.ssc",
+ {"Block Ack Starting Sequence Control (SSC)", "wlan.fixed.ssc",
FT_UINT16, BASE_HEX, 0, 0,
NULL, HFILL }},
{&hf_ieee80211_ff_block_ack_ssc_fragment,
- {"Fragment", "wlan_mgt.fixed.ssc.fragment",
+ {"Fragment", "wlan.fixed.ssc.fragment",
FT_UINT16, BASE_DEC, 0, 0x000f,
NULL, HFILL }},
{&hf_ieee80211_ff_block_ack_ssc_sequence,
- {"Starting Sequence Number", "wlan_mgt.fixed.ssc.sequence",
+ {"Starting Sequence Number", "wlan.fixed.ssc.sequence",
FT_UINT16, BASE_DEC, 0, 0xfff0,
NULL, HFILL }},
{&hf_ieee80211_ff_delba_param,
- {"Delete Block Ack (DELBA) Parameter Set", "wlan_mgt.fixed.delba.param",
+ {"Delete Block Ack (DELBA) Parameter Set", "wlan.fixed.delba.param",
FT_UINT16, BASE_HEX, 0, 0,
NULL, HFILL }},
{&hf_ieee80211_ff_delba_param_reserved,
- {"Reserved", "wlan_mgt.fixed.delba.param.reserved",
+ {"Reserved", "wlan.fixed.delba.param.reserved",
FT_UINT16, BASE_HEX, 0, 0x07ff,
NULL, HFILL }},
{&hf_ieee80211_ff_delba_param_init,
- {"Initiator", "wlan_mgt.fixed.delba.param.initiator",
+ {"Initiator", "wlan.fixed.delba.param.initiator",
FT_BOOLEAN, 16, 0, 0x0800,
NULL, HFILL }},
{&hf_ieee80211_ff_delba_param_tid,
- {"TID", "wlan_mgt.fixed.delba.param.tid",
+ {"TID", "wlan.fixed.delba.param.tid",
FT_UINT16, BASE_HEX, 0, 0xf000,
"Traffic Identifier (TID)", HFILL }},
{&hf_ieee80211_ff_max_reg_pwr,
- {"Maximum Regulation Power", "wlan_mgt.fixed.maxregpwr",
+ {"Maximum Regulation Power", "wlan.fixed.maxregpwr",
FT_UINT16, BASE_HEX, 0, 0,
NULL, HFILL }},
{&hf_ieee80211_ff_measurement_pilot_int,
- {"Measurement Pilot Interval", "wlan_mgt.fixed.msmtpilotint",
+ {"Measurement Pilot Interval", "wlan.fixed.msmtpilotint",
FT_UINT16, BASE_HEX, 0, 0,
"Measurement Pilot Interval Fixed Field", HFILL }},
{&hf_ieee80211_ff_country_str,
- {"Country String", "wlan_mgt.fixed.country",
+ {"Country String", "wlan.fixed.country",
FT_STRING, BASE_NONE, 0, 0,
NULL, HFILL }},
{&hf_ieee80211_ff_max_tx_pwr,
- {"Maximum Transmit Power", "wlan_mgt.fixed.maxtxpwr",
+ {"Maximum Transmit Power", "wlan.fixed.maxtxpwr",
FT_UINT8, BASE_HEX, 0, 0,
NULL, HFILL }},
{&hf_ieee80211_ff_tx_pwr_used,
- {"Transmit Power Used", "wlan_mgt.fixed.txpwr",
+ {"Transmit Power Used", "wlan.fixed.txpwr",
FT_UINT8, BASE_HEX, 0, 0,
NULL, HFILL }},
{&hf_ieee80211_ff_transceiver_noise_floor,
- {"Transceiver Noise Floor", "wlan_mgt.fixed.tnoisefloor",
+ {"Transceiver Noise Floor", "wlan.fixed.tnoisefloor",
FT_UINT8, BASE_HEX, 0, 0,
NULL, HFILL }},
{&hf_ieee80211_ff_channel_width,
- {"Supported Channel Width", "wlan_mgt.fixed.chanwidth",
+ {"Supported Channel Width", "wlan.fixed.chanwidth",
FT_UINT8, BASE_HEX, VALS(ff_channel_width_vals), 0,
NULL, HFILL }},
{&hf_ieee80211_ff_qos_info_ap,
- {"QoS Information (AP)", "wlan_mgt.fixed.qosinfo.ap",
+ {"QoS Information (AP)", "wlan.fixed.qosinfo.ap",
FT_UINT8, BASE_HEX, NULL, 0,
NULL, HFILL }},
{&hf_ieee80211_ff_qos_info_ap_edca_param_set_counter,
- {"EDCA Parameter Set Update Count", "wlan_mgt.fixed.qosinfo.ap.edcaupdate",
+ {"EDCA Parameter Set Update Count", "wlan.fixed.qosinfo.ap.edcaupdate",
FT_UINT8, BASE_HEX, NULL, 0x0F,
"Enhanced Distributed Channel Access (EDCA) Parameter Set Update Count", HFILL }},
{&hf_ieee80211_ff_qos_info_ap_q_ack,
- {"Q-Ack", "wlan_mgt.fixed.qosinfo.ap.qack",
+ {"Q-Ack", "wlan.fixed.qosinfo.ap.qack",
FT_BOOLEAN, 8, TFS(&ff_qos_info_ap_q_ack_flag), 0x10,
"QoS Ack", HFILL }},
{&hf_ieee80211_ff_qos_info_ap_queue_req,
- {"Queue Request", "wlan_mgt.fixed.qosinfo.ap.queue_req",
+ {"Queue Request", "wlan.fixed.qosinfo.ap.queue_req",
FT_BOOLEAN, 8, TFS(&ff_qos_info_ap_queue_req_flag), 0x20,
NULL, HFILL }},
{&hf_ieee80211_ff_qos_info_ap_txop_request,
- {"TXOP Request", "wlan_mgt.fixed.qosinfo.ap.txopreq",
+ {"TXOP Request", "wlan.fixed.qosinfo.ap.txopreq",
FT_BOOLEAN, 8, TFS(&ff_qos_info_ap_txop_request_flag), 0x40,
"Transmit Opportunity (TXOP) Request", HFILL }},
{&hf_ieee80211_ff_qos_info_ap_reserved,
- {"Reserved", "wlan_mgt.fixed.qosinfo.ap.reserved",
+ {"Reserved", "wlan.fixed.qosinfo.ap.reserved",
FT_BOOLEAN, 8, NULL, 0x80,
NULL, HFILL }},
{&hf_ieee80211_ff_qos_info_sta,
- {"QoS Information (STA)", "wlan_mgt.fixed.qosinfo.sta",
+ {"QoS Information (STA)", "wlan.fixed.qosinfo.sta",
FT_UINT8, BASE_HEX, NULL, 0,
"TCLAS Processing", HFILL }},
{&hf_ieee80211_ff_qos_info_sta_ac_vo,
- {"AC_VO U-APSD Flag", "wlan_mgt.fixed.qosinfo.sta.ac_vo",
+ {"AC_VO U-APSD Flag", "wlan.fixed.qosinfo.sta.ac_vo",
FT_BOOLEAN, 8, TFS(&ff_qos_info_sta_ac_flag), 0x01,
NULL, HFILL }},
{&hf_ieee80211_ff_qos_info_sta_ac_vi,
- {"AC_VI U-APSD Flag", "wlan_mgt.fixed.qosinfo.sta.ac_vi",
+ {"AC_VI U-APSD Flag", "wlan.fixed.qosinfo.sta.ac_vi",
FT_BOOLEAN, 8, TFS(&ff_qos_info_sta_ac_flag), 0x02,
NULL, HFILL }},
{&hf_ieee80211_ff_qos_info_sta_ac_bk,
- {"AC_BK U-APSD Flag", "wlan_mgt.fixed.qosinfo.sta.ac_bk",
+ {"AC_BK U-APSD Flag", "wlan.fixed.qosinfo.sta.ac_bk",
FT_BOOLEAN, 8, TFS(&ff_qos_info_sta_ac_flag), 0x04,
NULL, HFILL }},
{&hf_ieee80211_ff_qos_info_sta_ac_be,
- {"AC_BE U-APSD Flag", "wlan_mgt.fixed.qosinfo.sta.ac_be",
+ {"AC_BE U-APSD Flag", "wlan.fixed.qosinfo.sta.ac_be",
FT_BOOLEAN, 8, TFS(&ff_qos_info_sta_ac_flag), 0x08,
NULL, HFILL }},
{&hf_ieee80211_ff_qos_info_sta_q_ack,
- {"Q-Ack", "wlan_mgt.fixed.qosinfo.sta.qack",
+ {"Q-Ack", "wlan.fixed.qosinfo.sta.qack",
FT_BOOLEAN, 8, TFS(&ff_qos_info_sta_q_ack_flag), 0x10,
"QoS Ack", HFILL }},
{&hf_ieee80211_ff_qos_info_sta_max_sp_length,
- {"Max SP Length", "wlan_mgt.fixed.qosinfo.sta.max_sp_length",
+ {"Max SP Length", "wlan.fixed.qosinfo.sta.max_sp_length",
FT_UINT8, BASE_HEX, VALS(ff_qos_info_sta_max_sp_len_flags) , 0x60,
NULL, HFILL }},
{&hf_ieee80211_ff_qos_info_sta_more_data_ack,
- {"More Data Ack", "wlan_mgt.fixed.qosinfo.sta.more_data_ack",
+ {"More Data Ack", "wlan.fixed.qosinfo.sta.more_data_ack",
FT_BOOLEAN, 8, TFS(&ff_qos_info_sta_more_data_ack_flag), 0x80,
NULL, HFILL }},
{&hf_ieee80211_ff_sm_pwr_save,
- {"Spatial Multiplexing (SM) Power Control", "wlan_mgt.fixed.sm.powercontrol",
+ {"Spatial Multiplexing (SM) Power Control", "wlan.fixed.sm.powercontrol",
FT_UINT8, BASE_HEX, NULL, 0,
NULL, HFILL }},
{&hf_ieee80211_ff_sm_pwr_save_enabled,
- {"SM Power Save", "wlan_mgt.fixed.sm.powercontrol.enabled",
+ {"SM Power Save", "wlan.fixed.sm.powercontrol.enabled",
FT_BOOLEAN, 8, TFS(&tfs_enabled_disabled), 0x01,
"Spatial Multiplexing (SM) Power Save", HFILL }},
{&hf_ieee80211_ff_sm_pwr_save_sm_mode,
- {"SM Mode", "wlan_mgt.fixed.sm.powercontrol.mode",
+ {"SM Mode", "wlan.fixed.sm.powercontrol.mode",
FT_BOOLEAN, 8, TFS(&ff_sm_pwr_save_sm_mode_flag), 0x02,
"Spatial Multiplexing (SM) Mode", HFILL }},
{&hf_ieee80211_ff_sm_pwr_save_reserved,
- {"Reserved", "wlan_mgt.fixed.sm.powercontrol.reserved",
+ {"Reserved", "wlan.fixed.sm.powercontrol.reserved",
FT_UINT8, BASE_HEX, NULL, 0xFC,
NULL, HFILL }},
{&hf_ieee80211_ff_pco_phase_cntrl,
- {"Phased Coexistence Operation (PCO) Phase Control", "wlan_mgt.fixed.pco.phasecntrl",
+ {"Phased Coexistence Operation (PCO) Phase Control", "wlan.fixed.pco.phasecntrl",
FT_BOOLEAN, BASE_NONE, TFS(&ff_pco_phase_cntrl_flag), 0x0,
NULL, HFILL }},
{&hf_ieee80211_ff_psmp_param_set,
- {"Power Save Multi-Poll (PSMP) Parameter Set", "wlan_mgt.fixed.psmp.paramset",
+ {"Power Save Multi-Poll (PSMP) Parameter Set", "wlan.fixed.psmp.paramset",
FT_UINT16, BASE_HEX, 0, 0,
NULL, HFILL }},
{&hf_ieee80211_ff_psmp_param_set_n_sta,
- {"Number of STA Info Fields Present", "wlan_mgt.fixed.psmp.paramset.nsta",
+ {"Number of STA Info Fields Present", "wlan.fixed.psmp.paramset.nsta",
FT_UINT16, BASE_HEX, 0, 0x000F,
NULL, HFILL }},
{&hf_ieee80211_ff_psmp_param_set_more_psmp,
- {"More PSMP", "wlan_mgt.fixed.psmp.paramset.more",
+ {"More PSMP", "wlan.fixed.psmp.paramset.more",
FT_BOOLEAN, 16, TFS(&ff_psmp_param_set_more_psmp_flag), 0x0010,
"More Power Save Multi-Poll (PSMP)", HFILL }},
{&hf_ieee80211_ff_psmp_param_set_psmp_sequence_duration,
- {"PSMP Sequence Duration [us]", "wlan_mgt.fixed.psmp.paramset.seqduration",
+ {"PSMP Sequence Duration [us]", "wlan.fixed.psmp.paramset.seqduration",
FT_UINT16, BASE_DEC, 0, 0xFFE0,
"Power Save Multi-Poll (PSMP) Sequence Duration", HFILL }},
{&hf_ieee80211_ff_mimo_cntrl,
- {"MIMO Control", "wlan_mgt.fixed.mimo.control",
+ {"MIMO Control", "wlan.fixed.mimo.control",
FT_BYTES, BASE_NONE, 0, 0x0,
NULL, HFILL }},
{&hf_ieee80211_ff_mimo_cntrl_nc_index,
- {"Nc Index", "wlan_mgt.fixed.mimo.control.ncindex",
+ {"Nc Index", "wlan.fixed.mimo.control.ncindex",
FT_UINT16, BASE_HEX, VALS(ff_mimo_cntrl_nc_index_flags), 0x0003,
"Number of Columns Less One", HFILL }},
{&hf_ieee80211_ff_mimo_cntrl_nr_index,
- {"Nr Index", "wlan_mgt.fixed.mimo.control.nrindex",
+ {"Nr Index", "wlan.fixed.mimo.control.nrindex",
FT_UINT16, BASE_HEX, VALS(ff_mimo_cntrl_nr_index_flags), 0x000C,
"Number of Rows Less One", HFILL }},
{&hf_ieee80211_ff_mimo_cntrl_channel_width,
- {"Channel Width", "wlan_mgt.fixed.mimo.control.chanwidth",
+ {"Channel Width", "wlan.fixed.mimo.control.chanwidth",
FT_BOOLEAN, 16, TFS(&ff_mimo_cntrl_channel_width_flag), 0x0010,
NULL, HFILL }},
{&hf_ieee80211_ff_mimo_cntrl_grouping,
- {"Grouping (Ng)", "wlan_mgt.fixed.mimo.control.grouping",
+ {"Grouping (Ng)", "wlan.fixed.mimo.control.grouping",
FT_UINT16, BASE_HEX, VALS(ff_mimo_cntrl_grouping_flags), 0x0060,
NULL, HFILL }},
{&hf_ieee80211_ff_mimo_cntrl_coefficient_size,
- {"Coefficient Size (Nb)", "wlan_mgt.fixed.mimo.control.cosize",
+ {"Coefficient Size (Nb)", "wlan.fixed.mimo.control.cosize",
FT_UINT16, BASE_HEX, VALS(ff_mimo_cntrl_coefficient_size_flags), 0x0180,
NULL, HFILL }},
{&hf_ieee80211_ff_mimo_cntrl_codebook_info,
- {"Codebook Information", "wlan_mgt.fixed.mimo.control.codebookinfo",
+ {"Codebook Information", "wlan.fixed.mimo.control.codebookinfo",
FT_UINT16, BASE_HEX, VALS(ff_mimo_cntrl_codebook_info_flags), 0x0600,
NULL, HFILL }},
{&hf_ieee80211_ff_mimo_cntrl_remaining_matrix_segment,
- {"Remaining Matrix Segment", "wlan_mgt.fixed.mimo.control.matrixseg",
+ {"Remaining Matrix Segment", "wlan.fixed.mimo.control.matrixseg",
FT_UINT16, BASE_HEX, 0, 0x3800,
NULL, HFILL }},
{&hf_ieee80211_ff_mimo_cntrl_reserved,
- {"Reserved", "wlan_mgt.fixed.mimo.control.reserved",
+ {"Reserved", "wlan.fixed.mimo.control.reserved",
FT_UINT16, BASE_HEX, 0, 0xC000,
NULL, HFILL }},
{&hf_ieee80211_ff_mimo_cntrl_sounding_timestamp,
- {"Sounding Timestamp", "wlan_mgt.fixed.mimo.control.soundingtime",
+ {"Sounding Timestamp", "wlan.fixed.mimo.control.soundingtime",
FT_UINT32, BASE_HEX, 0, 0,
NULL, HFILL }},
{&hf_ieee80211_ff_psmp_sta_info,
- {"Power Save Multi-Poll (PSMP) Station Information", "wlan_mgt.fixed.psmp.stainfo",
+ {"Power Save Multi-Poll (PSMP) Station Information", "wlan.fixed.psmp.stainfo",
FT_UINT64, BASE_HEX, 0, 0,
NULL, HFILL }},
{&hf_ieee80211_ff_psmp_sta_info_type,
- {"Sta Info Type", "wlan_mgt.fixed.psmp.stainfo.type",
+ {"Sta Info Type", "wlan.fixed.psmp.stainfo.type",
FT_UINT32, BASE_HEX, VALS(ff_psmp_sta_info_flags), PSMP_STA_INFO_FLAG_TYPE,
NULL, HFILL }},
{&hf_ieee80211_ff_psmp_sta_info_dtt_start_offset,
- {"DTT Start Offset", "wlan_mgt.fixed.psmp.stainfo.dttstart",
+ {"DTT Start Offset", "wlan.fixed.psmp.stainfo.dttstart",
FT_UINT32, BASE_HEX, 0, PSMP_STA_INFO_FLAG_DTT_START,
NULL, HFILL }},
{&hf_ieee80211_ff_psmp_sta_info_dtt_duration,
- {"DTT Duration", "wlan_mgt.fixed.psmp.stainfo.dttduration",
+ {"DTT Duration", "wlan.fixed.psmp.stainfo.dttduration",
FT_UINT32, BASE_HEX, 0, PSMP_STA_INFO_FLAG_DTT_DURATION,
NULL, HFILL }},
{&hf_ieee80211_ff_psmp_sta_info_sta_id,
- {"Target Station ID", "wlan_mgt.fixed.psmp.stainfo.staid",
+ {"Target Station ID", "wlan.fixed.psmp.stainfo.staid",
FT_UINT32, BASE_HEX, 0, PSMP_STA_INFO_FLAG_STA_ID,
NULL, HFILL }},
{&hf_ieee80211_ff_psmp_sta_info_utt_start_offset,
- {"UTT Start Offset", "wlan_mgt.fixed.psmp.stainfo.uttstart",
+ {"UTT Start Offset", "wlan.fixed.psmp.stainfo.uttstart",
FT_UINT32, BASE_HEX, 0, PSMP_STA_INFO_FLAG_UTT_START,
NULL, HFILL }},
{&hf_ieee80211_ff_psmp_sta_info_utt_duration,
- {"UTT Duration", "wlan_mgt.fixed.psmp.stainfo.uttduration",
+ {"UTT Duration", "wlan.fixed.psmp.stainfo.uttduration",
FT_UINT32, BASE_HEX, 0, PSMP_STA_INFO_FLAG_UTT_DURATION,
NULL, HFILL }},
{&hf_ieee80211_ff_psmp_sta_info_reserved_small,
- {"Reserved", "wlan_mgt.fixed.psmp.stainfo.reserved",
+ {"Reserved", "wlan.fixed.psmp.stainfo.reserved",
FT_UINT32, BASE_HEX, 0, PSMP_STA_INFO_FLAG_IA_RESERVED,
NULL, HFILL }},
{&hf_ieee80211_ff_psmp_sta_info_reserved_large,
- {"Reserved", "wlan_mgt.fixed.psmp.stainfo.reserved64",
+ {"Reserved", "wlan.fixed.psmp.stainfo.reserved64",
FT_UINT64, BASE_HEX, 0, 0,
NULL, HFILL }},
{&hf_ieee80211_ff_psmp_sta_info_psmp_multicast_id,
- {"Power Save Multi-Poll (PSMP) Multicast ID", "wlan_mgt.fixed.psmp.stainfo.multicastid",
+ {"Power Save Multi-Poll (PSMP) Multicast ID", "wlan.fixed.psmp.stainfo.multicastid",
FT_UINT64, BASE_HEX, 0, 0,
NULL, HFILL }},
{&hf_ieee80211_ff_ant_selection,
- {"Antenna Selection", "wlan_mgt.fixed.antsel",
+ {"Antenna Selection", "wlan.fixed.antsel",
FT_UINT8, BASE_HEX, 0, 0,
NULL, HFILL }},
{&hf_ieee80211_ff_ant_selection_0,
- {"Antenna 0", "wlan_mgt.fixed.antsel.ant0",
+ {"Antenna 0", "wlan.fixed.antsel.ant0",
FT_UINT8, BASE_HEX, 0, 0x01,
NULL, HFILL }},
{&hf_ieee80211_ff_ant_selection_1,
- {"Antenna 1", "wlan_mgt.fixed.antsel.ant1",
+ {"Antenna 1", "wlan.fixed.antsel.ant1",
FT_UINT8, BASE_HEX, 0, 0x02,
NULL, HFILL }},
{&hf_ieee80211_ff_ant_selection_2,
- {"Antenna 2", "wlan_mgt.fixed.antsel.ant2",
+ {"Antenna 2", "wlan.fixed.antsel.ant2",
FT_UINT8, BASE_HEX, 0, 0x04,
NULL, HFILL }},
{&hf_ieee80211_ff_ant_selection_3,
- {"Antenna 3", "wlan_mgt.fixed.antsel.ant3",
+ {"Antenna 3", "wlan.fixed.antsel.ant3",
FT_UINT8, BASE_HEX, 0, 0x08,
NULL, HFILL }},
{&hf_ieee80211_ff_ant_selection_4,
- {"Antenna 4", "wlan_mgt.fixed.antsel.ant4",
+ {"Antenna 4", "wlan.fixed.antsel.ant4",
FT_UINT8, BASE_HEX, 0, 0x10,
NULL, HFILL }},
{&hf_ieee80211_ff_ant_selection_5,
- {"Antenna 5", "wlan_mgt.fixed.antsel.ant5",
+ {"Antenna 5", "wlan.fixed.antsel.ant5",
FT_UINT8, BASE_HEX, 0, 0x20,
NULL, HFILL }},
{&hf_ieee80211_ff_ant_selection_6,
- {"Antenna 6", "wlan_mgt.fixed.antsel.ant6",
+ {"Antenna 6", "wlan.fixed.antsel.ant6",
FT_UINT8, BASE_HEX, 0, 0x40,
NULL, HFILL }},
{&hf_ieee80211_ff_ant_selection_7,
- {"Antenna 7", "wlan_mgt.fixed.antsel.ant7",
+ {"Antenna 7", "wlan.fixed.antsel.ant7",
FT_UINT8, BASE_HEX, 0, 0x80,
NULL, HFILL }},
{&hf_ieee80211_ff_ext_channel_switch_announcement,
- {"Extended Channel Switch Announcement", "wlan_mgt.fixed.extchansw",
+ {"Extended Channel Switch Announcement", "wlan.fixed.extchansw",
FT_UINT32, BASE_HEX, 0, 0,
NULL, HFILL }},
{&hf_ieee80211_ff_ext_channel_switch_announcement_switch_mode,
- {"Channel Switch Mode", "wlan_mgt.fixed.extchansw.switchmode",
+ {"Channel Switch Mode", "wlan.fixed.extchansw.switchmode",
FT_UINT32, BASE_HEX, VALS(ieee80211_tag_ext_channel_switch_announcement_switch_mode_flags), 0x000000FF,
NULL, HFILL }},
{&hf_ieee80211_ff_ext_channel_switch_announcement_new_ope_class,
- {"New Operating Class", "wlan_mgt.fixed.extchansw.new.opeclass",
+ {"New Operating Class", "wlan.fixed.extchansw.new.opeclass",
FT_UINT32, BASE_HEX, NULL, 0x0000FF00,
NULL, HFILL }},
{&hf_ieee80211_ff_ext_channel_switch_announcement_new_chan_number,
- {"New Channel Number", "wlan_mgt.fixed.extchansw.new.channumber",
+ {"New Channel Number", "wlan.fixed.extchansw.new.channumber",
FT_UINT32, BASE_HEX, NULL, 0x00FF0000,
NULL, HFILL }},
{&hf_ieee80211_ff_ext_channel_switch_announcement_switch_count,
- {"Channel Switch Count", "wlan_mgt.extchanswitch.switchcount",
+ {"Channel Switch Count", "wlan.extchanswitch.switchcount",
FT_UINT32, BASE_HEX, NULL, 0xFF000000,
NULL, HFILL }},
{&hf_ieee80211_ff_ht_info,
- {"HT Information", "wlan_mgt.fixed.extchansw",
+ {"HT Information", "wlan.fixed.extchansw",
FT_UINT8, BASE_HEX, 0, 0,
"HT Information Fixed Field", HFILL }},
{&hf_ieee80211_ff_ht_info_information_request,
- {"Information Request", "wlan_mgt.fixed.mimo.control.chanwidth",
+ {"Information Request", "wlan.fixed.mimo.control.chanwidth",
FT_BOOLEAN, 8, TFS(&ff_ht_info_information_request_flag), 0x01,
NULL, HFILL }},
{&hf_ieee80211_ff_ht_info_40_mhz_intolerant,
- {"40 MHz Intolerant", "wlan_mgt.fixed.mimo.control.chanwidth",
+ {"40 MHz Intolerant", "wlan.fixed.mimo.control.chanwidth",
FT_BOOLEAN, 8, TFS(&ff_ht_info_40_mhz_intolerant_flag), 0x02,
NULL, HFILL }},
{&hf_ieee80211_ff_ht_info_sta_chan_width,
- {"Station Channel Width", "wlan_mgt.fixed.mimo.control.chanwidth",
+ {"Station Channel Width", "wlan.fixed.mimo.control.chanwidth",
FT_BOOLEAN, 8, TFS(&ff_ht_info_sta_chan_width_flag), 0x04,
NULL, HFILL }},
{&hf_ieee80211_ff_ht_info_reserved,
- {"Reserved", "wlan_mgt.fixed.extchansw",
+ {"Reserved", "wlan.fixed.extchansw",
FT_UINT8, BASE_HEX, 0, 0xF8,
"Reserved Field", HFILL }},
{&hf_ieee80211_ff_ht_action,
- {"HT Action", "wlan_mgt.fixed.htact",
+ {"HT Action", "wlan.fixed.htact",
FT_UINT8, BASE_HEX, VALS(ff_ht_action_flags), 0,
"HT Action Code", HFILL }},
{&hf_ieee80211_ff_mimo_csi_snr,
- {"Signal to Noise Ratio (SNR)", "wlan_mgt.mimo.csimatrices.snr",
+ {"Signal to Noise Ratio (SNR)", "wlan.mimo.csimatrices.snr",
FT_UINT8, BASE_HEX, NULL, 0,
NULL, HFILL }},
{&hf_ieee80211_ff_mimo_csi_matrices,
- {"CSI Matrices", "wlan_mgt.mimo.csimatrices",
+ {"CSI Matrices", "wlan.mimo.csimatrices",
FT_NONE, BASE_NONE, NULL, 0,
NULL, HFILL }},
{&hf_ieee80211_ff_mimo_csi_bf_matrices,
- {"Beamforming Feedback Matrices", "wlan_mgt.mimo.csimatrices.bf",
+ {"Beamforming Feedback Matrices", "wlan.mimo.csimatrices.bf",
FT_NONE, BASE_NONE, NULL, 0,
NULL, HFILL }},
{&hf_ieee80211_ff_mimo_csi_cbf_matrices,
- {"Compressed Beamforming Feedback Matrices", "wlan_mgt.mimo.csimatrices.cbf",
+ {"Compressed Beamforming Feedback Matrices", "wlan.mimo.csimatrices.cbf",
FT_NONE, BASE_NONE, NULL, 0,
NULL, HFILL }},
{&hf_ieee80211_ff_public_action,
- {"Public Action", "wlan_mgt.fixed.publicact",
+ {"Public Action", "wlan.fixed.publicact",
FT_UINT8, BASE_HEX|BASE_EXT_STRING, &ff_pa_action_codes_ext, 0,
"Public Action Code", HFILL }},
{&hf_ieee80211_ff_protected_public_action,
- {"Protected Public Action", "wlan_mgt.fixed.publicact",
+ {"Protected Public Action", "wlan.fixed.publicact",
FT_UINT8, BASE_HEX|BASE_EXT_STRING, &ff_ppa_action_codes_ext, 0,
"Protected Public Action Code", HFILL }},
{&hf_ieee80211_ff_capture,
- {"Capabilities Information", "wlan_mgt.fixed.capabilities",
+ {"Capabilities Information", "wlan.fixed.capabilities",
FT_UINT16, BASE_HEX, NULL, 0,
"Capability information", HFILL }},
{&hf_ieee80211_ff_cf_ess,
- {"ESS capabilities", "wlan_mgt.fixed.capabilities.ess",
+ {"ESS capabilities", "wlan.fixed.capabilities.ess",
FT_BOOLEAN, 16, TFS(&cf_ess_flags), 0x0001,
NULL, HFILL }},
{&hf_ieee80211_ff_cf_ibss,
- {"IBSS status", "wlan_mgt.fixed.capabilities.ibss",
+ {"IBSS status", "wlan.fixed.capabilities.ibss",
FT_BOOLEAN, 16, TFS(&cf_ibss_flags), 0x0002,
"IBSS participation", HFILL }},
{&hf_ieee80211_ff_cf_sta_poll,
- {"CFP participation capabilities", "wlan_mgt.fixed.capabilities.cfpoll.sta",
+ {"CFP participation capabilities", "wlan.fixed.capabilities.cfpoll.sta",
FT_UINT16, BASE_HEX, VALS(sta_cf_pollable), 0x020C,
"CF-Poll capabilities for a STA", HFILL }},
{&hf_ieee80211_ff_cf_ap_poll,
- {"CFP participation capabilities", "wlan_mgt.fixed.capabilities.cfpoll.ap",
+ {"CFP participation capabilities", "wlan.fixed.capabilities.cfpoll.ap",
FT_UINT16, BASE_HEX, VALS(ap_cf_pollable), 0x020C,
"CF-Poll capabilities for an AP", HFILL }},
{&hf_ieee80211_ff_cf_privacy,
- {"Privacy", "wlan_mgt.fixed.capabilities.privacy",
+ {"Privacy", "wlan.fixed.capabilities.privacy",
FT_BOOLEAN, 16, TFS(&cf_privacy_flags), 0x0010,
"WEP support", HFILL }},
{&hf_ieee80211_ff_cf_preamble,
- {"Short Preamble", "wlan_mgt.fixed.capabilities.preamble",
+ {"Short Preamble", "wlan.fixed.capabilities.preamble",
FT_BOOLEAN, 16, TFS(&tfs_allowed_not_allowed), 0x0020,
NULL, HFILL }},
{&hf_ieee80211_ff_cf_pbcc,
- {"PBCC", "wlan_mgt.fixed.capabilities.pbcc",
+ {"PBCC", "wlan.fixed.capabilities.pbcc",
FT_BOOLEAN, 16, TFS(&tfs_allowed_not_allowed), 0x0040,
"PBCC Modulation", HFILL }},
{&hf_ieee80211_ff_cf_agility,
- {"Channel Agility", "wlan_mgt.fixed.capabilities.agility",
+ {"Channel Agility", "wlan.fixed.capabilities.agility",
FT_BOOLEAN, 16, TFS(&tfs_inuse_not_inuse), 0x0080,
NULL, HFILL }},
{&hf_ieee80211_ff_cf_spec_man,
- {"Spectrum Management", "wlan_mgt.fixed.capabilities.spec_man",
+ {"Spectrum Management", "wlan.fixed.capabilities.spec_man",
FT_BOOLEAN, 16, TFS(&tfs_implemented_not_implemented), 0x0100,
NULL, HFILL }},
{&hf_ieee80211_ff_short_slot_time,
- {"Short Slot Time", "wlan_mgt.fixed.capabilities.short_slot_time",
+ {"Short Slot Time", "wlan.fixed.capabilities.short_slot_time",
FT_BOOLEAN, 16, TFS(&tfs_inuse_not_inuse), 0x0400,
NULL, HFILL }},
{&hf_ieee80211_ff_cf_apsd,
- {"Automatic Power Save Delivery", "wlan_mgt.fixed.capabilities.apsd",
+ {"Automatic Power Save Delivery", "wlan.fixed.capabilities.apsd",
FT_BOOLEAN, 16, TFS(&tfs_implemented_not_implemented), 0x0800,
NULL, HFILL }},
{&hf_ieee80211_ff_radio_measurement,
- {"Radio Measurement", "wlan_mgt.fixed.capabilities.radio_measurement",
+ {"Radio Measurement", "wlan.fixed.capabilities.radio_measurement",
FT_BOOLEAN, 16, TFS(&tfs_implemented_not_implemented), 0x1000,
NULL, HFILL }},
{&hf_ieee80211_ff_dsss_ofdm,
- {"DSSS-OFDM", "wlan_mgt.fixed.capabilities.dsss_ofdm",
+ {"DSSS-OFDM", "wlan.fixed.capabilities.dsss_ofdm",
FT_BOOLEAN, 16, TFS(&tfs_allowed_not_allowed), 0x2000,
"DSSS-OFDM Modulation", HFILL }},
{&hf_ieee80211_ff_cf_del_blk_ack,
- {"Delayed Block Ack", "wlan_mgt.fixed.capabilities.del_blk_ack",
+ {"Delayed Block Ack", "wlan.fixed.capabilities.del_blk_ack",
FT_BOOLEAN, 16, TFS(&tfs_implemented_not_implemented), 0x4000,
NULL, HFILL }},
{&hf_ieee80211_ff_cf_imm_blk_ack,
- {"Immediate Block Ack", "wlan_mgt.fixed.capabilities.imm_blk_ack",
+ {"Immediate Block Ack", "wlan.fixed.capabilities.imm_blk_ack",
FT_BOOLEAN, 16, TFS(&tfs_implemented_not_implemented), 0x8000,
NULL, HFILL }},
{&hf_ieee80211_ff_auth_seq,
- {"Authentication SEQ", "wlan_mgt.fixed.auth_seq",
+ {"Authentication SEQ", "wlan.fixed.auth_seq",
FT_UINT16, BASE_HEX, NULL, 0,
"Authentication Sequence Number", HFILL }},
{&hf_ieee80211_ff_assoc_id,
- {"Association ID", "wlan_mgt.fixed.aid",
+ {"Association ID", "wlan.fixed.aid",
FT_UINT16, BASE_HEX, NULL, 0x3FFF,
NULL, HFILL }},
{&hf_ieee80211_ff_listen_ival,
- {"Listen Interval", "wlan_mgt.fixed.listen_ival",
+ {"Listen Interval", "wlan.fixed.listen_ival",
FT_UINT16, BASE_HEX, NULL, 0,
NULL, HFILL }},
{&hf_ieee80211_ff_current_ap,
- {"Current AP", "wlan_mgt.fixed.current_ap",
+ {"Current AP", "wlan.fixed.current_ap",
FT_ETHER, BASE_NONE, NULL, 0,
"MAC address of current AP", HFILL }},
{&hf_ieee80211_ff_reason,
- {"Reason code", "wlan_mgt.fixed.reason_code",
+ {"Reason code", "wlan.fixed.reason_code",
FT_UINT16, BASE_HEX|BASE_EXT_STRING, &ieee80211_reason_code_ext, 0,
"Reason for unsolicited notification", HFILL }},
{&hf_ieee80211_ff_status_code,
- {"Status code", "wlan_mgt.fixed.status_code",
+ {"Status code", "wlan.fixed.status_code",
FT_UINT16, BASE_HEX|BASE_EXT_STRING, &ieee80211_status_code_ext, 0,
"Status of requested event", HFILL }},
{&hf_ieee80211_ff_category_code,
- {"Category code", "wlan_mgt.fixed.category_code",
+ {"Category code", "wlan.fixed.category_code",
FT_UINT16, BASE_DEC|BASE_EXT_STRING, &category_codes_ext, 0,
"Management action category", HFILL }},
{&hf_ieee80211_ff_action_code,
- {"Action code", "wlan_mgt.fixed.action_code",
+ {"Action code", "wlan.fixed.action_code",
FT_UINT16, BASE_DEC, VALS(action_codes), 0,
"Management action code", HFILL }},
{&hf_ieee80211_ff_dialog_token,
- {"Dialog token", "wlan_mgt.fixed.dialog_token",
+ {"Dialog token", "wlan.fixed.dialog_token",
FT_UINT8, BASE_HEX, NULL, 0,
"Management action dialog token", HFILL }},
{&hf_ieee80211_ff_followup_dialog_token,
- {"Followup Dialog token", "wlan_mgt.fixed.followup_dialog_token",
+ {"Followup Dialog token", "wlan.fixed.followup_dialog_token",
FT_UINT8, BASE_HEX, NULL, 0,
"Management action followup dialog token", HFILL }},
{&hf_ieee80211_ff_marvell_action_type,
- {"Marvell Action type", "wlan_mgt.fixed.mrvl_action_type",
+ {"Marvell Action type", "wlan.fixed.mrvl_action_type",
FT_UINT8, BASE_DEC, VALS(vendor_action_types_mrvl), 0,
"Vendor Specific Action Type (Marvell)", HFILL }},
{&hf_ieee80211_ff_marvell_mesh_mgt_action_code,
- {"Mesh action(Marvell)", "wlan_mgt.fixed.mrvl_mesh_action",
+ {"Mesh action(Marvell)", "wlan.fixed.mrvl_mesh_action",
FT_UINT8, BASE_HEX, VALS(mesh_mgt_action_codes_mrvl), 0,
"Mesh action code(Marvell)", HFILL }},
{&hf_ieee80211_ff_marvell_mesh_mgt_length,
- {"Message Length", "wlan_mgt.fixed.length",
+ {"Message Length", "wlan.fixed.length",
FT_UINT8, BASE_DEC, NULL, 0,
NULL, HFILL }},
{&hf_ieee80211_ff_marvell_mesh_mgt_mode,
- {"Message Mode", "wlan_mgt.fixed.mode",
+ {"Message Mode", "wlan.fixed.mode",
FT_UINT8, BASE_HEX, NULL, 0,
NULL, HFILL }},
{&hf_ieee80211_ff_marvell_mesh_mgt_ttl,
- {"Message TTL", "wlan_mgt.fixed.ttl",
+ {"Message TTL", "wlan.fixed.ttl",
FT_UINT8, BASE_DEC, NULL, 0,
NULL, HFILL }},
{&hf_ieee80211_ff_marvell_mesh_mgt_dstcount,
- {"Destination Count", "wlan_mgt.fixed.dstcount",
+ {"Destination Count", "wlan.fixed.dstcount",
FT_UINT8, BASE_DEC, NULL, 0,
NULL, HFILL }},
{&hf_ieee80211_ff_marvell_mesh_mgt_hopcount,
- {"Hop Count", "wlan_mgt.fixed.hopcount",
+ {"Hop Count", "wlan.fixed.hopcount",
FT_UINT8, BASE_DEC, NULL, 0,
NULL, HFILL }},
{&hf_ieee80211_ff_marvell_mesh_mgt_rreqid,
- {"RREQ ID", "wlan_mgt.fixed.rreqid",
+ {"RREQ ID", "wlan.fixed.rreqid",
FT_UINT32, BASE_DEC, NULL, 0,
NULL, HFILL }},
{&hf_ieee80211_ff_marvell_mesh_mgt_sa,
- {"Source Address", "wlan_mgt.fixed.sa",
+ {"Source Address", "wlan.fixed.sa",
FT_ETHER, BASE_NONE, NULL, 0,
"Source MAC address", HFILL }},
{&hf_ieee80211_ff_marvell_mesh_mgt_ssn,
- {"SSN", "wlan_mgt.fixed.ssn",
+ {"SSN", "wlan.fixed.ssn",
FT_UINT32, BASE_DEC, NULL, 0,
"Source Sequence Number", HFILL }},
{&hf_ieee80211_ff_marvell_mesh_mgt_metric,
- {"Metric", "wlan_mgt.fixed.metric",
+ {"Metric", "wlan.fixed.metric",
FT_UINT32, BASE_DEC, NULL, 0,
"Route Metric", HFILL }},
{&hf_ieee80211_ff_marvell_mesh_mgt_flags,
- {"RREQ Flags", "wlan_mgt.fixed.hopcount",
+ {"RREQ Flags", "wlan.fixed.hopcount",
FT_UINT8, BASE_HEX, NULL, 0,
NULL, HFILL }},
{&hf_ieee80211_ff_marvell_mesh_mgt_da,
- {"Destination Address", "wlan_mgt.fixed.da",
+ {"Destination Address", "wlan.fixed.da",
FT_ETHER, BASE_NONE, NULL, 0,
"Destination MAC address", HFILL }},
{&hf_ieee80211_ff_marvell_mesh_mgt_dsn,
- {"DSN", "wlan_mgt.fixed.dsn",
+ {"DSN", "wlan.fixed.dsn",
FT_UINT32, BASE_DEC, NULL, 0,
"Destination Sequence Number", HFILL }},
{&hf_ieee80211_ff_marvell_mesh_mgt_lifetime,
- {"Lifetime", "wlan_mgt.fixed.lifetime",
+ {"Lifetime", "wlan.fixed.lifetime",
FT_UINT32, BASE_DEC, NULL, 0,
"Route Lifetime", HFILL }},
{&hf_ieee80211_ff_wme_action_code,
- {"Action code", "wlan_mgt.fixed.action_code",
+ {"Action code", "wlan.fixed.action_code",
FT_UINT16, BASE_HEX, VALS(wme_action_codes), 0,
"Management notification action code", HFILL }},
{&hf_ieee80211_ff_wme_status_code,
- {"Status code", "wlan_mgt.fixed.status_code",
+ {"Status code", "wlan.fixed.status_code",
FT_UINT16, BASE_HEX, VALS(wme_status_codes), 0,
"Management notification setup response status code", HFILL }},
{&hf_ieee80211_ff_mesh_action,
- {"Mesh Action code", "wlan_mgt.fixed.mesh_action",
+ {"Mesh Action code", "wlan.fixed.mesh_action",
FT_UINT8, BASE_HEX|BASE_EXT_STRING, &mesh_action_ext, 0,
NULL, HFILL }},
{&hf_ieee80211_ff_multihop_action,
- {"Multihop Action code", "wlan_mgt.fixed.multihop_action",
+ {"Multihop Action code", "wlan.fixed.multihop_action",
FT_UINT8, BASE_HEX, VALS(multihop_action), 0,
NULL, HFILL }},
{&hf_ieee80211_ff_mesh_flags,
- {"Mesh Flags", "wlan_mgt.fixed.mesh_flags",
+ {"Mesh Flags", "wlan.fixed.mesh_flags",
FT_UINT8, BASE_HEX, NULL, 0,
NULL, HFILL }},
{&hf_ieee80211_ff_mesh_ttl,
- {"Mesh TTL", "wlan_mgt.fixed.mesh_ttl",
+ {"Mesh TTL", "wlan.fixed.mesh_ttl",
FT_UINT8, BASE_HEX, NULL, 0,
NULL, HFILL }},
{&hf_ieee80211_ff_mesh_sequence,
- {"Sequence Number", "wlan_mgt.fixed.mesh_sequence",
+ {"Sequence Number", "wlan.fixed.mesh_sequence",
FT_UINT32, BASE_HEX, NULL, 0,
NULL, HFILL }},
{&hf_ieee80211_ff_mesh_addr4,
- {"Mesh Extended Address 4", "wlan_mgt.fixed.mesh_addr4",
+ {"Mesh Extended Address 4", "wlan.fixed.mesh_addr4",
FT_ETHER, BASE_NONE, NULL, 0,
NULL, HFILL }},
{&hf_ieee80211_ff_mesh_addr5,
- {"Mesh Extended Address 5", "wlan_mgt.fixed.mesh_addr5",
+ {"Mesh Extended Address 5", "wlan.fixed.mesh_addr5",
FT_ETHER, BASE_NONE, NULL, 0,
NULL, HFILL }},
{&hf_ieee80211_ff_mesh_addr6,
- {"Mesh Extended Address 6", "wlan_mgt.fixed.mesh_addr6",
+ {"Mesh Extended Address 6", "wlan.fixed.mesh_addr6",
FT_ETHER, BASE_NONE, NULL, 0,
NULL, HFILL }},
{&hf_ieee80211_ff_selfprot_action,
- {"Self-protected Action code", "wlan_mgt.fixed.selfprot_action",
+ {"Self-protected Action code", "wlan.fixed.selfprot_action",
FT_UINT8, BASE_HEX, VALS(selfprot_action), 0,
NULL, HFILL }},
@@ -21899,599 +21895,599 @@ proto_register_ieee80211(void)
"Root Announcement Interval", HFILL }},
{&hf_ieee80211_ff_qos_action_code,
- {"Action code", "wlan_mgt.fixed.action_code",
+ {"Action code", "wlan.fixed.action_code",
FT_UINT16, BASE_HEX, VALS(qos_action_codes), 0,
"QoS management action code", HFILL }},
{&hf_ieee80211_ff_ba_action,
- {"Action code", "wlan_mgt.fixed.action_code",
+ {"Action code", "wlan.fixed.action_code",
FT_UINT8, BASE_HEX, VALS(ba_action_codes), 0,
"Block Ack action code", HFILL }},
{&hf_ieee80211_ff_check_beacon,
- {"Check Beacon", "wlan_mgt.fixed.check_beacon",
+ {"Check Beacon", "wlan.fixed.check_beacon",
FT_UINT8, BASE_DEC, NULL, 0,
"Unprotected WNM Check Beacon", HFILL }},
{&hf_ieee80211_ff_tod,
- {"TOD", "wlan_mgt.fixed.tod",
+ {"TOD", "wlan.fixed.tod",
FT_UINT32, BASE_DEC, NULL, 0,
"Previous TS of transmit antenna port", HFILL }},
{&hf_ieee80211_ff_toa,
- {"TOA", "wlan_mgt.fixed.toa",
+ {"TOA", "wlan.fixed.toa",
FT_UINT32, BASE_DEC, NULL, 0,
"Previous TS of receive antenna port", HFILL }},
{&hf_ieee80211_ff_max_tod_err,
- {"MAX TOD ERROR", "wlan_mgt.fixed.max_tod_err",
+ {"MAX TOD ERROR", "wlan.fixed.max_tod_err",
FT_UINT8, BASE_DEC, NULL, 0,
"Maximal Error at Previous TS of transmit antenna port", HFILL }},
{&hf_ieee80211_ff_max_toa_err,
- {"MAX TOA ERROR", "wlan_mgt.fixed.max_toa_err",
+ {"MAX TOA ERROR", "wlan.fixed.max_toa_err",
FT_UINT8, BASE_DEC, NULL, 0,
"Maximal Error at Previous TS of receive antenna port", HFILL }},
{&hf_ieee80211_ff_dls_action_code,
- {"Action code", "wlan_mgt.fixed.action_code",
+ {"Action code", "wlan.fixed.action_code",
FT_UINT16, BASE_HEX, VALS(dls_action_codes), 0,
"DLS management action code", HFILL }},
{&hf_ieee80211_ff_dst_mac_addr,
- {"Destination address", "wlan_mgt.fixed.dst_mac_addr",
+ {"Destination address", "wlan.fixed.dst_mac_addr",
FT_ETHER, BASE_NONE, NULL, 0,
"Destination MAC address", HFILL }},
{&hf_ieee80211_ff_src_mac_addr,
- {"Source address", "wlan_mgt.fixed.src_mac_addr",
+ {"Source address", "wlan.fixed.src_mac_addr",
FT_ETHER, BASE_NONE, NULL, 0,
"Source MAC address", HFILL }},
{&hf_ieee80211_ff_req_ap_addr,
- {"RequesterAP address", "wlan_mgt.fixed.req_ap_addr",
+ {"RequesterAP address", "wlan.fixed.req_ap_addr",
FT_ETHER, BASE_NONE, NULL, 0,
NULL, HFILL }},
{&hf_ieee80211_ff_res_ap_addr,
- {"ResponderAP address", "wlan_mgt.fixed.res_ap_addr",
+ {"ResponderAP address", "wlan.fixed.res_ap_addr",
FT_ETHER, BASE_NONE, NULL, 0,
NULL, HFILL }},
{&hf_ieee80211_ff_ft_action_code,
- {"Action code", "wlan_mgt.fixed.action_code",
+ {"Action code", "wlan.fixed.action_code",
FT_UINT8, BASE_DEC, VALS(ft_action_codes), 0,
"Management action code", HFILL }},
{&hf_ieee80211_ff_sta_address,
- {"STA Address", "wlan_mgt.fixed.sta_address",
+ {"STA Address", "wlan.fixed.sta_address",
FT_ETHER, BASE_NONE, NULL, 0,
NULL, HFILL }},
{&hf_ieee80211_ff_target_ap_address,
- {"Target AP Address", "wlan_mgt.fixed.target_ap_address",
+ {"Target AP Address", "wlan.fixed.target_ap_address",
FT_ETHER, BASE_NONE, NULL, 0,
"Target AP MAC address", HFILL }},
{&hf_ieee80211_ff_gas_comeback_delay,
- {"GAS Comeback Delay", "wlan_mgt.fixed.gas_comeback_delay",
+ {"GAS Comeback Delay", "wlan.fixed.gas_comeback_delay",
FT_UINT16, BASE_DEC, NULL, 0,
NULL, HFILL }},
{&hf_ieee80211_ff_gas_fragment_id,
- {"GAS Query Response Fragment ID", "wlan_mgt.fixed.gas_fragment_id",
+ {"GAS Query Response Fragment ID", "wlan.fixed.gas_fragment_id",
FT_UINT8, BASE_DEC, NULL, 0x7f,
NULL, HFILL }},
{&hf_ieee80211_ff_more_gas_fragments,
- {"More GAS Fragments", "wlan_mgt.fixed.more_gas_fragments",
+ {"More GAS Fragments", "wlan.fixed.more_gas_fragments",
FT_UINT8, BASE_DEC, NULL, 0x80,
NULL, HFILL }},
{&hf_ieee80211_ff_query_request_length,
- {"Query Request Length", "wlan_mgt.fixed.query_request_length",
+ {"Query Request Length", "wlan.fixed.query_request_length",
FT_UINT16, BASE_DEC, NULL, 0,
NULL, HFILL }},
{&hf_ieee80211_ff_query_request,
- {"Query Request", "wlan_mgt.fixed.query_request",
+ {"Query Request", "wlan.fixed.query_request",
FT_BYTES, BASE_NONE, NULL, 0,
NULL, HFILL }},
{&hf_ieee80211_ff_query_response_length,
- {"Query Response Length", "wlan_mgt.fixed.query_response_length",
+ {"Query Response Length", "wlan.fixed.query_response_length",
FT_UINT16, BASE_DEC, NULL, 0,
NULL, HFILL }},
{&hf_ieee80211_ff_query_response,
- {"Query Response", "wlan_mgt.fixed.query_response",
+ {"Query Response", "wlan.fixed.query_response",
FT_BYTES, BASE_NONE, NULL, 0,
NULL, HFILL }},
{&hf_ieee80211_gas_resp_fragments,
- {"GAS Query Response fragments", "wlan_mgt.fixed.fragments",
+ {"GAS Query Response fragments", "wlan.fixed.fragments",
FT_NONE, BASE_NONE, NULL, 0x00,
NULL, HFILL } },
{&hf_ieee80211_gas_resp_fragment,
- {"GAS Query Response fragment", "wlan_mgt.fixed.fragment",
+ {"GAS Query Response fragment", "wlan.fixed.fragment",
FT_FRAMENUM, BASE_NONE, NULL, 0x00,
NULL, HFILL } },
{&hf_ieee80211_gas_resp_fragment_overlap,
- {"GAS Query Response fragment overlap", "wlan_mgt.fixed.fragment.overlap",
+ {"GAS Query Response fragment overlap", "wlan.fixed.fragment.overlap",
FT_BOOLEAN, BASE_NONE, NULL, 0x00,
NULL, HFILL } },
{&hf_ieee80211_gas_resp_fragment_overlap_conflict,
- {"GAS Query Response fragment overlapping with conflicting data", "wlan_mgt.fixed.fragment.overlap.conflicts",
+ {"GAS Query Response fragment overlapping with conflicting data", "wlan.fixed.fragment.overlap.conflicts",
FT_BOOLEAN, BASE_NONE, NULL, 0x00,
NULL, HFILL } },
{&hf_ieee80211_gas_resp_fragment_multiple_tails,
- {"GAS Query Response has multiple tail fragments", "wlan_mgt.fixed.fragment.multiple_tails",
+ {"GAS Query Response has multiple tail fragments", "wlan.fixed.fragment.multiple_tails",
FT_BOOLEAN, BASE_NONE, NULL, 0x00,
NULL, HFILL } },
{&hf_ieee80211_gas_resp_fragment_too_long_fragment,
- {"GAS Query Response fragment too long", "wlan_mgt.fixed.fragment.too_long_fragment",
+ {"GAS Query Response fragment too long", "wlan.fixed.fragment.too_long_fragment",
FT_BOOLEAN, BASE_NONE, NULL, 0x00,
NULL, HFILL } },
{&hf_ieee80211_gas_resp_fragment_error,
- {"GAS Query Response reassembly error", "wlan_mgt.fixed.fragment.error",
+ {"GAS Query Response reassembly error", "wlan.fixed.fragment.error",
FT_FRAMENUM, BASE_NONE, NULL, 0x00,
NULL, HFILL } },
{&hf_ieee80211_gas_resp_fragment_count,
- {"GAS Query Response fragment count", "wlan_mgt.fixed.fragment.count",
+ {"GAS Query Response fragment count", "wlan.fixed.fragment.count",
FT_UINT32, BASE_DEC, NULL, 0x00,
NULL, HFILL } },
{&hf_ieee80211_gas_resp_reassembled_in,
- {"Reassembled in", "wlan_mgt.fixed.reassembled.in",
+ {"Reassembled in", "wlan.fixed.reassembled.in",
FT_FRAMENUM, BASE_NONE, NULL, 0x00,
NULL, HFILL } },
{&hf_ieee80211_gas_resp_reassembled_length,
- {"Reassembled length", "wlan_mgt.fixed.reassembled.length",
+ {"Reassembled length", "wlan.fixed.reassembled.length",
FT_UINT32, BASE_DEC, NULL, 0x00,
NULL, HFILL } },
{&hf_ieee80211_ff_anqp_info_id,
- {"Info ID", "wlan_mgt.fixed.anqp.info_id",
+ {"Info ID", "wlan.fixed.anqp.info_id",
FT_UINT16, BASE_DEC|BASE_EXT_STRING, &anqp_info_id_vals_ext, 0,
"Access Network Query Protocol Info ID", HFILL }},
{&hf_ieee80211_ff_anqp_info_length,
- {"Length", "wlan_mgt.fixed.anqp.info_length",
+ {"Length", "wlan.fixed.anqp.info_length",
FT_UINT16, BASE_DEC, NULL, 0,
"Access Network Query Protocol Length", HFILL }},
{&hf_ieee80211_ff_anqp_info,
- {"Information", "wlan_mgt.fixed.anqp.info",
+ {"Information", "wlan.fixed.anqp.info",
FT_BYTES, BASE_NONE, NULL, 0,
"Access Network Query Protocol Information", HFILL }},
{&hf_ieee80211_ff_anqp_query_id,
- {"ANQP Query ID", "wlan_mgt.fixed.anqp.query_id",
+ {"ANQP Query ID", "wlan.fixed.anqp.query_id",
FT_UINT16, BASE_DEC|BASE_EXT_STRING, &anqp_info_id_vals_ext, 0,
"Access Network Query Protocol Query ID", HFILL }},
{&hf_ieee80211_ff_anqp_capability,
- {"ANQP Capability", "wlan_mgt.fixed.anqp.capability",
+ {"ANQP Capability", "wlan.fixed.anqp.capability",
FT_UINT16, BASE_DEC|BASE_EXT_STRING, &anqp_info_id_vals_ext, 0,
"Access Network Query Protocol Query ID", HFILL }},
{&hf_ieee80211_ff_anqp_capability_vlen,
- {"Vendor-specific Capability Length", "wlan_mgt.fixed.anqp.capability_vlen",
+ {"Vendor-specific Capability Length", "wlan.fixed.anqp.capability_vlen",
FT_UINT16, BASE_DEC, NULL, 0,
NULL, HFILL }},
{&hf_ieee80211_ff_anqp_capability_vendor,
- {"Vendor-specific Capability", "wlan_mgt.fixed.anqp.capability_vendor",
+ {"Vendor-specific Capability", "wlan.fixed.anqp.capability_vendor",
FT_BYTES, BASE_NONE, NULL, 0,
NULL, HFILL }},
{&hf_ieee80211_ff_venue_info_group,
- {"Venue Group", "wlan_mgt.fixed.venue_info.group",
+ {"Venue Group", "wlan.fixed.venue_info.group",
FT_UINT8, BASE_DEC|BASE_EXT_STRING, &venue_group_vals_ext, 0,
NULL, HFILL }},
{&hf_ieee80211_ff_venue_info_type,
- {"Venue Type", "wlan_mgt.fixed.venue_info.type",
+ {"Venue Type", "wlan.fixed.venue_info.type",
FT_UINT8, BASE_DEC, NULL, 0,
NULL, HFILL }},
{&hf_ieee80211_ff_anqp_venue_length,
- {"Venue Name Duple Length", "wlan_mgt.fixed.anqp.venue.length",
+ {"Venue Name Duple Length", "wlan.fixed.anqp.venue.length",
FT_UINT8, BASE_DEC, NULL, 0,
NULL, HFILL }},
{&hf_ieee80211_ff_anqp_venue_language,
- {"Language Code", "wlan_mgt.fixed.anqp.venue.language",
+ {"Language Code", "wlan.fixed.anqp.venue.language",
FT_STRING, BASE_NONE, NULL, 0,
"Venue Name Language Code", HFILL }},
{&hf_ieee80211_ff_anqp_venue_name,
- {"Venue Name", "wlan_mgt.fixed.anqp.venue.name",
+ {"Venue Name", "wlan.fixed.anqp.venue.name",
FT_STRING, BASE_NONE, NULL, 0,
NULL, HFILL }},
{&hf_ieee80211_ff_anqp_nw_auth_type_indicator,
- {"Network Authentication Type Indicator", "wlan_mgt.fixed.anqp.nw_auth_type.indicator",
+ {"Network Authentication Type Indicator", "wlan.fixed.anqp.nw_auth_type.indicator",
FT_UINT8, BASE_DEC, VALS(nw_auth_type_vals), 0,
NULL, HFILL }},
{&hf_ieee80211_ff_anqp_nw_auth_type_url_len,
- {"Re-direct URL Length", "wlan_mgt.fixed.anqp.nw_auth_type.url_len",
+ {"Re-direct URL Length", "wlan.fixed.anqp.nw_auth_type.url_len",
FT_UINT16, BASE_DEC, NULL, 0,
NULL, HFILL }},
{&hf_ieee80211_ff_anqp_nw_auth_type_url,
- {"Re-direct URL", "wlan_mgt.fixed.anqp.nw_auth_type_url",
+ {"Re-direct URL", "wlan.fixed.anqp.nw_auth_type_url",
FT_STRING, BASE_NONE, NULL, 0,
NULL, HFILL }},
{&hf_ieee80211_ff_anqp_roaming_consortium_oi_len,
- {"OI Length", "wlan_mgt.fixed.anqp.roaming_consortium.oi_len",
+ {"OI Length", "wlan.fixed.anqp.roaming_consortium.oi_len",
FT_UINT8, BASE_DEC, NULL, 0,
"Roaming Consortium OI Length", HFILL }},
{&hf_ieee80211_ff_anqp_roaming_consortium_oi,
- {"OI", "wlan_mgt.fixed.anqp.roaming_consortium.oi",
+ {"OI", "wlan.fixed.anqp.roaming_consortium.oi",
FT_BYTES, BASE_NONE, NULL, 0,
"Roaming Consortium OI", HFILL }},
{&hf_ieee80211_ff_anqp_ip_addr_avail_ipv6,
- {"IPv6 Address", "wlan_mgt.fixed.anqp.ip_addr_availability.ipv6",
+ {"IPv6 Address", "wlan.fixed.anqp.ip_addr_availability.ipv6",
FT_UINT8, BASE_DEC, VALS(ip_addr_avail_ipv6_vals), 0x03,
"IP Address Type Availability information for IPv6", HFILL }},
{&hf_ieee80211_ff_anqp_ip_addr_avail_ipv4,
- {"IPv4 Address", "wlan_mgt.fixed.anqp.ip_addr_availability.ipv4",
+ {"IPv4 Address", "wlan.fixed.anqp.ip_addr_availability.ipv4",
FT_UINT8, BASE_DEC, VALS(ip_addr_avail_ipv4_vals), 0xfc,
"IP Address Type Availability information for IPv4", HFILL }},
{&hf_ieee80211_ff_anqp_nai_realm_count,
- {"NAI Realm Count", "wlan_mgt.fixed.anqp.nai_realm_list.count",
+ {"NAI Realm Count", "wlan.fixed.anqp.nai_realm_list.count",
FT_UINT16, BASE_DEC, NULL, 0,
NULL, HFILL }},
{&hf_ieee80211_ff_anqp_nai_field_len,
- {"NAI Realm Data Field Length", "wlan_mgt.fixed.anqp.nai_realm_list.field_len",
+ {"NAI Realm Data Field Length", "wlan.fixed.anqp.nai_realm_list.field_len",
FT_UINT16, BASE_DEC, NULL, 0,
NULL, HFILL }},
{&hf_ieee80211_ff_anqp_nai_realm_encoding,
- {"NAI Realm Encoding", "wlan_mgt.fixed.naqp_nai_realm_list.encoding",
+ {"NAI Realm Encoding", "wlan.fixed.naqp_nai_realm_list.encoding",
FT_UINT8, BASE_DEC, VALS(nai_realm_encoding_vals), 0x01,
NULL, HFILL }},
{&hf_ieee80211_ff_anqp_nai_realm_length,
- {"NAI Realm Length", "wlan_mgt.fixed.naqp_nai_realm_list.realm_length",
+ {"NAI Realm Length", "wlan.fixed.naqp_nai_realm_list.realm_length",
FT_UINT8, BASE_DEC, NULL, 0,
NULL, HFILL }},
{&hf_ieee80211_ff_anqp_nai_realm,
- {"NAI Realm", "wlan_mgt.fixed.naqp_nai_realm_list.realm",
+ {"NAI Realm", "wlan.fixed.naqp_nai_realm_list.realm",
FT_STRING, BASE_NONE, NULL, 0,
NULL, HFILL }},
{&hf_ieee80211_ff_anqp_nai_realm_eap_count,
- {"EAP Method Count", "wlan_mgt.fixed.naqp_nai_realm_list.eap_method_count",
+ {"EAP Method Count", "wlan.fixed.naqp_nai_realm_list.eap_method_count",
FT_UINT8, BASE_DEC, NULL, 0,
NULL, HFILL }},
{&hf_ieee80211_ff_anqp_nai_realm_eap_len,
- {"EAP Method subfield Length", "wlan_mgt.fixed.naqp_nai_realm_list.eap_method_len",
+ {"EAP Method subfield Length", "wlan.fixed.naqp_nai_realm_list.eap_method_len",
FT_UINT8, BASE_DEC, NULL, 0,
NULL, HFILL }},
{&hf_ieee80211_ff_anqp_nai_realm_eap_method,
- {"EAP Method", "wlan_mgt.fixed.naqp_nai_realm_list.eap_method",
+ {"EAP Method", "wlan.fixed.naqp_nai_realm_list.eap_method",
FT_UINT8, BASE_DEC|BASE_EXT_STRING, &eap_type_vals_ext, 0,
NULL, HFILL }},
{&hf_ieee80211_ff_anqp_nai_realm_auth_param_count,
- {"Authentication Parameter Count", "wlan_mgt.fixed.naqp_nai_realm_list.auth_param_count",
+ {"Authentication Parameter Count", "wlan.fixed.naqp_nai_realm_list.auth_param_count",
FT_UINT8, BASE_DEC, NULL, 0,
NULL, HFILL }},
{&hf_ieee80211_ff_anqp_nai_realm_auth_param_id,
- {"Authentication Parameter ID", "wlan_mgt.fixed.naqp_nai_realm_list.auth_param_id",
+ {"Authentication Parameter ID", "wlan.fixed.naqp_nai_realm_list.auth_param_id",
FT_UINT8, BASE_DEC, VALS(nai_realm_auth_param_id_vals), 0,
NULL, HFILL }},
{&hf_ieee80211_ff_anqp_nai_realm_auth_param_len,
- {"Authentication Parameter Length", "wlan_mgt.fixed.naqp_nai_realm_list.auth_param_len",
+ {"Authentication Parameter Length", "wlan.fixed.naqp_nai_realm_list.auth_param_len",
FT_UINT8, BASE_DEC, NULL, 0,
NULL, HFILL }},
{&hf_ieee80211_ff_anqp_nai_realm_auth_param_value,
- {"Authentication Parameter Value", "wlan_mgt.fixed.naqp_nai_realm_list.auth_param_value",
+ {"Authentication Parameter Value", "wlan.fixed.naqp_nai_realm_list.auth_param_value",
FT_BYTES, BASE_NONE, NULL, 0,
NULL, HFILL }},
{&hf_ieee80211_3gpp_gc_gud,
- {"GUD", "wlan_mgt.fixed.anqp.3gpp_cellular_info.gud",
+ {"GUD", "wlan.fixed.anqp.3gpp_cellular_info.gud",
FT_UINT8, BASE_DEC, NULL, 0,
"Generic container User Data", HFILL }},
{&hf_ieee80211_3gpp_gc_udhl,
- {"UDHL", "wlan_mgt.fixed.anqp.3gpp_cellular_info.udhl",
+ {"UDHL", "wlan.fixed.anqp.3gpp_cellular_info.udhl",
FT_UINT8, BASE_DEC, NULL, 0,
"User Data Header Length", HFILL }},
{&hf_ieee80211_3gpp_gc_iei,
- {"IEI", "wlan_mgt.fixed.anqp.3gpp_cellular_info.iei",
+ {"IEI", "wlan.fixed.anqp.3gpp_cellular_info.iei",
FT_UINT8, BASE_DEC, NULL, 0,
"Information Element Identity", HFILL }},
{&hf_ieee80211_3gpp_gc_plmn_len,
- {"PLMN Length", "wlan_mgt.fixed.anqp.3gpp_cellular_info.plmn_len",
+ {"PLMN Length", "wlan.fixed.anqp.3gpp_cellular_info.plmn_len",
FT_UINT8, BASE_DEC, NULL, 0,
"Length of PLMN List value contents", HFILL }},
{&hf_ieee80211_3gpp_gc_num_plmns,
- {"Number of PLMNs", "wlan_mgt.fixed.anqp.3gpp_cellular_info.num_plmns",
+ {"Number of PLMNs", "wlan.fixed.anqp.3gpp_cellular_info.num_plmns",
FT_UINT8, BASE_DEC, NULL, 0,
NULL, HFILL }},
{&hf_ieee80211_ff_anqp_domain_name_len,
- {"Domain Name Length", "wlan_mgt.fixed.anqp.domain_name_list.len",
+ {"Domain Name Length", "wlan.fixed.anqp.domain_name_list.len",
FT_UINT8, BASE_DEC, NULL, 0,
NULL, HFILL }},
{&hf_ieee80211_ff_anqp_domain_name,
- {"Domain Name", "wlan_mgt.fixed.anqp.domain_name_list.name",
+ {"Domain Name", "wlan.fixed.anqp.domain_name_list.name",
FT_STRING, BASE_NONE, NULL, 0,
NULL, HFILL }},
{&hf_ieee80211_ff_dls_timeout,
- {"DLS timeout", "wlan_mgt.fixed.dls_timeout",
+ {"DLS timeout", "wlan.fixed.dls_timeout",
FT_UINT16, BASE_HEX, NULL, 0,
"DLS timeout value", HFILL }},
{&hf_ieee80211_ff_sa_query_action_code,
- {"Action code", "wlan_mgt.fixed.action_code",
+ {"Action code", "wlan.fixed.action_code",
FT_UINT8, BASE_DEC, VALS(sa_query_action_codes), 0,
"Management action code", HFILL }},
{&hf_ieee80211_ff_transaction_id,
- {"Transaction Id", "wlan_mgt.fixed.transaction_id",
+ {"Transaction Id", "wlan.fixed.transaction_id",
FT_UINT16, BASE_HEX, NULL, 0,
NULL, HFILL }},
{&hf_ieee80211_anqp_wfa_subtype,
- {"ANQP WFA Subtype", "wlan_mgt.anqp.wfa.subtype",
+ {"ANQP WFA Subtype", "wlan.anqp.wfa.subtype",
FT_UINT8, BASE_DEC, VALS(wfa_subtype_vals), 0, NULL, HFILL }},
{&hf_hs20_indication_dgaf_disabled,
- {"DGAF Disabled", "wlan_mgt.hs20.indication.dgaf_disabled",
+ {"DGAF Disabled", "wlan.hs20.indication.dgaf_disabled",
FT_UINT8, BASE_DEC, NULL, 0x01, NULL, HFILL }},
{&hf_hs20_indication_pps_mo_id_present,
- {"PPS MO ID Present", "wlan_mgt.hs20.indication.pps_mo_id_present",
+ {"PPS MO ID Present", "wlan.hs20.indication.pps_mo_id_present",
FT_UINT8, BASE_DEC, NULL, 0x02, NULL, HFILL }},
{&hf_hs20_indication_anqp_domain_id_present,
- {"ANQP Domain ID Present", "wlan_mgt.hs20.indication.anqp_domain_id_present",
+ {"ANQP Domain ID Present", "wlan.hs20.indication.anqp_domain_id_present",
FT_UINT8, BASE_DEC, NULL, 0x04, NULL, HFILL }},
{&hf_hs20_indication_release_number,
- {"Release Number", "wlan_mgt.hs20.indication.release_number",
+ {"Release Number", "wlan.hs20.indication.release_number",
FT_UINT8, BASE_DEC, VALS(hs20_indication_release_number_vals), 0xF0, NULL, HFILL }},
{&hf_hs20_anqp_subtype,
- {"Subtype", "wlan_mgt.hs20.anqp.subtype",
+ {"Subtype", "wlan.hs20.anqp.subtype",
FT_UINT8, BASE_DEC, VALS(hs20_anqp_subtype_vals), 0,
"Hotspot 2.0 ANQP Subtype", HFILL }},
{&hf_hs20_anqp_reserved,
- {"Reserved", "wlan_mgt.hs20.anqp.reserved",
+ {"Reserved", "wlan.hs20.anqp.reserved",
FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
{&hf_hs20_anqp_payload,
- {"Payload", "wlan_mgt.hs20.anqp.payload",
+ {"Payload", "wlan.hs20.anqp.payload",
FT_BYTES, BASE_NONE, NULL, 0,
"Hotspot 2.0 ANQP Payload", HFILL }},
{&hf_hs20_anqp_hs_query_list,
- {"Queried Subtype", "wlan_mgt.hs20.anqp.hs_query_list",
+ {"Queried Subtype", "wlan.hs20.anqp.hs_query_list",
FT_UINT8, BASE_DEC, VALS(hs20_anqp_subtype_vals), 0,
"Queried HS 2.0 Element Subtype", HFILL }},
{&hf_hs20_anqp_hs_capability_list,
- {"Capability", "wlan_mgt.hs20.anqp.hs_capability_list",
+ {"Capability", "wlan.hs20.anqp.hs_capability_list",
FT_UINT8, BASE_DEC, VALS(hs20_anqp_subtype_vals), 0,
"Hotspot 2.0 ANQP Subtype Capability", HFILL }},
{&hf_hs20_anqp_ofn_length,
- {"Length", "wlan_mgt.hs20.anqp.ofn.length",
+ {"Length", "wlan.hs20.anqp.ofn.length",
FT_UINT8, BASE_DEC, NULL, 0,
"Operator Friendly Name Length", HFILL }},
{&hf_hs20_anqp_ofn_language,
- {"Language Code", "wlan_mgt.hs20.anqp.ofn.language",
+ {"Language Code", "wlan.hs20.anqp.ofn.language",
FT_STRING, BASE_NONE, NULL, 0,
"Operator Friendly Name Language Code", HFILL }},
{&hf_hs20_anqp_ofn_name,
- {"Operator Friendly Name", "wlan_mgt.hs20.anqp.ofn.name",
+ {"Operator Friendly Name", "wlan.hs20.anqp.ofn.name",
FT_STRING, BASE_NONE, NULL, 0,
NULL, HFILL }},
{&hf_hs20_anqp_wan_metrics_link_status,
- {"Link Status", "wlan_mgt.hs20.anqp.wan_metrics.link_status",
+ {"Link Status", "wlan.hs20.anqp.wan_metrics.link_status",
FT_UINT8, BASE_DEC, VALS(hs20_wm_link_status_vals), 0x03, NULL, HFILL }},
{&hf_hs20_anqp_wan_metrics_symmetric_link,
- {"Symmetric Link", "wlan_mgt.hs20.anqp.wan_metrics.symmetric_link",
+ {"Symmetric Link", "wlan.hs20.anqp.wan_metrics.symmetric_link",
FT_UINT8, BASE_DEC, NULL, 0x04, NULL, HFILL }},
{&hf_hs20_anqp_wan_metrics_at_capacity,
- {"At Capacity", "wlan_mgt.hs20.anqp.wan_metrics.at_capacity",
+ {"At Capacity", "wlan.hs20.anqp.wan_metrics.at_capacity",
FT_UINT8, BASE_DEC, NULL, 0x08, NULL, HFILL }},
{&hf_hs20_anqp_wan_metrics_reserved,
- {"Reserved", "wlan_mgt.hs20.anqp.wan_metrics.reserved",
+ {"Reserved", "wlan.hs20.anqp.wan_metrics.reserved",
FT_UINT8, BASE_DEC, NULL, 0xf0, NULL, HFILL }},
{&hf_hs20_anqp_wan_metrics_downlink_speed,
- {"Downlink Speed", "wlan_mgt.hs20.anqp.wan_metrics.downlink_speed",
+ {"Downlink Speed", "wlan.hs20.anqp.wan_metrics.downlink_speed",
FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
{&hf_hs20_anqp_wan_metrics_uplink_speed,
- {"Uplink Speed", "wlan_mgt.hs20.anqp.wan_metrics.uplink_speed",
+ {"Uplink Speed", "wlan.hs20.anqp.wan_metrics.uplink_speed",
FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
{&hf_hs20_anqp_wan_metrics_downlink_load,
- {"Downlink Load", "wlan_mgt.hs20.anqp.wan_metrics.downlink_load",
+ {"Downlink Load", "wlan.hs20.anqp.wan_metrics.downlink_load",
FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
{&hf_hs20_anqp_wan_metrics_uplink_load,
- {"Uplink Load", "wlan_mgt.hs20.anqp.wan_metrics.uplink_load",
+ {"Uplink Load", "wlan.hs20.anqp.wan_metrics.uplink_load",
FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
{&hf_hs20_anqp_wan_metrics_lmd,
- {"LMD", "wlan_mgt.hs20.anqp.wan_metrics.lmd",
+ {"LMD", "wlan.hs20.anqp.wan_metrics.lmd",
FT_UINT16, BASE_DEC, NULL, 0, "Load Measurement Duration", HFILL }},
{&hf_hs20_anqp_cc_proto_ip_proto,
- {"IP Protocol", "wlan_mgt.hs20.anqp.cc.ip_proto",
+ {"IP Protocol", "wlan.hs20.anqp.cc.ip_proto",
FT_UINT8, BASE_DEC, NULL, 0,
"ProtoPort Tuple - IP Protocol", HFILL }},
{&hf_hs20_anqp_cc_proto_port_num,
- {"Port Number", "wlan_mgt.hs20.anqp.cc.port_num",
+ {"Port Number", "wlan.hs20.anqp.cc.port_num",
FT_UINT16, BASE_DEC, NULL, 0,
"ProtoPort Tuple - Port Number", HFILL }},
{&hf_hs20_anqp_cc_proto_status,
- {"Status", "wlan_mgt.hs20.anqp.cc.status",
+ {"Status", "wlan.hs20.anqp.cc.status",
FT_UINT8, BASE_DEC, VALS(hs20_cc_status_vals), 0,
"ProtoPort Tuple - Status", HFILL }},
{&hf_hs20_anqp_nai_hrq_count,
- {"NAI Home Realm Count", "wlan_mgt.hs20.anqp.nai_hrq.count",
+ {"NAI Home Realm Count", "wlan.hs20.anqp.nai_hrq.count",
FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
{&hf_hs20_anqp_nai_hrq_encoding_type,
{"NAI Home Realm Encoding Type",
- "wlan_mgt.hs20.anqp.nai_hrq.encoding_type",
+ "wlan.hs20.anqp.nai_hrq.encoding_type",
FT_UINT8, BASE_DEC, VALS(nai_realm_encoding_vals),
0x01, NULL, HFILL }},
{&hf_hs20_anqp_nai_hrq_length,
- {"NAI Home Realm Name Length", "wlan_mgt.hs20.anqp.nai_hrq.length",
+ {"NAI Home Realm Name Length", "wlan.hs20.anqp.nai_hrq.length",
FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
{&hf_hs20_anqp_nai_hrq_realm_name,
- {"NAI Home Realm Name", "wlan_mgt.hs20.anqp.nai_hrq.name",
+ {"NAI Home Realm Name", "wlan.hs20.anqp.nai_hrq.name",
FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
{&hf_hs20_anqp_oper_class_indic,
- {"Operating Class", "wlan_mgt.hs20.anqp.oper_class_indic.oper_class",
+ {"Operating Class", "wlan.hs20.anqp.oper_class_indic.oper_class",
FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
{&hf_ieee80211_tag,
- {"Tag", "wlan_mgt.tag",
+ {"Tag", "wlan.tag",
FT_NONE, BASE_NONE, 0x0, 0,
NULL, HFILL }},
{&hf_ieee80211_tag_number,
- {"Tag Number", "wlan_mgt.tag.number",
+ {"Tag Number", "wlan.tag.number",
FT_UINT8, BASE_DEC|BASE_EXT_STRING, &tag_num_vals_ext, 0,
"Element ID", HFILL }},
{&hf_ieee80211_tag_length,
- {"Tag length", "wlan_mgt.tag.length",
+ {"Tag length", "wlan.tag.length",
FT_UINT32, BASE_DEC, NULL, 0,
"Length of tag", HFILL }},
{&hf_ieee80211_tag_interpretation,
- {"Tag interpretation", "wlan_mgt.tag.interpretation",
+ {"Tag interpretation", "wlan.tag.interpretation",
FT_STRING, BASE_NONE, NULL, 0,
"Interpretation of tag", HFILL }},
{&hf_ieee80211_tag_data,
- {"Tag Data", "wlan_mgt.tag.data",
+ {"Tag Data", "wlan.tag.data",
FT_BYTES, BASE_NONE, NULL, 0,
"Data Interpretation of tag", HFILL }},
{&hf_ieee80211_tag_oui,
- {"OUI", "wlan_mgt.tag.oui",
+ {"OUI", "wlan.tag.oui",
FT_UINT24, BASE_CUSTOM, CF_FUNC(oui_base_custom), 0,
"OUI of vendor specific IE", HFILL }},
{&hf_ieee80211_tag_oui_wfa_subtype,
- {"WFA Subtype", "wlan_mgt.tag.oui.wfa_subtype",
+ {"WFA Subtype", "wlan.tag.oui.wfa_subtype",
FT_UINT8, BASE_DEC, NULL, 0,
NULL, HFILL }},
{&hf_ieee80211_tag_ds_param_channel,
- {"Current Channel", "wlan_mgt.ds.current_channel",
+ {"Current Channel", "wlan.ds.current_channel",
FT_UINT8, BASE_DEC, NULL, 0,
"DS Parameter Set - Current Channel", HFILL }},
{&hf_ieee80211_tag_cfp_count,
- {"CFP Count", "wlan_mgt.cfp.count",
+ {"CFP Count", "wlan.cfp.count",
FT_UINT8, BASE_DEC, NULL, 0,
"Indicates how many delivery traffic indication messages (DTIMs)", HFILL }},
{&hf_ieee80211_tag_cfp_period,
- {"CFP Period", "wlan_mgt.cfp.period",
+ {"CFP Period", "wlan.cfp.period",
FT_UINT8, BASE_DEC, NULL, 0,
"Indicates the number of DTIM intervals between the start of CFPs", HFILL }},
{&hf_ieee80211_tag_cfp_max_duration,
- {"CFP Max Duration", "wlan_mgt.cfp.max_duration",
+ {"CFP Max Duration", "wlan.cfp.max_duration",
FT_UINT16, BASE_DEC, NULL, 0,
"Indicates the maximum duration (in TU) of the CFP that may be generated by this PCF", HFILL }},
{&hf_ieee80211_tag_cfp_dur_remaining,
- {"CFP Dur Remaining", "wlan_mgt.cfp.dur_remaining",
+ {"CFP Dur Remaining", "wlan.cfp.dur_remaining",
FT_UINT16, BASE_DEC, NULL, 0,
"Indicates the maximum time (in TU) remaining in the present CFP", HFILL }},
{&hf_ieee80211_tag_vendor_oui_type,
- {"Vendor Specific OUI Type", "wlan_mgt.tag.vendor.oui.type",
+ {"Vendor Specific OUI Type", "wlan.tag.vendor.oui.type",
FT_UINT8, BASE_DEC, NULL, 0,
NULL, HFILL }},
{&hf_ieee80211_tag_vendor_data,
- {"Vendor Specific Data", "wlan_mgt.tag.vendor.data",
+ {"Vendor Specific Data", "wlan.tag.vendor.data",
FT_BYTES, BASE_NONE, NULL, 0,
"Unknown/undecoded Vendor Specific Data", HFILL }},
{&hf_ieee80211_tim_dtim_count,
- {"DTIM count", "wlan_mgt.tim.dtim_count",
+ {"DTIM count", "wlan.tim.dtim_count",
FT_UINT8, BASE_DEC, NULL, 0,
"Indicates how many Beacon frames (including the current frame) appear before the next DTIM", HFILL }},
{&hf_ieee80211_tim_dtim_period,
- {"DTIM period", "wlan_mgt.tim.dtim_period",
+ {"DTIM period", "wlan.tim.dtim_period",
FT_UINT8, BASE_DEC, NULL, 0,
"Indicates the number of beacon intervals between successive DTIMs", HFILL }},
{&hf_ieee80211_tim_bmapctl,
- {"Bitmap control", "wlan_mgt.tim.bmapctl",
+ {"Bitmap control", "wlan.tim.bmapctl",
FT_UINT8, BASE_HEX, NULL, 0,
NULL, HFILL }},
{&hf_ieee80211_tim_bmapctl_mcast,
- {"Multicast", "wlan_mgt.tim.bmapctl.multicast",
+ {"Multicast", "wlan.tim.bmapctl.multicast",
FT_BOOLEAN, 8, NULL, 0x1,
"Contains the Traffic Indicator bit associated with Association ID 0", HFILL }},
{&hf_ieee80211_tim_bmapctl_offset,
- {"Bitmap Offset", "wlan_mgt.tim.bmapctl.offset",
+ {"Bitmap Offset", "wlan.tim.bmapctl.offset",
FT_UINT8, BASE_HEX, NULL, 0xFE,
NULL, HFILL }},
{&hf_ieee80211_tim_partial_virtual_bitmap,
- {"Partial Virtual Bitmap", "wlan_mgt.tim.partial_virtual_bitmap",
+ {"Partial Virtual Bitmap", "wlan.tim.partial_virtual_bitmap",
FT_BYTES, BASE_NONE, NULL, 0x0,
NULL, HFILL }},
@@ -22501,4277 +22497,4277 @@ proto_register_ieee80211(void)
NULL, HFILL }},
{&hf_ieee80211_tag_ibss_atim_window,
- {"Atim Windows", "wlan_mgt.ibss.atim_windows",
+ {"Atim Windows", "wlan.ibss.atim_windows",
FT_UINT16, BASE_HEX, NULL, 0x0,
"Contains the ATIM Window length in TU", HFILL }},
{&hf_ieee80211_tag_country_info_code,
- {"Code", "wlan_mgt.country_info.code",
+ {"Code", "wlan.country_info.code",
FT_STRING, BASE_NONE, NULL, 0x0,
NULL, HFILL }},
{&hf_ieee80211_tag_country_info_env,
- {"Environment", "wlan_mgt.country_info.environment",
+ {"Environment", "wlan.country_info.environment",
FT_UINT8, BASE_HEX, VALS(environment_vals), 0x0,
NULL, HFILL }},
{&hf_ieee80211_tag_country_info_pad,
- {"Padding", "wlan_mgt.country_info.padding",
+ {"Padding", "wlan.country_info.padding",
FT_BYTES, BASE_NONE, NULL, 0x0,
NULL, HFILL }},
{&hf_ieee80211_tag_country_info_fnm,
- {"Country Info", "wlan_mgt.country_info.fnm",
+ {"Country Info", "wlan.country_info.fnm",
FT_NONE, BASE_NONE, NULL, 0x0,
NULL, HFILL }},
{&hf_ieee80211_tag_country_info_fnm_fcn,
- {"First Channel Number", "wlan_mgt.country_info.fnm.fcn",
+ {"First Channel Number", "wlan.country_info.fnm.fcn",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL }},
{&hf_ieee80211_tag_country_info_fnm_nc,
- {"Number of Channels", "wlan_mgt.country_info.fnm.nc",
+ {"Number of Channels", "wlan.country_info.fnm.nc",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL }},
{&hf_ieee80211_tag_country_info_fnm_mtpl,
- {"Maximum Transmit Power Level (in dBm)", "wlan_mgt.country_info.fnm.mtpl",
+ {"Maximum Transmit Power Level (in dBm)", "wlan.country_info.fnm.mtpl",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL }},
{&hf_ieee80211_tag_country_info_rrc,
- {"Country Info", "wlan_mgt.country_info.rrc",
+ {"Country Info", "wlan.country_info.rrc",
FT_NONE, BASE_NONE, NULL, 0x0,
NULL, HFILL }},
{&hf_ieee80211_tag_country_info_rrc_oei,
- {"Operating Extension Identifier", "wlan_mgt.country_info.rrc.oei",
+ {"Operating Extension Identifier", "wlan.country_info.rrc.oei",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL }},
{&hf_ieee80211_tag_country_info_rrc_oc,
- {"Operating Class", "wlan_mgt.country_info.rrc.oc",
+ {"Operating Class", "wlan.country_info.rrc.oc",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL }},
{&hf_ieee80211_tag_country_info_rrc_cc,
- {"Coverage Class", "wlan_mgt.country_info.rrc.cc",
+ {"Coverage Class", "wlan.country_info.rrc.cc",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL }},
{&hf_ieee80211_tag_fh_hopping_parameter_prime_radix,
- {"Prime Radix", "wlan_mgt.fh_hopping.parameter.prime_radix",
+ {"Prime Radix", "wlan.fh_hopping.parameter.prime_radix",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL }},
{&hf_ieee80211_tag_fh_hopping_parameter_nb_channels,
- {"Number of Channels", "wlan_mgt.fh_hopping.parameter.nb_channels",
+ {"Number of Channels", "wlan.fh_hopping.parameter.nb_channels",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL }},
{&hf_ieee80211_tag_fh_hopping_table_flag,
- {"Flag", "wlan_mgt.fh_hopping.table.flag",
+ {"Flag", "wlan.fh_hopping.table.flag",
FT_UINT8, BASE_HEX, NULL, 0x0,
"Indicates that a Random Table is present when the value is 1", HFILL }},
{&hf_ieee80211_tag_fh_hopping_table_number_of_sets,
- {"Number of Sets", "wlan_mgt.fh_hopping.table.number_of_sets",
+ {"Number of Sets", "wlan.fh_hopping.table.number_of_sets",
FT_UINT8, BASE_DEC, NULL, 0x0,
"Indicates the total number of sets within the hopping patterns", HFILL }},
{&hf_ieee80211_tag_fh_hopping_table_modulus,
- {"Modulus", "wlan_mgt.fh_hopping.table.modulus",
+ {"Modulus", "wlan.fh_hopping.table.modulus",
FT_UINT8, BASE_HEX, NULL, 0x0,
"Indicate the values to be used in the equations to create a hopping sequence from the Random Table information", HFILL }},
{&hf_ieee80211_tag_fh_hopping_table_offset,
- {"Offset", "wlan_mgt.fh_hopping.table.offset",
+ {"Offset", "wlan.fh_hopping.table.offset",
FT_UINT8, BASE_HEX, NULL, 0x0,
"Indicate the values to be used in the equations to create a hopping sequence from the Random Table information", HFILL }},
{&hf_ieee80211_tag_fh_hopping_random_table,
- {"Random Table", "wlan_mgt.fh_hopping.table.random_table",
+ {"Random Table", "wlan.fh_hopping.table.random_table",
FT_UINT16, BASE_HEX, NULL, 0x0,
"It is a vector of single octet values that indicate the random sequence to be followed during a hopping sequence", HFILL }},
{&hf_ieee80211_tag_request,
- {"Requested Element ID", "wlan_mgt.tag.request",
+ {"Requested Element ID", "wlan.tag.request",
FT_UINT8, BASE_DEC|BASE_EXT_STRING, &tag_num_vals_ext, 0,
"The list of elements that are to be included in the responding STA Probe Response frame", HFILL }},
{&hf_ieee80211_tclas_up,
- {"User Priority", "wlan_mgt.tclas.user_priority",
+ {"User Priority", "wlan.tclas.user_priority",
FT_UINT8, BASE_DEC, NULL, 0,
"Contains the value of the UP of the associated MSDUs", HFILL }},
{&hf_ieee80211_tclas_class_type,
- {"Classifier Type", "wlan_mgt.tclas.class_type",
+ {"Classifier Type", "wlan.tclas.class_type",
FT_UINT8, BASE_DEC, VALS(classifier_type), 0,
"Specifies the type of classifier parameters", HFILL }},
{&hf_ieee80211_tclas_class_mask,
- {"Classifier Mask", "wlan_mgt.tclas.class_mask",
+ {"Classifier Mask", "wlan.tclas.class_mask",
FT_UINT8, BASE_HEX, NULL, 0,
"Specifies a bitmap where bits that are set to 1 identify a subset of the classifier parameters", HFILL }},
{&hf_ieee80211_tclas_class_mask0_src_addr,
- {"Source Address", "wlan_mgt.tclas.class_mask.src_addr",
+ {"Source Address", "wlan.tclas.class_mask.src_addr",
FT_UINT8, BASE_HEX, NULL, 0x01, NULL, HFILL }},
{&hf_ieee80211_tclas_class_mask0_dst_addr,
- {"Destination Address", "wlan_mgt.tclas.class_mask.dst_addr",
+ {"Destination Address", "wlan.tclas.class_mask.dst_addr",
FT_UINT8, BASE_HEX, NULL, 0x02, NULL, HFILL }},
{&hf_ieee80211_tclas_class_mask0_type,
- {"Type", "wlan_mgt.tclas.class_mask.type",
+ {"Type", "wlan.tclas.class_mask.type",
FT_UINT8, BASE_HEX, NULL, 0x04, NULL, HFILL }},
{&hf_ieee80211_tclas_class_mask1_ver,
- {"Version", "wlan_mgt.tclas.class_mask.version",
+ {"Version", "wlan.tclas.class_mask.version",
FT_UINT8, BASE_HEX, NULL, 0x01, NULL, HFILL }},
{&hf_ieee80211_tclas_class_mask1_src_ip,
- {"Source IP Address", "wlan_mgt.tclas.class_mask.src_ip",
+ {"Source IP Address", "wlan.tclas.class_mask.src_ip",
FT_UINT8, BASE_HEX, NULL, 0x02, NULL, HFILL }},
{&hf_ieee80211_tclas_class_mask1_dst_ip,
- {"Destination IP Address", "wlan_mgt.tclas.class_mask.dst_ip",
+ {"Destination IP Address", "wlan.tclas.class_mask.dst_ip",
FT_UINT8, BASE_HEX, NULL, 0x04, NULL, HFILL }},
{&hf_ieee80211_tclas_class_mask1_src_port,
- {"Source Port", "wlan_mgt.tclas.class_mask.src_port",
+ {"Source Port", "wlan.tclas.class_mask.src_port",
FT_UINT8, BASE_HEX, NULL, 0x08, NULL, HFILL }},
{&hf_ieee80211_tclas_class_mask1_dst_port,
- {"Destination Port", "wlan_mgt.tclas.class_mask.dst_port",
+ {"Destination Port", "wlan.tclas.class_mask.dst_port",
FT_UINT8, BASE_HEX, NULL, 0x10, NULL, HFILL }},
{&hf_ieee80211_tclas_class_mask1_ipv4_dscp,
- {"DSCP", "wlan_mgt.tclas.class_mask.dscp",
+ {"DSCP", "wlan.tclas.class_mask.dscp",
FT_UINT8, BASE_HEX, NULL, 0x20, NULL, HFILL }},
{&hf_ieee80211_tclas_class_mask1_ipv4_proto,
- {"Protocol", "wlan_mgt.tclas.class_mask.proto",
+ {"Protocol", "wlan.tclas.class_mask.proto",
FT_UINT8, BASE_HEX, NULL, 0x40, NULL, HFILL }},
{&hf_ieee80211_tclas_class_mask1_ipv6_flow,
- {"Flow Label", "wlan_mgt.tclas.class_mask.flow_label",
+ {"Flow Label", "wlan.tclas.class_mask.flow_label",
FT_UINT8, BASE_HEX, NULL, 0x20, NULL, HFILL }},
{&hf_ieee80211_tclas_class_mask2_tci,
- {"802.1Q CLAN TCI", "wlan_mgt.tclas.class_mask.tci",
+ {"802.1Q CLAN TCI", "wlan.tclas.class_mask.tci",
FT_UINT8, BASE_HEX, NULL, 0x01, NULL, HFILL }},
{&hf_ieee80211_tclas_src_mac_addr,
- {"Source address", "wlan_mgt.tclas.src_mac_addr",
+ {"Source address", "wlan.tclas.src_mac_addr",
FT_ETHER, BASE_NONE, NULL, 0,
"Classifier Parameters Ethernet Type", HFILL }},
{&hf_ieee80211_tclas_dst_mac_addr,
- {"Destination address", "wlan_mgt.tclas.dat_mac_addr",
+ {"Destination address", "wlan.tclas.dat_mac_addr",
FT_ETHER, BASE_NONE, NULL, 0,
NULL, HFILL }},
{&hf_ieee80211_tclas_ether_type,
- {"Ethernet Type", "wlan_mgt.tclas.ether_type",
+ {"Ethernet Type", "wlan.tclas.ether_type",
FT_UINT8, BASE_DEC, NULL, 0,
NULL, HFILL }},
{&hf_ieee80211_tclas_version,
- {"IP Version", "wlan_mgt.tclas.version",
+ {"IP Version", "wlan.tclas.version",
FT_UINT8, BASE_DEC, NULL, 0,
NULL, HFILL }},
{&hf_ieee80211_tclas_ipv4_src,
- {"IPv4 Src Addr", "wlan_mgt.tclas.ipv4_src",
+ {"IPv4 Src Addr", "wlan.tclas.ipv4_src",
FT_IPv4, BASE_NONE, NULL, 0,
NULL, HFILL }},
{&hf_ieee80211_tclas_ipv4_dst,
- {"IPv4 Dst Addr", "wlan_mgt.tclas.ipv4_dst",
+ {"IPv4 Dst Addr", "wlan.tclas.ipv4_dst",
FT_IPv4, BASE_NONE, NULL, 0,
NULL, HFILL }},
{&hf_ieee80211_tclas_src_port,
- {"Source Port", "wlan_mgt.tclas.src_port",
+ {"Source Port", "wlan.tclas.src_port",
FT_UINT16, BASE_DEC, NULL, 0,
NULL, HFILL }},
{&hf_ieee80211_tclas_dst_port,
- {"Destination Port", "wlan_mgt.tclas.dst_port",
+ {"Destination Port", "wlan.tclas.dst_port",
FT_UINT16, BASE_DEC, NULL, 0,
NULL, HFILL }},
{&hf_ieee80211_tclas_dscp,
- {"IPv4 DSCP", "wlan_mgt.tclas.dscp",
+ {"IPv4 DSCP", "wlan.tclas.dscp",
FT_UINT8, BASE_HEX, NULL, 0,
"IPv4 Differentiated Services Code Point (DSCP) Field", HFILL }},
{&hf_ieee80211_tclas_protocol,
- {"Protocol", "wlan_mgt.tclas.protocol",
+ {"Protocol", "wlan.tclas.protocol",
FT_UINT8, BASE_HEX, NULL, 0,
"IPv4 Protocol", HFILL }},
{&hf_ieee80211_tclas_ipv6_src,
- {"IPv6 Src Addr", "wlan_mgt.tclas.ipv6_src",
+ {"IPv6 Src Addr", "wlan.tclas.ipv6_src",
FT_IPv6, BASE_NONE, NULL, 0,
NULL, HFILL }},
{&hf_ieee80211_tclas_ipv6_dst,
- {"IPv6 Dst Addr", "wlan_mgt.tclas.ipv6_dst",
+ {"IPv6 Dst Addr", "wlan.tclas.ipv6_dst",
FT_IPv6, BASE_NONE, NULL, 0,
NULL, HFILL }},
{&hf_ieee80211_tclas_flow,
- {"Flow Label", "wlan_mgt.tclas.flow",
+ {"Flow Label", "wlan.tclas.flow",
FT_UINT24, BASE_HEX, NULL, 0,
"IPv6 Flow Label", HFILL }},
{&hf_ieee80211_tclas_tag_type,
- {"802.1Q Tag Type", "wlan_mgt.tclas.tag_type",
+ {"802.1Q Tag Type", "wlan.tclas.tag_type",
FT_UINT16, BASE_HEX, NULL, 0,
NULL, HFILL }},
{&hf_ieee80211_tag_challenge_text,
- {"Challenge Text", "wlan_mgt.tag.challenge_text",
+ {"Challenge Text", "wlan.tag.challenge_text",
FT_BYTES, BASE_NONE, NULL, 0,
NULL, HFILL }},
{&hf_ieee80211_rsn_version,
- {"RSN Version", "wlan_mgt.rsn.version",
+ {"RSN Version", "wlan.rsn.version",
FT_UINT16, BASE_DEC, NULL, 0,
"Indicates the version number of the RSNA protocol", HFILL }},
{&hf_ieee80211_rsn_gcs,
- {"Group Cipher Suite", "wlan_mgt.rsn.gcs",
+ {"Group Cipher Suite", "wlan.rsn.gcs",
FT_UINT32, BASE_CUSTOM, CF_FUNC(rsn_gcs_base_custom), 0,
"Contains the cipher suite selector used by the BSS to protect broadcast/multicast traffic", HFILL }},
{&hf_ieee80211_rsn_gcs_oui,
- {"Group Cipher Suite OUI", "wlan_mgt.rsn.gcs.oui",
+ {"Group Cipher Suite OUI", "wlan.rsn.gcs.oui",
FT_UINT24, BASE_CUSTOM, CF_FUNC(oui_base_custom), 0,
NULL, HFILL }},
{&hf_ieee80211_rsn_gcs_type,
- {"Group Cipher Suite type", "wlan_mgt.rsn.gcs.type",
+ {"Group Cipher Suite type", "wlan.rsn.gcs.type",
FT_UINT8, BASE_DEC, NULL, 0,
NULL, HFILL }},
{&hf_ieee80211_rsn_gcs_80211_type,
- {"Group Cipher Suite type", "wlan_mgt.rsn.gcs.type",
+ {"Group Cipher Suite type", "wlan.rsn.gcs.type",
FT_UINT8, BASE_DEC, VALS(ieee80211_rsn_cipher_vals), 0,
NULL, HFILL }},
{&hf_ieee80211_rsn_pcs_count,
- {"Pairwise Cipher Suite Count", "wlan_mgt.rsn.pcs.count",
+ {"Pairwise Cipher Suite Count", "wlan.rsn.pcs.count",
FT_UINT16, BASE_DEC, NULL, 0,
"Indicates the number of pairwise cipher suite selectors that are contained in the Pairwise Cipher Suite List", HFILL }},
{&hf_ieee80211_rsn_pcs_list,
- {"Pairwise Cipher Suite List", "wlan_mgt.rsn.pcs.list",
+ {"Pairwise Cipher Suite List", "wlan.rsn.pcs.list",
FT_NONE, BASE_NONE, NULL, 0,
"Contains a series of cipher suite selectors that indicate the pairwisecipher suites", HFILL }},
{&hf_ieee80211_rsn_pcs,
- {"Pairwise Cipher Suite", "wlan_mgt.rsn.pcs",
+ {"Pairwise Cipher Suite", "wlan.rsn.pcs",
FT_UINT32, BASE_CUSTOM, CF_FUNC(rsn_pcs_base_custom), 0,
NULL, HFILL }},
{&hf_ieee80211_rsn_pcs_oui,
- {"Pairwise Cipher Suite OUI", "wlan_mgt.rsn.pcs.oui",
+ {"Pairwise Cipher Suite OUI", "wlan.rsn.pcs.oui",
FT_UINT24, BASE_CUSTOM, CF_FUNC(oui_base_custom), 0,
NULL, HFILL }},
{&hf_ieee80211_rsn_pcs_type,
- {"Pairwise Cipher Suite type", "wlan_mgt.rsn.pcs.type",
+ {"Pairwise Cipher Suite type", "wlan.rsn.pcs.type",
FT_UINT8, BASE_DEC, NULL, 0,
NULL, HFILL }},
{&hf_ieee80211_rsn_pcs_80211_type,
- {"Pairwise Cipher Suite type", "wlan_mgt.rsn.pcs.type",
+ {"Pairwise Cipher Suite type", "wlan.rsn.pcs.type",
FT_UINT8, BASE_DEC, VALS(ieee80211_rsn_cipher_vals), 0,
NULL, HFILL }},
{&hf_ieee80211_rsn_akms_count,
- {"Auth Key Management (AKM) Suite Count", "wlan_mgt.rsn.akms.count",
+ {"Auth Key Management (AKM) Suite Count", "wlan.rsn.akms.count",
FT_UINT16, BASE_DEC, NULL, 0,
"Indicates the number of Auth Key Management suite selectors that are contained in the Auth Key Management Suite List", HFILL }},
{&hf_ieee80211_rsn_akms_list,
- {"Auth Key Management (AKM) List", "wlan_mgt.rsn.akms.list",
+ {"Auth Key Management (AKM) List", "wlan.rsn.akms.list",
FT_NONE, BASE_NONE, NULL, 0,
"Contains a series of cipher suite selectors that indicate the AKM suites", HFILL }},
{&hf_ieee80211_rsn_akms,
- {"Auth Key Management (AKM) Suite", "wlan_mgt.rsn.akms",
+ {"Auth Key Management (AKM) Suite", "wlan.rsn.akms",
FT_UINT32, BASE_CUSTOM, CF_FUNC(rsn_akms_base_custom), 0,
NULL, HFILL }},
{&hf_ieee80211_rsn_akms_oui,
- {"Auth Key Management (AKM) OUI", "wlan_mgt.rsn.akms.oui",
+ {"Auth Key Management (AKM) OUI", "wlan.rsn.akms.oui",
FT_UINT24, BASE_CUSTOM, CF_FUNC(oui_base_custom), 0,
NULL, HFILL }},
{&hf_ieee80211_rsn_akms_type,
- {"Auth Key Management (AKM) type", "wlan_mgt.rsn.akms.type",
+ {"Auth Key Management (AKM) type", "wlan.rsn.akms.type",
FT_UINT8, BASE_DEC, NULL, 0,
NULL, HFILL }},
{&hf_ieee80211_rsn_akms_80211_type,
- {"Auth Key Management (AKM) type", "wlan_mgt.rsn.akms.type",
+ {"Auth Key Management (AKM) type", "wlan.rsn.akms.type",
FT_UINT8, BASE_DEC, VALS(ieee80211_rsn_keymgmt_vals), 0,
NULL, HFILL }},
{&hf_ieee80211_rsn_cap,
- {"RSN Capabilities", "wlan_mgt.rsn.capabilities",
+ {"RSN Capabilities", "wlan.rsn.capabilities",
FT_UINT16, BASE_HEX, NULL, 0,
"RSN Capability information", HFILL }},
{&hf_ieee80211_rsn_cap_preauth,
- {"RSN Pre-Auth capabilities", "wlan_mgt.rsn.capabilities.preauth",
+ {"RSN Pre-Auth capabilities", "wlan.rsn.capabilities.preauth",
FT_BOOLEAN, 16, TFS(&rsn_preauth_flags), 0x0001,
NULL, HFILL }},
{&hf_ieee80211_rsn_cap_no_pairwise,
- {"RSN No Pairwise capabilities", "wlan_mgt.rsn.capabilities.no_pairwise",
+ {"RSN No Pairwise capabilities", "wlan.rsn.capabilities.no_pairwise",
FT_BOOLEAN, 16, TFS(&rsn_no_pairwise_flags), 0x0002,
NULL, HFILL }},
{&hf_ieee80211_rsn_cap_ptksa_replay_counter,
- {"RSN PTKSA Replay Counter capabilities", "wlan_mgt.rsn.capabilities.ptksa_replay_counter",
+ {"RSN PTKSA Replay Counter capabilities", "wlan.rsn.capabilities.ptksa_replay_counter",
FT_UINT16, BASE_HEX, VALS(rsn_cap_replay_counter), 0x000C,
NULL, HFILL }},
{&hf_ieee80211_rsn_cap_gtksa_replay_counter,
- {"RSN GTKSA Replay Counter capabilities", "wlan_mgt.rsn.capabilities.gtksa_replay_counter",
+ {"RSN GTKSA Replay Counter capabilities", "wlan.rsn.capabilities.gtksa_replay_counter",
FT_UINT16, BASE_HEX, VALS(rsn_cap_replay_counter), 0x0030,
NULL, HFILL }},
{&hf_ieee80211_rsn_cap_mfpr,
- {"Management Frame Protection Required", "wlan_mgt.rsn.capabilities.mfpr",
+ {"Management Frame Protection Required", "wlan.rsn.capabilities.mfpr",
FT_BOOLEAN, 16, NULL, 0x0040,
NULL, HFILL }},
{&hf_ieee80211_rsn_cap_mfpc,
- {"Management Frame Protection Capable", "wlan_mgt.rsn.capabilities.mfpc",
+ {"Management Frame Protection Capable", "wlan.rsn.capabilities.mfpc",
FT_BOOLEAN, 16, NULL, 0x0080,
NULL, HFILL }},
{&hf_ieee80211_rsn_cap_jmr,
- {"Joint Multi-band RSNA", "wlan_mgt.rsn.capabilities.jmr",
+ {"Joint Multi-band RSNA", "wlan.rsn.capabilities.jmr",
FT_BOOLEAN, 16, NULL, 0x0100,
NULL, HFILL }},
{&hf_ieee80211_rsn_cap_peerkey,
- {"PeerKey Enabled", "wlan_mgt.rsn.capabilities.peerkey",
+ {"PeerKey Enabled", "wlan.rsn.capabilities.peerkey",
FT_BOOLEAN, 16, NULL, 0x0200,
NULL, HFILL }},
{&hf_ieee80211_rsn_pmkid_count,
- {"PMKID Count", "wlan_mgt.rsn.pmkid.count",
+ {"PMKID Count", "wlan.rsn.pmkid.count",
FT_UINT16, BASE_DEC, NULL, 0,
"Indicates the number of PMKID selectors that are contained in the PMKID Suite List", HFILL }},
{&hf_ieee80211_rsn_pmkid_list,
- {"PMKID List", "wlan_mgt.rsn.pmkid.list",
+ {"PMKID List", "wlan.rsn.pmkid.list",
FT_NONE, BASE_NONE, NULL, 0,
"Contains a series of cipher suite selectors that indicate the AKM suites", HFILL }},
{&hf_ieee80211_rsn_pmkid,
- {"PMKID", "wlan_mgt.pmkid.akms",
+ {"PMKID", "wlan.pmkid.akms",
FT_BYTES, BASE_NONE, NULL, 0,
NULL, HFILL }},
{&hf_ieee80211_rsn_gmcs,
- {"Group Management Cipher Suite", "wlan_mgt.rsn.gmcs",
+ {"Group Management Cipher Suite", "wlan.rsn.gmcs",
FT_UINT32, BASE_CUSTOM, CF_FUNC(rsn_gmcs_base_custom), 0,
"Contains the cipher suite selector used by the BSS to protect broadcast/multicast traffic", HFILL }},
{&hf_ieee80211_rsn_gmcs_oui,
- {"Group Management Cipher Suite OUI", "wlan_mgt.rsn.gmcs.oui",
+ {"Group Management Cipher Suite OUI", "wlan.rsn.gmcs.oui",
FT_UINT24, BASE_CUSTOM, CF_FUNC(oui_base_custom), 0,
NULL, HFILL }},
{&hf_ieee80211_rsn_gmcs_type,
- {"Group Management Cipher Suite type", "wlan_mgt.rsn.gmcs.type",
+ {"Group Management Cipher Suite type", "wlan.rsn.gmcs.type",
FT_UINT8, BASE_DEC, NULL, 0,
NULL, HFILL }},
{&hf_ieee80211_rsn_gmcs_80211_type,
- {"Group Management Cipher Suite type", "wlan_mgt.rsn.gmcs.type",
+ {"Group Management Cipher Suite type", "wlan.rsn.gmcs.type",
FT_UINT8, BASE_DEC, VALS(ieee80211_rsn_cipher_vals), 0,
NULL, HFILL }},
{&hf_ieee80211_ht_pren_type,
- {"802.11n (Pre) Type", "wlan_mgt.vs.pren.type",
+ {"802.11n (Pre) Type", "wlan.vs.pren.type",
FT_UINT8, BASE_DEC, VALS(ieee80211_ht_pren_type_vals), 0,
"Vendor Specific HT Type", HFILL }},
{&hf_ieee80211_ht_pren_unknown,
- {"802.11n (Pre) Unknown Data", "wlan_mgt.vs.pren.unknown_data",
+ {"802.11n (Pre) Unknown Data", "wlan.vs.pren.unknown_data",
FT_BYTES, BASE_NONE, NULL, 0,
NULL, HFILL }},
{&hf_ieee80211_ht_cap,
- {"HT Capabilities Info", "wlan_mgt.ht.capabilities",
+ {"HT Capabilities Info", "wlan.ht.capabilities",
FT_UINT16, BASE_HEX, NULL, 0,
"HT Capabilities information", HFILL }},
{&hf_ieee80211_ht_vs_cap,
- {"HT Capabilities Info (VS)", "wlan_mgt.vs.ht.capabilities",
+ {"HT Capabilities Info (VS)", "wlan.vs.ht.capabilities",
FT_UINT16, BASE_HEX, NULL, 0,
"Vendor Specific HT Capabilities information", HFILL }},
{&hf_ieee80211_ht_ldpc_coding,
- {"HT LDPC coding capability", "wlan_mgt.ht.capabilities.ldpccoding",
+ {"HT LDPC coding capability", "wlan.ht.capabilities.ldpccoding",
FT_BOOLEAN, 16, TFS(&ht_ldpc_coding_flag), 0x0001,
NULL, HFILL }},
{&hf_ieee80211_ht_chan_width,
- {"HT Support channel width", "wlan_mgt.ht.capabilities.width",
+ {"HT Support channel width", "wlan.ht.capabilities.width",
FT_BOOLEAN, 16, TFS(&ht_chan_width_flag), 0x0002,
NULL, HFILL }},
{&hf_ieee80211_ht_sm_pwsave,
- {"HT SM Power Save", "wlan_mgt.ht.capabilities.sm",
+ {"HT SM Power Save", "wlan.ht.capabilities.sm",
FT_UINT16, BASE_HEX, VALS(ht_sm_pwsave_flag), 0x000c,
NULL, HFILL }},
{&hf_ieee80211_ht_green,
- {"HT Green Field", "wlan_mgt.ht.capabilities.green",
+ {"HT Green Field", "wlan.ht.capabilities.green",
FT_BOOLEAN, 16, TFS(&ht_green_flag), 0x0010,
NULL, HFILL }},
{&hf_ieee80211_ht_short20,
- {"HT Short GI for 20MHz", "wlan_mgt.ht.capabilities.short20",
+ {"HT Short GI for 20MHz", "wlan.ht.capabilities.short20",
FT_BOOLEAN, 16, TFS(&tfs_supported_not_supported), 0x0020,
NULL, HFILL }},
{&hf_ieee80211_ht_short40,
- {"HT Short GI for 40MHz", "wlan_mgt.ht.capabilities.short40",
+ {"HT Short GI for 40MHz", "wlan.ht.capabilities.short40",
FT_BOOLEAN, 16, TFS(&tfs_supported_not_supported), 0x0040,
NULL, HFILL }},
{&hf_ieee80211_ht_tx_stbc,
- {"HT Tx STBC", "wlan_mgt.ht.capabilities.txstbc",
+ {"HT Tx STBC", "wlan.ht.capabilities.txstbc",
FT_BOOLEAN, 16, TFS(&tfs_supported_not_supported), 0x0080,
NULL, HFILL }},
{&hf_ieee80211_ht_rx_stbc,
- {"HT Rx STBC", "wlan_mgt.ht.capabilities.rxstbc",
+ {"HT Rx STBC", "wlan.ht.capabilities.rxstbc",
FT_UINT16, BASE_HEX, VALS(ht_rx_stbc_flag), 0x0300,
"HT Tx STBC", HFILL }},
{&hf_ieee80211_ht_delayed_block_ack,
- {"HT Delayed Block ACK", "wlan_mgt.ht.capabilities.delayedblockack",
+ {"HT Delayed Block ACK", "wlan.ht.capabilities.delayedblockack",
FT_BOOLEAN, 16, TFS(&ht_delayed_block_ack_flag), 0x0400,
NULL, HFILL }},
{&hf_ieee80211_ht_max_amsdu,
- {"HT Max A-MSDU length", "wlan_mgt.ht.capabilities.amsdu",
+ {"HT Max A-MSDU length", "wlan.ht.capabilities.amsdu",
FT_BOOLEAN, 16, TFS(&ht_max_amsdu_flag), 0x0800,
NULL, HFILL }},
{&hf_ieee80211_ht_dss_cck_40,
- {"HT DSSS/CCK mode in 40MHz", "wlan_mgt.ht.capabilities.dsscck",
+ {"HT DSSS/CCK mode in 40MHz", "wlan.ht.capabilities.dsscck",
FT_BOOLEAN, 16, TFS(&ht_dss_cck_40_flag), 0x1000,
"HT DSS/CCK mode in 40MHz", HFILL }},
{&hf_ieee80211_ht_psmp,
- {"HT PSMP Support", "wlan_mgt.ht.capabilities.psmp",
+ {"HT PSMP Support", "wlan.ht.capabilities.psmp",
FT_BOOLEAN, 16, TFS(&ht_psmp_flag), 0x2000,
NULL, HFILL }},
{&hf_ieee80211_ht_40_mhz_intolerant,
- {"HT Forty MHz Intolerant", "wlan_mgt.ht.capabilities.40mhzintolerant",
+ {"HT Forty MHz Intolerant", "wlan.ht.capabilities.40mhzintolerant",
FT_BOOLEAN, 16, TFS(&ht_40_mhz_intolerant_flag), 0x4000,
NULL, HFILL }},
{&hf_ieee80211_ht_l_sig,
- {"HT L-SIG TXOP Protection support", "wlan_mgt.ht.capabilities.lsig",
+ {"HT L-SIG TXOP Protection support", "wlan.ht.capabilities.lsig",
FT_BOOLEAN, 16, TFS(&tfs_supported_not_supported), 0x8000,
NULL, HFILL }},
{&hf_ieee80211_ext_bss_mu_mimo_capable_sta_count,
- {"MU-MIMO Capable STA Count", "wlan_mgt.ext_bss.mu_mimo_capable_sta_count",
+ {"MU-MIMO Capable STA Count", "wlan.ext_bss.mu_mimo_capable_sta_count",
FT_UINT16, BASE_DEC, NULL, 0,
NULL, HFILL }},
{&hf_ieee80211_ext_bss_ss_underutilization,
- {"Spatial Stream Underutilization", "wlan_mgt.ext_bss.ss_underutilization",
+ {"Spatial Stream Underutilization", "wlan.ext_bss.ss_underutilization",
FT_UINT8, BASE_HEX, NULL, 0,
NULL, HFILL }},
{&hf_ieee80211_ext_bss_observable_sec_20mhz_utilization,
- {"Observable Secondary 20MHz Utilization", "wlan_mgt.ext_bss.observable_sec_20mhz_utilization",
+ {"Observable Secondary 20MHz Utilization", "wlan.ext_bss.observable_sec_20mhz_utilization",
FT_UINT8, BASE_HEX, NULL, 0,
NULL, HFILL }},
{&hf_ieee80211_ext_bss_observable_sec_40mhz_utilization,
- {"Observable Secondary 40MHz Utilization", "wlan_mgt.ext_bss.observable_sec_40mhz_utilization",
+ {"Observable Secondary 40MHz Utilization", "wlan.ext_bss.observable_sec_40mhz_utilization",
FT_UINT8, BASE_HEX, NULL, 0,
NULL, HFILL }},
{&hf_ieee80211_ext_bss_observable_sec_80mhz_utilization,
- {"Observable Secondary 80MHz Utilization", "wlan_mgt.ext_bss.observable_sec_80mhz_utilization",
+ {"Observable Secondary 80MHz Utilization", "wlan.ext_bss.observable_sec_80mhz_utilization",
FT_UINT8, BASE_HEX, NULL, 0,
NULL, HFILL }},
{&hf_ieee80211_wide_bw_new_channel_width,
- {"New Channel Width", "wlan_mgt.wide_bw.new_channel_width",
+ {"New Channel Width", "wlan.wide_bw.new_channel_width",
FT_UINT8, BASE_HEX, VALS(vht_operation_info_channel_width), 0x0,
NULL, HFILL }},
{&hf_ieee80211_wide_bw_new_channel_center_freq_segment0,
- {"New Channel Center Frequency Segment 0", "wlan_mgt.wide_bw.new_channel_center_freq_segment0",
+ {"New Channel Center Frequency Segment 0", "wlan.wide_bw.new_channel_center_freq_segment0",
FT_UINT8, BASE_HEX_DEC, NULL, 0x0,
NULL, HFILL }},
{&hf_ieee80211_wide_bw_new_channel_center_freq_segment1,
- {"New Channel Center Frequency Segment 1", "wlan_mgt.wide_bw.new_channel_center_freq_segment1",
+ {"New Channel Center Frequency Segment 1", "wlan.wide_bw.new_channel_center_freq_segment1",
FT_UINT8, BASE_HEX_DEC, NULL, 0x0,
NULL, HFILL }},
{&hf_ieee80211_operat_notification_mode,
- {"Operating Mode Notification", "wlan_mgt.operat_notification_mode",
+ {"Operating Mode Notification", "wlan.operat_notification_mode",
FT_UINT8, BASE_HEX, NULL, 0x0,
NULL, HFILL }},
{&hf_ieee80211_operat_mode_field_channel_width,
- {"Channel Width", "wlan_mgt.operat_mode_field.channelwidth",
+ {"Channel Width", "wlan.operat_mode_field.channelwidth",
FT_UINT8, BASE_HEX, VALS(operating_mode_field_channel_width), 0x03,
NULL, HFILL }},
{&hf_ieee80211_operat_mode_field_reserved,
- {"Reserved", "wlan_mgt.operat_mode_field.reserved",
+ {"Reserved", "wlan.operat_mode_field.reserved",
FT_UINT8, BASE_HEX, NULL, 0x0C,
NULL, HFILL }},
{&hf_ieee80211_operat_mode_field_rxnss,
- {"Rx NSS", "wlan_mgt.operat_mode_field.rxnss",
+ {"Rx NSS", "wlan.operat_mode_field.rxnss",
FT_UINT8, BASE_HEX, VALS(operat_mode_field_rxnss), 0x70,
NULL, HFILL }},
{&hf_ieee80211_operat_mode_field_rxnsstype,
- {"Rx NSS Type", "wlan_mgt.operat_mode_field.rxnsstype",
+ {"Rx NSS Type", "wlan.operat_mode_field.rxnsstype",
FT_UINT8, BASE_HEX, NULL, 0x80,
"Indicate that the Rx NSS subfield carries the maximum number of spatial streams that the STA can receive", HFILL }},
{&hf_ieee80211_ampduparam,
- {"A-MPDU Parameters", "wlan_mgt.ht.ampduparam",
+ {"A-MPDU Parameters", "wlan.ht.ampduparam",
FT_UINT8, BASE_HEX, NULL, 0,
NULL, HFILL }},
{&hf_ieee80211_ampduparam_vs,
- {"A-MPDU Parameters (VS)", "wlan_mgt.vs.ht.ampduparam",
+ {"A-MPDU Parameters (VS)", "wlan.vs.ht.ampduparam",
FT_UINT8, BASE_HEX, NULL, 0,
"Vendor Specific A-MPDU Parameters", HFILL }},
{&hf_ieee80211_ampduparam_mpdu,
- {"Maximum Rx A-MPDU Length", "wlan_mgt.ht.ampduparam.maxlength",
+ {"Maximum Rx A-MPDU Length", "wlan.ht.ampduparam.maxlength",
FT_UINT8, BASE_HEX, 0, 0x03,
NULL, HFILL }},
{&hf_ieee80211_ampduparam_mpdu_start_spacing,
- {"MPDU Density", "wlan_mgt.ht.ampduparam.mpdudensity",
+ {"MPDU Density", "wlan.ht.ampduparam.mpdudensity",
FT_UINT8, BASE_HEX, VALS(ampduparam_mpdu_start_spacing_flags), 0x1c,
NULL, HFILL }},
{&hf_ieee80211_ampduparam_reserved,
- {"Reserved", "wlan_mgt.ht.ampduparam.reserved",
+ {"Reserved", "wlan.ht.ampduparam.reserved",
FT_UINT8, BASE_HEX, NULL, 0xE0,
NULL, HFILL }},
{&hf_ieee80211_mcsset,
- {"Rx Supported Modulation and Coding Scheme Set", "wlan_mgt.ht.mcsset",
+ {"Rx Supported Modulation and Coding Scheme Set", "wlan.ht.mcsset",
FT_STRING, BASE_NONE, NULL, 0,
NULL, HFILL }},
{&hf_ieee80211_mcsset_vs,
- {"Rx Supported Modulation and Coding Scheme Set (VS)", "wlan_mgt.vs.ht.mcsset",
+ {"Rx Supported Modulation and Coding Scheme Set (VS)", "wlan.vs.ht.mcsset",
FT_STRING, BASE_NONE, NULL, 0,
"Vendor Specific Rx Supported Modulation and Coding Scheme Set", HFILL }},
{&hf_ieee80211_mcsset_rx_bitmask,
- {"Rx Modulation and Coding Scheme (One bit per modulation)", "wlan_mgt.ht.mcsset.rxbitmask",
+ {"Rx Modulation and Coding Scheme (One bit per modulation)", "wlan.ht.mcsset.rxbitmask",
FT_NONE, BASE_NONE, NULL, 0,
"One bit per modulation", HFILL }},
{&hf_ieee80211_mcsset_rx_bitmask_0to7,
- {"Rx Bitmask Bits 0-7", "wlan_mgt.ht.mcsset.rxbitmask.0to7",
+ {"Rx Bitmask Bits 0-7", "wlan.ht.mcsset.rxbitmask.0to7",
FT_UINT32, BASE_HEX, 0, 0x000000ff,
NULL, HFILL }},
{&hf_ieee80211_mcsset_rx_bitmask_8to15,
- {"Rx Bitmask Bits 8-15", "wlan_mgt.ht.mcsset.rxbitmask.8to15",
+ {"Rx Bitmask Bits 8-15", "wlan.ht.mcsset.rxbitmask.8to15",
FT_UINT32, BASE_HEX, 0, 0x0000ff00,
NULL, HFILL }},
{&hf_ieee80211_mcsset_rx_bitmask_16to23,
- {"Rx Bitmask Bits 16-23", "wlan_mgt.ht.mcsset.rxbitmask.16to23",
+ {"Rx Bitmask Bits 16-23", "wlan.ht.mcsset.rxbitmask.16to23",
FT_UINT32, BASE_HEX, 0, 0x00ff0000,
NULL, HFILL }},
{&hf_ieee80211_mcsset_rx_bitmask_24to31,
- {"Rx Bitmask Bits 24-31", "wlan_mgt.ht.mcsset.rxbitmask.24to31",
+ {"Rx Bitmask Bits 24-31", "wlan.ht.mcsset.rxbitmask.24to31",
FT_UINT32, BASE_HEX, 0, 0xff000000,
NULL, HFILL }},
{&hf_ieee80211_mcsset_rx_bitmask_32,
- {"Rx Bitmask Bit 32", "wlan_mgt.ht.mcsset.rxbitmask.32",
+ {"Rx Bitmask Bit 32", "wlan.ht.mcsset.rxbitmask.32",
FT_UINT32, BASE_HEX, 0, 0x000001,
NULL, HFILL }},
{&hf_ieee80211_mcsset_rx_bitmask_33to38,
- {"Rx Bitmask Bits 33-38", "wlan_mgt.ht.mcsset.rxbitmask.33to38",
+ {"Rx Bitmask Bits 33-38", "wlan.ht.mcsset.rxbitmask.33to38",
FT_UINT32, BASE_HEX, 0, 0x00007e,
NULL, HFILL }},
{&hf_ieee80211_mcsset_rx_bitmask_39to52,
- {"Rx Bitmask Bits 39-52", "wlan_mgt.ht.mcsset.rxbitmask.39to52",
+ {"Rx Bitmask Bits 39-52", "wlan.ht.mcsset.rxbitmask.39to52",
FT_UINT32, BASE_HEX, 0, 0x1fff80,
NULL, HFILL }},
{&hf_ieee80211_mcsset_rx_bitmask_53to76,
- {"Rx Bitmask Bits 53-76", "wlan_mgt.ht.mcsset.rxbitmask.53to76",
+ {"Rx Bitmask Bits 53-76", "wlan.ht.mcsset.rxbitmask.53to76",
FT_UINT32, BASE_HEX, 0, 0x1fffffe0,
NULL, HFILL }},
{&hf_ieee80211_mcsset_highest_data_rate,
- {"Highest Supported Data Rate", "wlan_mgt.ht.mcsset.highestdatarate",
+ {"Highest Supported Data Rate", "wlan.ht.mcsset.highestdatarate",
FT_UINT16, BASE_HEX, 0, 0x03ff,
NULL, HFILL }},
{&hf_ieee80211_mcsset_tx_mcs_set_defined,
- {"Tx Supported MCS Set", "wlan_mgt.ht.mcsset.txsetdefined",
+ {"Tx Supported MCS Set", "wlan.ht.mcsset.txsetdefined",
FT_BOOLEAN, 16, TFS(&tfs_defined_not_defined), 0x0001,
NULL, HFILL }},
{&hf_ieee80211_mcsset_tx_rx_mcs_set_not_equal,
- {"Tx and Rx MCS Set", "wlan_mgt.ht.mcsset.txrxmcsnotequal",
+ {"Tx and Rx MCS Set", "wlan.ht.mcsset.txrxmcsnotequal",
FT_BOOLEAN, 16, TFS(&mcsset_tx_rx_mcs_set_not_equal_flag), 0x0002,
NULL, HFILL }},
{&hf_ieee80211_mcsset_tx_max_spatial_streams,
- {"Maximum Number of Tx Spatial Streams Supported", "wlan_mgt.ht.mcsset.txmaxss",
+ {"Maximum Number of Tx Spatial Streams Supported", "wlan.ht.mcsset.txmaxss",
FT_UINT16, BASE_HEX, 0 , 0x000c,
NULL, HFILL }},
{&hf_ieee80211_mcsset_tx_unequal_modulation,
- {"Unequal Modulation", "wlan_mgt.ht.mcsset.txunequalmod",
+ {"Unequal Modulation", "wlan.ht.mcsset.txunequalmod",
FT_BOOLEAN, 16, TFS(&tfs_supported_not_supported), 0x0010,
NULL, HFILL }},
{&hf_ieee80211_htex_cap,
- {"HT Extended Capabilities", "wlan_mgt.htex.capabilities",
+ {"HT Extended Capabilities", "wlan.htex.capabilities",
FT_UINT16, BASE_HEX, NULL, 0,
"HT Extended Capability information", HFILL }},
{&hf_ieee80211_htex_vs_cap,
- {"HT Extended Capabilities (VS)", "wlan_mgt.vs.htex.capabilities",
+ {"HT Extended Capabilities (VS)", "wlan.vs.htex.capabilities",
FT_UINT16, BASE_HEX, NULL, 0,
"Vendor Specific HT Extended Capability information", HFILL }},
{&hf_ieee80211_htex_pco,
- {"Transmitter supports PCO", "wlan_mgt.htex.capabilities.pco",
+ {"Transmitter supports PCO", "wlan.htex.capabilities.pco",
FT_BOOLEAN, 16, TFS(&tfs_supported_not_supported), 0x0001,
NULL, HFILL }},
{&hf_ieee80211_htex_transtime,
- {"Time needed to transition between 20MHz and 40MHz", "wlan_mgt.htex.capabilities.transtime",
+ {"Time needed to transition between 20MHz and 40MHz", "wlan.htex.capabilities.transtime",
FT_UINT16, BASE_HEX, VALS(htex_transtime_flags), 0x0006,
NULL, HFILL }},
{&hf_ieee80211_htex_mcs,
- {"MCS Feedback capability", "wlan_mgt.htex.capabilities.mcs",
+ {"MCS Feedback capability", "wlan.htex.capabilities.mcs",
FT_UINT16, BASE_HEX, VALS(htex_mcs_flags), 0x0300,
NULL, HFILL }},
{&hf_ieee80211_htex_htc_support,
- {"High Throughput", "wlan_mgt.htex.capabilities.htc",
+ {"High Throughput", "wlan.htex.capabilities.htc",
FT_BOOLEAN, 16, TFS(&tfs_supported_not_supported), 0x0400,
NULL, HFILL }},
{&hf_ieee80211_htex_rd_responder,
- {"Reverse Direction Responder", "wlan_mgt.htex.capabilities.rdresponder",
+ {"Reverse Direction Responder", "wlan.htex.capabilities.rdresponder",
FT_BOOLEAN, 16, TFS(&tfs_supported_not_supported), 0x0800,
NULL, HFILL }},
{&hf_ieee80211_txbf,
- {"Transmit Beam Forming (TxBF) Capabilities", "wlan_mgt.txbf",
+ {"Transmit Beam Forming (TxBF) Capabilities", "wlan.txbf",
FT_UINT32, BASE_HEX, NULL, 0,
NULL, HFILL }},
{&hf_ieee80211_txbf_vs,
- {"Transmit Beam Forming (TxBF) Capabilities (VS)", "wlan_mgt.vs.txbf",
+ {"Transmit Beam Forming (TxBF) Capabilities (VS)", "wlan.vs.txbf",
FT_UINT32, BASE_HEX, NULL, 0,
"Vendor Specific Transmit Beam Forming (TxBF) Capabilities", HFILL }},
{&hf_ieee80211_txbf_cap,
- {"Transmit Beamforming", "wlan_mgt.txbf.txbf",
+ {"Transmit Beamforming", "wlan.txbf.txbf",
FT_BOOLEAN, 32, TFS(&tfs_supported_not_supported), 0x00000001,
NULL, HFILL }},
{&hf_ieee80211_txbf_rcv_ssc,
- {"Receive Staggered Sounding", "wlan_mgt.txbf.rxss",
+ {"Receive Staggered Sounding", "wlan.txbf.rxss",
FT_BOOLEAN, 32, TFS(&tfs_supported_not_supported), 0x00000002,
NULL, HFILL }},
{&hf_ieee80211_txbf_tx_ssc,
- {"Transmit Staggered Sounding", "wlan_mgt.txbf.txss",
+ {"Transmit Staggered Sounding", "wlan.txbf.txss",
FT_BOOLEAN, 32, TFS(&tfs_supported_not_supported), 0x00000004,
NULL, HFILL }},
{&hf_ieee80211_txbf_rcv_ndp,
- {"Receive Null Data packet (NDP)", "wlan_mgt.txbf.rxndp",
+ {"Receive Null Data packet (NDP)", "wlan.txbf.rxndp",
FT_BOOLEAN, 32, TFS(&tfs_supported_not_supported), 0x00000008,
NULL, HFILL }},
{&hf_ieee80211_txbf_tx_ndp,
- {"Transmit Null Data packet (NDP)", "wlan_mgt.txbf.txndp",
+ {"Transmit Null Data packet (NDP)", "wlan.txbf.txndp",
FT_BOOLEAN, 32, TFS(&tfs_supported_not_supported), 0x00000010,
NULL, HFILL }},
{&hf_ieee80211_txbf_impl_txbf,
- {"Implicit TxBF capable", "wlan_mgt.txbf.impltxbf",
+ {"Implicit TxBF capable", "wlan.txbf.impltxbf",
FT_BOOLEAN, 32, TFS(&tfs_supported_not_supported), 0x00000020,
"Implicit Transmit Beamforming (TxBF) capable", HFILL }},
{&hf_ieee80211_txbf_calib,
- {"Calibration", "wlan_mgt.txbf.calibration",
+ {"Calibration", "wlan.txbf.calibration",
FT_UINT32, BASE_HEX, VALS(txbf_calib_flag), 0x000000c0,
NULL, HFILL }},
{&hf_ieee80211_txbf_expl_csi,
- {"STA can apply TxBF using CSI explicit feedback", "wlan_mgt.txbf.csi",
+ {"STA can apply TxBF using CSI explicit feedback", "wlan.txbf.csi",
FT_BOOLEAN, 32, TFS(&tfs_supported_not_supported), 0x00000100,
"Station can apply TxBF using CSI explicit feedback", HFILL }},
{&hf_ieee80211_txbf_expl_uncomp_fm,
- {"STA can apply TxBF using uncompressed beamforming feedback matrix", "wlan_mgt.txbf.fm.uncompressed.tbf",
+ {"STA can apply TxBF using uncompressed beamforming feedback matrix", "wlan.txbf.fm.uncompressed.tbf",
FT_BOOLEAN, 32, TFS(&tfs_supported_not_supported), 0x00000200,
"Station can apply TxBF using uncompressed beamforming feedback matrix", HFILL }},
{&hf_ieee80211_txbf_expl_comp_fm,
- {"STA can apply TxBF using compressed beamforming feedback matrix", "wlan_mgt.txbf.fm.compressed.tbf",
+ {"STA can apply TxBF using compressed beamforming feedback matrix", "wlan.txbf.fm.compressed.tbf",
FT_BOOLEAN, 32, TFS(&tfs_supported_not_supported), 0x00000400,
"Station can apply TxBF using compressed beamforming feedback matrix", HFILL }},
{&hf_ieee80211_txbf_expl_bf_csi,
- {"Receiver can return explicit CSI feedback", "wlan_mgt.txbf.rcsi",
+ {"Receiver can return explicit CSI feedback", "wlan.txbf.rcsi",
FT_UINT32, BASE_HEX, VALS(txbf_feedback_flags), 0x00001800,
NULL, HFILL }},
{&hf_ieee80211_txbf_expl_uncomp_fm_feed,
- {"Receiver can return explicit uncompressed Beamforming Feedback Matrix", "wlan_mgt.txbf.fm.uncompressed.rbf",
+ {"Receiver can return explicit uncompressed Beamforming Feedback Matrix", "wlan.txbf.fm.uncompressed.rbf",
FT_UINT32, BASE_HEX, VALS(txbf_feedback_flags), 0x00006000,
NULL, HFILL }},
{&hf_ieee80211_txbf_expl_comp_fm_feed,
- {"STA can compress and use compressed Beamforming Feedback Matrix", "wlan_mgt.txbf.fm.compressed.bf",
+ {"STA can compress and use compressed Beamforming Feedback Matrix", "wlan.txbf.fm.compressed.bf",
FT_UINT32, BASE_HEX, VALS(txbf_feedback_flags), 0x00018000,
"Station can compress and use compressed Beamforming Feedback Matrix", HFILL }},
{&hf_ieee80211_txbf_min_group,
- {"Minimal grouping used for explicit feedback reports", "wlan_mgt.txbf.mingroup",
+ {"Minimal grouping used for explicit feedback reports", "wlan.txbf.mingroup",
FT_UINT32, BASE_HEX, VALS(txbf_min_group_flags), 0x00060000,
NULL, HFILL }},
{&hf_ieee80211_vht_cap,
- {"VHT Capabilities Info", "wlan_mgt.vht.capabilities",
+ {"VHT Capabilities Info", "wlan.vht.capabilities",
FT_UINT32, BASE_HEX, NULL, 0,
"VHT Capabilities information", HFILL }},
{&hf_ieee80211_vht_max_mpdu_length,
- {"Maximum MPDU Length", "wlan_mgt.vht.capabilities.maxmpdulength",
+ {"Maximum MPDU Length", "wlan.vht.capabilities.maxmpdulength",
FT_UINT32, BASE_HEX, VALS(vht_max_mpdu_length_flag), 0x00000003,
"In Octets unit", HFILL }},
{&hf_ieee80211_vht_supported_chan_width_set,
- {"Supported Channel Width Set", "wlan_mgt.vht.capabilities.supportedchanwidthset",
+ {"Supported Channel Width Set", "wlan.vht.capabilities.supportedchanwidthset",
FT_UINT32, BASE_HEX, VALS(vht_supported_chan_width_set_flag), 0x0000000c,
NULL, HFILL }},
{&hf_ieee80211_vht_rx_ldpc,
- {"Rx LDPC", "wlan_mgt.vht.capabilities.rxldpc",
+ {"Rx LDPC", "wlan.vht.capabilities.rxldpc",
FT_BOOLEAN, 32, TFS(&tfs_supported_not_supported), 0x00000010,
NULL, HFILL }},
{&hf_ieee80211_vht_short_gi_for_80,
- {"Short GI for 80MHz", "wlan_mgt.vht.capabilities.short80",
+ {"Short GI for 80MHz", "wlan.vht.capabilities.short80",
FT_BOOLEAN, 32, TFS(&tfs_supported_not_supported), 0x00000020,
NULL, HFILL }},
{&hf_ieee80211_vht_short_gi_for_160,
- {"Short GI for 160MHz and 80+80MHz", "wlan_mgt.vht.capabilities.short160",
+ {"Short GI for 160MHz and 80+80MHz", "wlan.vht.capabilities.short160",
FT_BOOLEAN, 32, TFS(&tfs_supported_not_supported), 0x00000040,
NULL, HFILL }},
{&hf_ieee80211_vht_tx_stbc,
- {"Tx STBC", "wlan_mgt.vht.capabilities.txstbc",
+ {"Tx STBC", "wlan.vht.capabilities.txstbc",
FT_BOOLEAN, 32, TFS(&tfs_supported_not_supported), 0x00000080,
NULL, HFILL }},
{&hf_ieee80211_vht_rx_stbc,
- {"Rx STBC", "wlan_mgt.vht.capabilities.rxstbc",
+ {"Rx STBC", "wlan.vht.capabilities.rxstbc",
FT_UINT32, BASE_HEX, VALS(vht_rx_stbc_flag), 0x00000700,
NULL, HFILL }},
{&hf_ieee80211_vht_su_beamformer_cap,
- {"SU Beam-former Capable", "wlan_mgt.vht.capabilities.subeamformer",
+ {"SU Beam-former Capable", "wlan.vht.capabilities.subeamformer",
FT_BOOLEAN, 32, TFS(&tfs_supported_not_supported), 0x00000800,
NULL, HFILL }},
{&hf_ieee80211_vht_su_beamformee_cap,
- {"SU Beam-formee Capable", "wlan_mgt.vht.capabilities.subeamformee",
+ {"SU Beam-formee Capable", "wlan.vht.capabilities.subeamformee",
FT_BOOLEAN, 32, TFS(&tfs_supported_not_supported), 0x00001000,
NULL, HFILL }},
{&hf_ieee80211_vht_beamformer_antennas,
- {"Compressed Steering Number of Beamformer Antennas Supported", "wlan_mgt.vht.capabilities.beamformerants",
+ {"Compressed Steering Number of Beamformer Antennas Supported", "wlan.vht.capabilities.beamformerants",
FT_UINT32, BASE_HEX, VALS(num_plus_one_3bit_flag), 0x0000e000,
NULL, HFILL }},
{&hf_ieee80211_vht_sounding_dimensions,
- {"Number of Sounding Dimensions", "wlan_mgt.vht.capabilities.soundingdimensions",
+ {"Number of Sounding Dimensions", "wlan.vht.capabilities.soundingdimensions",
FT_UINT32, BASE_HEX, VALS(num_plus_one_3bit_flag), 0x00070000,
NULL, HFILL }},
{&hf_ieee80211_vht_mu_beamformer_cap,
- {"MU Beam-former Capable", "wlan_mgt.vht.capabilities.mubeamformer",
+ {"MU Beam-former Capable", "wlan.vht.capabilities.mubeamformer",
FT_BOOLEAN, 32, TFS(&tfs_supported_not_supported), 0x00080000,
NULL, HFILL }},
{&hf_ieee80211_vht_mu_beamformee_cap,
- {"MU Beam-formee Capable", "wlan_mgt.vht.capabilities.mubeamformee",
+ {"MU Beam-formee Capable", "wlan.vht.capabilities.mubeamformee",
FT_BOOLEAN, 32, TFS(&tfs_supported_not_supported), 0x00100000,
NULL, HFILL }},
{&hf_ieee80211_vht_txop_ps,
- {"VHT TXOP PS", "wlan_mgt.vht.capabilities.vhttxopps",
+ {"VHT TXOP PS", "wlan.vht.capabilities.vhttxopps",
FT_BOOLEAN, 32, TFS(&tfs_supported_not_supported), 0x00200000,
NULL, HFILL }},
{&hf_ieee80211_vht_var_htc_field,
- {"+HTC-VHT Capable (VHT variant HT Control field)", "wlan_mgt.vht.capabilities.vhthtc",
+ {"+HTC-VHT Capable (VHT variant HT Control field)", "wlan.vht.capabilities.vhthtc",
FT_BOOLEAN, 32, TFS(&tfs_supported_not_supported), 0x00400000,
NULL, HFILL }},
{&hf_ieee80211_vht_max_ampdu,
- {"Max A-MPDU Length", "wlan_mgt.vht.capabilities.maxampdu",
+ {"Max A-MPDU Length", "wlan.vht.capabilities.maxampdu",
FT_UINT32, BASE_HEX, VALS(vht_max_ampdu_flag), 0x03800000,
"In Octets unit", HFILL }},
{&hf_ieee80211_vht_link_adaptation_cap,
- {"VHT Link Adaptation", "wlan_mgt.vht.capabilities.linkadapt",
+ {"VHT Link Adaptation", "wlan.vht.capabilities.linkadapt",
FT_UINT32, BASE_HEX, VALS(vht_link_adapt_flag), 0x0c000000,
NULL, HFILL }},
{&hf_ieee80211_vht_rx_pattern,
- {"Rx Antenna Pattern Consistency", "wlan_mgt.vht.capabilities.rxpatconsist",
+ {"Rx Antenna Pattern Consistency", "wlan.vht.capabilities.rxpatconsist",
FT_BOOLEAN, 32, TFS(&tfs_supported_not_supported), 0x10000000,
NULL, HFILL }},
{&hf_ieee80211_vht_tx_pattern,
- {"Tx Antenna Pattern Consistency", "wlan_mgt.vht.capabilities.txpatconsist",
+ {"Tx Antenna Pattern Consistency", "wlan.vht.capabilities.txpatconsist",
FT_BOOLEAN, 32, TFS(&tfs_supported_not_supported), 0x20000000,
NULL, HFILL }},
{&hf_ieee80211_vht_reserv,
- {"Reserved", "wlan_mgt.vht.reserved",
+ {"Reserved", "wlan.vht.reserved",
FT_BOOLEAN, 32, NULL, 0xc0000000,
NULL, HFILL }},
{&hf_ieee80211_vht_mcsset,
- {"VHT Supported MCS Set", "wlan_mgt.vht.mcsset",
+ {"VHT Supported MCS Set", "wlan.vht.mcsset",
FT_NONE, BASE_NONE, NULL, 0,
NULL, HFILL }},
{&hf_ieee80211_vht_mcsset_rx_mcs_map,
- {"Rx MCS Map", "wlan_mgt.vht.mcsset.rxmcsmap",
+ {"Rx MCS Map", "wlan.vht.mcsset.rxmcsmap",
FT_UINT16, BASE_HEX, NULL, 0,
NULL, HFILL }},
{&hf_ieee80211_vht_mcsset_rx_max_mcs_for_1_ss,
- {"Rx 1 SS", "wlan_mgt.vht.mcsset.rxmcsmap.ss1",
+ {"Rx 1 SS", "wlan.vht.mcsset.rxmcsmap.ss1",
FT_UINT16, BASE_HEX, VALS(vht_supported_mcs_flag), 0x0003,
NULL, HFILL }},
{&hf_ieee80211_vht_mcsset_rx_max_mcs_for_2_ss,
- {"Rx 2 SS", "wlan_mgt.vht.mcsset.rxmcsmap.ss2",
+ {"Rx 2 SS", "wlan.vht.mcsset.rxmcsmap.ss2",
FT_UINT16, BASE_HEX, VALS(vht_supported_mcs_flag), 0x000c,
NULL, HFILL }},
{&hf_ieee80211_vht_mcsset_rx_max_mcs_for_3_ss,
- {"Rx 3 SS", "wlan_mgt.vht.mcsset.rxmcsmap.ss3",
+ {"Rx 3 SS", "wlan.vht.mcsset.rxmcsmap.ss3",
FT_UINT16, BASE_HEX, VALS(vht_supported_mcs_flag), 0x0030,
NULL, HFILL }},
{&hf_ieee80211_vht_mcsset_rx_max_mcs_for_4_ss,
- {"Rx 4 SS", "wlan_mgt.vht.mcsset.rxmcsmap.ss4",
+ {"Rx 4 SS", "wlan.vht.mcsset.rxmcsmap.ss4",
FT_UINT16, BASE_HEX, VALS(vht_supported_mcs_flag), 0x00c0,
NULL, HFILL }},
{&hf_ieee80211_vht_mcsset_rx_max_mcs_for_5_ss,
- {"Rx 5 SS", "wlan_mgt.vht.mcsset.rxmcsmap.ss5",
+ {"Rx 5 SS", "wlan.vht.mcsset.rxmcsmap.ss5",
FT_UINT16, BASE_HEX, VALS(vht_supported_mcs_flag), 0x0300,
NULL, HFILL }},
{&hf_ieee80211_vht_mcsset_rx_max_mcs_for_6_ss,
- {"Rx 6 SS", "wlan_mgt.vht.mcsset.rxmcsmap.ss6",
+ {"Rx 6 SS", "wlan.vht.mcsset.rxmcsmap.ss6",
FT_UINT16, BASE_HEX, VALS(vht_supported_mcs_flag), 0x0c00,
NULL, HFILL }},
{&hf_ieee80211_vht_mcsset_rx_max_mcs_for_7_ss,
- {"Rx 7 SS", "wlan_mgt.vht.mcsset.rxmcsmap.ss7",
+ {"Rx 7 SS", "wlan.vht.mcsset.rxmcsmap.ss7",
FT_UINT16, BASE_HEX, VALS(vht_supported_mcs_flag), 0x3000,
NULL, HFILL }},
{&hf_ieee80211_vht_mcsset_rx_max_mcs_for_8_ss,
- {"Rx 8 SS", "wlan_mgt.vht.mcsset.rxmcsmap.ss8",
+ {"Rx 8 SS", "wlan.vht.mcsset.rxmcsmap.ss8",
FT_UINT16, BASE_HEX, VALS(vht_supported_mcs_flag), 0xc000,
NULL, HFILL }},
{&hf_ieee80211_vht_mcsset_rx_highest_long_gi,
- {"Rx Highest Long GI Data Rate (in Mb/s, 0 = subfield not in use)", "wlan_mgt.vht.mcsset.rxhighestlonggirate",
+ {"Rx Highest Long GI Data Rate (in Mb/s, 0 = subfield not in use)", "wlan.vht.mcsset.rxhighestlonggirate",
FT_UINT16, BASE_HEX, NULL, 0x1fff,
NULL, HFILL }},
{&hf_ieee80211_vht_mcsset_tx_mcs_map,
- {"Tx MCS Map", "wlan_mgt.vht.mcsset.txmcsmap",
+ {"Tx MCS Map", "wlan.vht.mcsset.txmcsmap",
FT_UINT16, BASE_HEX, NULL, 0,
NULL, HFILL }},
{&hf_ieee80211_vht_mcsset_tx_max_mcs_for_1_ss,
- {"Tx 1 SS", "wlan_mgt.vht.mcsset.txmcsmap.ss1",
+ {"Tx 1 SS", "wlan.vht.mcsset.txmcsmap.ss1",
FT_UINT16, BASE_HEX, VALS(vht_supported_mcs_flag), 0x0003,
NULL, HFILL }},
{&hf_ieee80211_vht_mcsset_tx_max_mcs_for_2_ss,
- {"Tx 2 SS", "wlan_mgt.vht.mcsset.txmcsmap.ss2",
+ {"Tx 2 SS", "wlan.vht.mcsset.txmcsmap.ss2",
FT_UINT16, BASE_HEX, VALS(vht_supported_mcs_flag), 0x000c,
NULL, HFILL }},
{&hf_ieee80211_vht_mcsset_tx_max_mcs_for_3_ss,
- {"Tx 3 SS", "wlan_mgt.vht.mcsset.txmcsmap.ss3",
+ {"Tx 3 SS", "wlan.vht.mcsset.txmcsmap.ss3",
FT_UINT16, BASE_HEX, VALS(vht_supported_mcs_flag), 0x0030,
NULL, HFILL }},
{&hf_ieee80211_vht_mcsset_tx_max_mcs_for_4_ss,
- {"Tx 4 SS", "wlan_mgt.vht.mcsset.txmcsmap.ss4",
+ {"Tx 4 SS", "wlan.vht.mcsset.txmcsmap.ss4",
FT_UINT16, BASE_HEX, VALS(vht_supported_mcs_flag), 0x00c0,
NULL, HFILL }},
{&hf_ieee80211_vht_mcsset_tx_max_mcs_for_5_ss,
- {"Tx 5 SS", "wlan_mgt.vht.mcsset.txmcsmap.ss5",
+ {"Tx 5 SS", "wlan.vht.mcsset.txmcsmap.ss5",
FT_UINT16, BASE_HEX, VALS(vht_supported_mcs_flag), 0x0300,
NULL, HFILL }},
{&hf_ieee80211_vht_mcsset_tx_max_mcs_for_6_ss,
- {"Tx 6 SS", "wlan_mgt.vht.mcsset.txmcsmap.ss6",
+ {"Tx 6 SS", "wlan.vht.mcsset.txmcsmap.ss6",
FT_UINT16, BASE_HEX, VALS(vht_supported_mcs_flag), 0x0c00,
NULL, HFILL }},
{&hf_ieee80211_vht_mcsset_tx_max_mcs_for_7_ss,
- {"Tx 7 SS", "wlan_mgt.vht.mcsset.txmcsmap.ss7",
+ {"Tx 7 SS", "wlan.vht.mcsset.txmcsmap.ss7",
FT_UINT16, BASE_HEX, VALS(vht_supported_mcs_flag), 0x3000,
NULL, HFILL }},
{&hf_ieee80211_vht_mcsset_tx_max_mcs_for_8_ss,
- {"Tx 8 SS", "wlan_mgt.vht.mcsset.txmcsmap.ss8",
+ {"Tx 8 SS", "wlan.vht.mcsset.txmcsmap.ss8",
FT_UINT16, BASE_HEX, VALS(vht_supported_mcs_flag), 0xc000,
NULL, HFILL }},
{&hf_ieee80211_vht_mcsset_tx_highest_long_gi,
- {"Tx Highest Long GI Data Rate (in Mb/s, 0 = subfield not in use)", "wlan_mgt.vht.mcsset.txhighestlonggirate",
+ {"Tx Highest Long GI Data Rate (in Mb/s, 0 = subfield not in use)", "wlan.vht.mcsset.txhighestlonggirate",
FT_UINT16, BASE_HEX, NULL, 0x1fff,
NULL, HFILL }},
{&hf_ieee80211_vht_op,
- {"VHT Operation Info", "wlan_mgt.vht.op",
+ {"VHT Operation Info", "wlan.vht.op",
FT_NONE, BASE_NONE, NULL, 0,
NULL, HFILL }},
{&hf_ieee80211_vht_op_channel_width,
- {"Channel Width", "wlan_mgt.vht.op.channelwidth",
+ {"Channel Width", "wlan.vht.op.channelwidth",
FT_UINT8, BASE_HEX, VALS(vht_op_channel_width_flag), 0,
NULL, HFILL }},
{&hf_ieee80211_vht_op_channel_center0,
- {"Channel Center Segment 0", "wlan_mgt.vht.op.channelcenter0",
+ {"Channel Center Segment 0", "wlan.vht.op.channelcenter0",
FT_UINT8, BASE_DEC, NULL, 0,
NULL, HFILL }},
{&hf_ieee80211_vht_op_channel_center1,
- {"Channel Center Segment 1", "wlan_mgt.vht.op.channelcenter1",
+ {"Channel Center Segment 1", "wlan.vht.op.channelcenter1",
FT_UINT8, BASE_DEC, NULL, 0,
NULL, HFILL }},
{&hf_ieee80211_vht_op_basic_mcs_map,
- {"Basic MCS Map", "wlan_mgt.vht.op.basicmcsmap",
+ {"Basic MCS Map", "wlan.vht.op.basicmcsmap",
FT_UINT16, BASE_HEX, NULL, 0,
NULL, HFILL }},
{&hf_ieee80211_vht_op_max_basic_mcs_for_1_ss,
- {"Basic 1 SS", "wlan_mgt.vht.op.basicmcsmap.ss1",
+ {"Basic 1 SS", "wlan.vht.op.basicmcsmap.ss1",
FT_UINT16, BASE_HEX, VALS(vht_supported_mcs_flag), 0x0003,
NULL, HFILL }},
{&hf_ieee80211_vht_op_max_basic_mcs_for_2_ss,
- {"Basic 2 SS", "wlan_mgt.vht.op.basicmcsmap.ss2",
+ {"Basic 2 SS", "wlan.vht.op.basicmcsmap.ss2",
FT_UINT16, BASE_HEX, VALS(vht_supported_mcs_flag), 0x000c,
NULL, HFILL }},
{&hf_ieee80211_vht_op_max_basic_mcs_for_3_ss,
- {"Basic 3 SS", "wlan_mgt.vht.op.basicmcsmap.ss3",
+ {"Basic 3 SS", "wlan.vht.op.basicmcsmap.ss3",
FT_UINT16, BASE_HEX, VALS(vht_supported_mcs_flag), 0x0030,
NULL, HFILL }},
{&hf_ieee80211_vht_op_max_basic_mcs_for_4_ss,
- {"Basic 4 SS", "wlan_mgt.vht.op.basicmcsmap.ss4",
+ {"Basic 4 SS", "wlan.vht.op.basicmcsmap.ss4",
FT_UINT16, BASE_HEX, VALS(vht_supported_mcs_flag), 0x00c0,
NULL, HFILL }},
{&hf_ieee80211_vht_op_max_basic_mcs_for_5_ss,
- {"Basic 5 SS", "wlan_mgt.vht.op.basicmcsmap.ss5",
+ {"Basic 5 SS", "wlan.vht.op.basicmcsmap.ss5",
FT_UINT16, BASE_HEX, VALS(vht_supported_mcs_flag), 0x0300,
NULL, HFILL }},
{&hf_ieee80211_vht_op_max_basic_mcs_for_6_ss,
- {"Basic 6 SS", "wlan_mgt.vht.op.basicmcsmap.ss6",
+ {"Basic 6 SS", "wlan.vht.op.basicmcsmap.ss6",
FT_UINT16, BASE_HEX, VALS(vht_supported_mcs_flag), 0x0c00,
NULL, HFILL }},
{&hf_ieee80211_vht_op_max_basic_mcs_for_7_ss,
- {"Basic 7 SS", "wlan_mgt.vht.op.basicmcsmap.ss7",
+ {"Basic 7 SS", "wlan.vht.op.basicmcsmap.ss7",
FT_UINT16, BASE_HEX, VALS(vht_supported_mcs_flag), 0x3000,
NULL, HFILL }},
{&hf_ieee80211_vht_op_max_basic_mcs_for_8_ss,
- {"Basic 8 SS", "wlan_mgt.vht.op.basicmcsmap.ss8",
+ {"Basic 8 SS", "wlan.vht.op.basicmcsmap.ss8",
FT_UINT16, BASE_HEX, VALS(vht_supported_mcs_flag), 0xc000,
NULL, HFILL }},
{&hf_ieee80211_vht_tpe_pwr_info,
- {"Tx Pwr Info", "wlan_mgt.vht.tpe.pwr_info",
+ {"Tx Pwr Info", "wlan.vht.tpe.pwr_info",
FT_UINT8, BASE_HEX, NULL, 0,
NULL, HFILL }},
{&hf_ieee80211_vht_tpe_pwr_info_count,
- {"Max Tx Pwr Count", "wlan_mgt.vht.tpe.pwr_info.count",
+ {"Max Tx Pwr Count", "wlan.vht.tpe.pwr_info.count",
FT_UINT8, BASE_DEC, NULL , 0x07,
NULL, HFILL }},
{&hf_ieee80211_vht_tpe_pwr_info_unit,
- {"Max Tx Pwr Unit Interpretation", "wlan_mgt.vht.tpe.pwr_info.unit",
+ {"Max Tx Pwr Unit Interpretation", "wlan.vht.tpe.pwr_info.unit",
FT_UINT8, BASE_DEC, VALS(vht_tpe_pwr_units) , 0x38,
NULL, HFILL }},
{&hf_ieee80211_vht_tpe_pwr_info_reserved,
- {"Reserved", "wlan_mgt.vht.tpe.pwr_info.reserved",
+ {"Reserved", "wlan.vht.tpe.pwr_info.reserved",
FT_UINT8, BASE_DEC, NULL , 0xC0,
NULL, HFILL }},
{&hf_ieee80211_vht_tpe_pwr_constr_20,
- {"Local Max Tx Pwr Constraint 20MHz", "wlan_mgt.vht.tpe.pwr_constr_20",
+ {"Local Max Tx Pwr Constraint 20MHz", "wlan.vht.tpe.pwr_constr_20",
FT_INT8, BASE_CUSTOM, CF_FUNC(vht_tpe_custom), 0,
NULL, HFILL }},
{&hf_ieee80211_vht_tpe_pwr_constr_40,
- {"Local Max Tx Pwr Constraint 40MHz", "wlan_mgt.vht.tpe.pwr_constr_40",
+ {"Local Max Tx Pwr Constraint 40MHz", "wlan.vht.tpe.pwr_constr_40",
FT_INT8, BASE_CUSTOM, CF_FUNC(vht_tpe_custom), 0,
NULL, HFILL }},
{&hf_ieee80211_vht_tpe_pwr_constr_80,
- {"Local Max Tx Pwr Constraint 80MHz", "wlan_mgt.vht.tpe.pwr_constr_80",
+ {"Local Max Tx Pwr Constraint 80MHz", "wlan.vht.tpe.pwr_constr_80",
FT_INT8, BASE_CUSTOM, CF_FUNC(vht_tpe_custom), 0,
NULL, HFILL }},
{&hf_ieee80211_vht_tpe_pwr_constr_160,
- {"Local Max Tx Pwr Constraint 160MHz/80+80 MHz", "wlan_mgt.vht.tpe.pwr_constr_160",
+ {"Local Max Tx Pwr Constraint 160MHz/80+80 MHz", "wlan.vht.tpe.pwr_constr_160",
FT_INT8, BASE_CUSTOM, CF_FUNC(vht_tpe_custom), 0,
NULL, HFILL }},
{&hf_ieee80211_txbf_csi_num_bf_ant,
- {"Max antennae STA can support when CSI feedback required", "wlan_mgt.txbf.csinumant",
+ {"Max antennae STA can support when CSI feedback required", "wlan.txbf.csinumant",
FT_UINT32, BASE_HEX, VALS(txbf_antenna_flags), 0x00180000,
"Max antennae station can support when CSI feedback required", HFILL }},
{&hf_ieee80211_txbf_uncomp_sm_bf_ant,
- {"Max antennae STA can support when uncompressed Beamforming feedback required", "wlan_mgt.txbf.fm.uncompressed.maxant",
+ {"Max antennae STA can support when uncompressed Beamforming feedback required", "wlan.txbf.fm.uncompressed.maxant",
FT_UINT32, BASE_HEX, VALS(txbf_antenna_flags), 0x00600000,
"Max antennae station can support when uncompressed Beamforming feedback required", HFILL }},
{&hf_ieee80211_txbf_comp_sm_bf_ant,
- {"Max antennae STA can support when compressed Beamforming feedback required", "wlan_mgt.txbf.fm.compressed.maxant",
+ {"Max antennae STA can support when compressed Beamforming feedback required", "wlan.txbf.fm.compressed.maxant",
FT_UINT32, BASE_HEX, VALS(txbf_antenna_flags), 0x01800000,
"Max antennae station can support when compressed Beamforming feedback required", HFILL }},
{&hf_ieee80211_txbf_csi_max_rows_bf,
- {"Maximum number of rows of CSI explicit feedback", "wlan_mgt.txbf.csi.maxrows",
+ {"Maximum number of rows of CSI explicit feedback", "wlan.txbf.csi.maxrows",
FT_UINT32, BASE_HEX, VALS(txbf_csi_max_rows_bf_flags), 0x06000000,
NULL, HFILL }},
{&hf_ieee80211_txbf_chan_est,
- {"Maximum number of space time streams for which channel dimensions can be simultaneously estimated", "wlan_mgt.txbf.channelest",
+ {"Maximum number of space time streams for which channel dimensions can be simultaneously estimated", "wlan.txbf.channelest",
FT_UINT32, BASE_HEX, VALS(txbf_chan_est_flags), 0x18000000,
NULL, HFILL }},
{&hf_ieee80211_txbf_resrv,
- {"Reserved", "wlan_mgt.txbf.reserved",
+ {"Reserved", "wlan.txbf.reserved",
FT_UINT32, BASE_HEX, NULL, 0xe0000000,
NULL, HFILL }},
{&hf_ieee80211_hta_cc,
- {"HT Control Channel", "wlan_mgt.hta.control_channel",
+ {"HT Control Channel", "wlan.hta.control_channel",
FT_UINT8, BASE_DEC, NULL, 0,
NULL, HFILL }},
{&hf_ieee80211_hta_cap,
- {"HT Additional Capabilities", "wlan_mgt.hta.capabilities",
+ {"HT Additional Capabilities", "wlan.hta.capabilities",
FT_UINT16, BASE_HEX, NULL, 0,
"HT Additional Capability information", HFILL }},
{&hf_ieee80211_hta_ext_chan_offset,
- {"Extension Channel Offset", "wlan_mgt.hta.capabilities.ext_chan_offset",
+ {"Extension Channel Offset", "wlan.hta.capabilities.ext_chan_offset",
FT_UINT16, BASE_HEX, VALS(hta_ext_chan_offset_flag), 0x0003,
NULL, HFILL }},
{&hf_ieee80211_hta_rec_tx_width,
- {"Recommended Tx Channel Width", "wlan_mgt.hta.capabilities.rec_tx_width",
+ {"Recommended Tx Channel Width", "wlan.hta.capabilities.rec_tx_width",
FT_BOOLEAN, 16, TFS(&hta_rec_tx_width_flag), 0x0004,
"Recommended Transmit Channel Width", HFILL }},
{&hf_ieee80211_hta_rifs_mode,
- {"Reduced Interframe Spacing (RIFS) Mode", "wlan_mgt.hta.capabilities.rifs_mode",
+ {"Reduced Interframe Spacing (RIFS) Mode", "wlan.hta.capabilities.rifs_mode",
FT_BOOLEAN, 16, TFS(&hta_rifs_mode_flag), 0x0008,
NULL, HFILL }},
{&hf_ieee80211_hta_controlled_access,
- {"Controlled Access Only", "wlan_mgt.hta.capabilities.controlled_access",
+ {"Controlled Access Only", "wlan.hta.capabilities.controlled_access",
FT_BOOLEAN, 16, TFS(&hta_controlled_access_flag), 0x0010,
NULL, HFILL }},
{&hf_ieee80211_hta_service_interval,
- {"Service Interval Granularity", "wlan_mgt.hta.capabilities.service_interval",
+ {"Service Interval Granularity", "wlan.hta.capabilities.service_interval",
FT_UINT16, BASE_HEX, VALS(hta_service_interval_flag), 0x00E0,
NULL, HFILL }},
{&hf_ieee80211_hta_operating_mode,
- {"Operating Mode", "wlan_mgt.hta.capabilities.operating_mode",
+ {"Operating Mode", "wlan.hta.capabilities.operating_mode",
FT_UINT16, BASE_HEX, VALS(hta_operating_mode_flag), 0x0003,
NULL, HFILL }},
{&hf_ieee80211_hta_non_gf_devices,
- {"Non Greenfield (GF) devices Present", "wlan_mgt.hta.capabilities.non_gf_devices",
+ {"Non Greenfield (GF) devices Present", "wlan.hta.capabilities.non_gf_devices",
FT_BOOLEAN, 16, TFS(&hta_non_gf_devices_flag), 0x0004,
"on Greenfield (GF) devices Present", HFILL }},
{&hf_ieee80211_hta_basic_stbc_mcs,
- {"Basic STB Modulation and Coding Scheme (MCS)", "wlan_mgt.hta.capabilities.basic_stbc_mcs",
+ {"Basic STB Modulation and Coding Scheme (MCS)", "wlan.hta.capabilities.basic_stbc_mcs",
FT_UINT16, BASE_HEX, NULL , 0x007f,
NULL, HFILL }},
{&hf_ieee80211_hta_dual_stbc_protection,
- {"Dual Clear To Send (CTS) Protection", "wlan_mgt.hta.capabilities.dual_stbc_protection",
+ {"Dual Clear To Send (CTS) Protection", "wlan.hta.capabilities.dual_stbc_protection",
FT_BOOLEAN, 16, TFS(&hta_dual_stbc_protection_flag), 0x0080,
NULL, HFILL }},
{&hf_ieee80211_hta_secondary_beacon,
- {"Secondary Beacon", "wlan_mgt.hta.capabilities.secondary_beacon",
+ {"Secondary Beacon", "wlan.hta.capabilities.secondary_beacon",
FT_BOOLEAN, 16, TFS(&hta_secondary_beacon_flag), 0x0100,
NULL, HFILL }},
{&hf_ieee80211_hta_lsig_txop_protection,
- {"L-SIG TXOP Protection Support", "wlan_mgt.hta.capabilities.lsig_txop_protection",
+ {"L-SIG TXOP Protection Support", "wlan.hta.capabilities.lsig_txop_protection",
FT_BOOLEAN, 16, TFS(&hta_lsig_txop_protection_flag), 0x0200,
NULL, HFILL }},
{&hf_ieee80211_hta_pco_active,
- {"Phased Coexistence Operation (PCO) Active", "wlan_mgt.hta.capabilities.pco_active",
+ {"Phased Coexistence Operation (PCO) Active", "wlan.hta.capabilities.pco_active",
FT_BOOLEAN, 16, TFS(&hta_pco_active_flag), 0x0400,
NULL, HFILL }},
{&hf_ieee80211_hta_pco_phase,
- {"Phased Coexistence Operation (PCO) Phase", "wlan_mgt.hta.capabilities.pco_phase",
+ {"Phased Coexistence Operation (PCO) Phase", "wlan.hta.capabilities.pco_phase",
FT_BOOLEAN, 16, TFS(&hta_pco_phase_flag), 0x0800,
NULL, HFILL }},
{&hf_ieee80211_antsel,
- {"Antenna Selection (ASEL) Capabilities", "wlan_mgt.asel",
+ {"Antenna Selection (ASEL) Capabilities", "wlan.asel",
FT_UINT8, BASE_HEX, NULL, 0,
NULL, HFILL }},
{&hf_ieee80211_antsel_vs,
- {"Antenna Selection (ASEL) Capabilities (VS)", "wlan_mgt.vs.asel",
+ {"Antenna Selection (ASEL) Capabilities (VS)", "wlan.vs.asel",
FT_UINT8, BASE_HEX, NULL, 0,
"Vendor Specific Antenna Selection (ASEL) Capabilities", HFILL }},
{&hf_ieee80211_antsel_b0,
- {"Antenna Selection Capable", "wlan_mgt.asel.capable",
+ {"Antenna Selection Capable", "wlan.asel.capable",
FT_BOOLEAN, 8, TFS(&tfs_supported_not_supported), 0x01,
NULL, HFILL }},
{&hf_ieee80211_antsel_b1,
- {"Explicit CSI Feedback Based Tx ASEL", "wlan_mgt.asel.txcsi",
+ {"Explicit CSI Feedback Based Tx ASEL", "wlan.asel.txcsi",
FT_BOOLEAN, 8, TFS(&tfs_supported_not_supported), 0x02,
NULL, HFILL }},
{&hf_ieee80211_antsel_b2,
- {"Antenna Indices Feedback Based Tx ASEL", "wlan_mgt.asel.txif",
+ {"Antenna Indices Feedback Based Tx ASEL", "wlan.asel.txif",
FT_BOOLEAN, 8, TFS(&tfs_supported_not_supported), 0x04,
NULL, HFILL }},
{&hf_ieee80211_antsel_b3,
- {"Explicit CSI Feedback", "wlan_mgt.asel.csi",
+ {"Explicit CSI Feedback", "wlan.asel.csi",
FT_BOOLEAN, 8, TFS(&tfs_supported_not_supported), 0x08,
NULL, HFILL }},
{&hf_ieee80211_antsel_b4,
- {"Antenna Indices Feedback", "wlan_mgt.asel.if",
+ {"Antenna Indices Feedback", "wlan.asel.if",
FT_BOOLEAN, 8, TFS(&tfs_supported_not_supported), 0x10,
NULL, HFILL }},
{&hf_ieee80211_antsel_b5,
- {"Rx ASEL", "wlan_mgt.asel.rx",
+ {"Rx ASEL", "wlan.asel.rx",
FT_BOOLEAN, 8, TFS(&tfs_supported_not_supported), 0x20,
NULL, HFILL }},
{&hf_ieee80211_antsel_b6,
- {"Tx Sounding PPDUs", "wlan_mgt.asel.sppdu",
+ {"Tx Sounding PPDUs", "wlan.asel.sppdu",
FT_BOOLEAN, 8, TFS(&tfs_supported_not_supported), 0x40,
NULL, HFILL }},
{&hf_ieee80211_antsel_b7,
- {"Reserved", "wlan_mgt.asel.reserved",
+ {"Reserved", "wlan.asel.reserved",
FT_UINT8, BASE_HEX, NULL, 0x80,
NULL, HFILL }},
{&hf_ieee80211_ht_info_delimiter1,
- {"HT Information Subset (1 of 3)", "wlan_mgt.ht.info.delim1",
+ {"HT Information Subset (1 of 3)", "wlan.ht.info.delim1",
FT_UINT8, BASE_HEX, NULL, 0,
NULL, HFILL }},
{&hf_ieee80211_ht_info_primary_channel,
- {"Primary Channel", "wlan_mgt.ht.info.primarychannel",
+ {"Primary Channel", "wlan.ht.info.primarychannel",
FT_UINT8, BASE_DEC, NULL, 0,
NULL, HFILL }},
{&hf_ieee80211_ht_info_secondary_channel_offset,
- {"Secondary channel offset", "wlan_mgt.ht.info.secchanoffset",
+ {"Secondary channel offset", "wlan.ht.info.secchanoffset",
FT_UINT8, BASE_HEX, VALS(ht_info_secondary_channel_offset_flags), 0x03,
NULL, HFILL }},
{&hf_ieee80211_ht_info_channel_width,
- {"Supported channel width", "wlan_mgt.ht.info.chanwidth",
+ {"Supported channel width", "wlan.ht.info.chanwidth",
FT_BOOLEAN, 8, TFS(&ht_info_channel_width_flag), 0x04,
NULL, HFILL }},
{&hf_ieee80211_ht_info_rifs_mode,
- {"Reduced Interframe Spacing (RIFS)", "wlan_mgt.ht.info.rifs",
+ {"Reduced Interframe Spacing (RIFS)", "wlan.ht.info.rifs",
FT_BOOLEAN, 8, TFS(&ht_info_rifs_mode_flag), 0x08,
NULL, HFILL }},
{&hf_ieee80211_ht_info_psmp_stas_only,
- {"Power Save Multi-Poll (PSMP) stations only", "wlan_mgt.ht.info.psmponly",
+ {"Power Save Multi-Poll (PSMP) stations only", "wlan.ht.info.psmponly",
FT_BOOLEAN, 8, TFS(&ht_info_psmp_stas_only_flag), 0x10,
NULL, HFILL }},
{&hf_ieee80211_ht_info_service_interval_granularity,
- {"Shortest service interval", "wlan_mgt.ht.info",
+ {"Shortest service interval", "wlan.ht.info",
FT_UINT8, BASE_HEX, VALS(ht_info_service_interval_granularity_flags), 0xe0,
NULL, HFILL }},
{&hf_ieee80211_ht_info_delimiter2,
- {"HT Information Subset (2 of 3)", "wlan_mgt.ht.info.delim2",
+ {"HT Information Subset (2 of 3)", "wlan.ht.info.delim2",
FT_UINT16, BASE_HEX, NULL, 0,
NULL, HFILL }},
{&hf_ieee80211_ht_info_operating_mode,
- {"Operating mode of BSS", "wlan_mgt.ht.info.operatingmode",
+ {"Operating mode of BSS", "wlan.ht.info.operatingmode",
FT_UINT16, BASE_HEX, VALS(ht_info_operating_mode_flags), 0x0003,
NULL, HFILL }},
{&hf_ieee80211_ht_info_non_greenfield_sta_present,
- {"Non-greenfield STAs present", "wlan_mgt.ht.info.greenfield",
+ {"Non-greenfield STAs present", "wlan.ht.info.greenfield",
FT_BOOLEAN, 16, TFS(&ht_info_non_greenfield_sta_present_flag), 0x0004,
NULL, HFILL }},
{&hf_ieee80211_ht_info_transmit_burst_limit,
- {"Transmit burst limit", "wlan_mgt.ht.info.burstlim",
+ {"Transmit burst limit", "wlan.ht.info.burstlim",
FT_BOOLEAN, 16, TFS(&ht_info_transmit_burst_limit_flag), 0x0008,
NULL, HFILL }},
{&hf_ieee80211_ht_info_obss_non_ht_stas_present,
- {"OBSS non-HT STAs present", "wlan_mgt.ht.info.obssnonht",
+ {"OBSS non-HT STAs present", "wlan.ht.info.obssnonht",
FT_BOOLEAN, 16, TFS(&ht_info_obss_non_ht_stas_present_flag), 0x0010,
NULL, HFILL }},
{&hf_ieee80211_ht_info_reserved_1,
- {"Reserved", "wlan_mgt.ht.info.reserved1",
+ {"Reserved", "wlan.ht.info.reserved1",
FT_UINT16, BASE_HEX, NULL, 0xffe0,
NULL, HFILL }},
{&hf_ieee80211_ht_info_delimiter3,
- {"HT Information Subset (3 of 3)", "wlan_mgt.ht.info.delim3",
+ {"HT Information Subset (3 of 3)", "wlan.ht.info.delim3",
FT_UINT16, BASE_HEX, NULL, 0,
NULL, HFILL }},
{&hf_ieee80211_ht_info_reserved_2,
- {"Reserved", "wlan_mgt.ht.info.reserved2",
+ {"Reserved", "wlan.ht.info.reserved2",
FT_UINT16, BASE_HEX, NULL, 0x003f,
NULL, HFILL }},
{&hf_ieee80211_ht_info_dual_beacon,
- {"Dual beacon", "wlan_mgt.ht.info.dualbeacon",
+ {"Dual beacon", "wlan.ht.info.dualbeacon",
FT_BOOLEAN, 16, TFS(&ht_info_dual_beacon_flag), 0x0040,
NULL, HFILL }},
{&hf_ieee80211_ht_info_dual_cts_protection,
- {"Dual Clear To Send (CTS) protection", "wlan_mgt.ht.info.dualcts",
+ {"Dual Clear To Send (CTS) protection", "wlan.ht.info.dualcts",
FT_BOOLEAN, 16, TFS(&ht_info_dual_cts_protection_flag), 0x0080,
NULL, HFILL }},
{&hf_ieee80211_ht_info_secondary_beacon,
- {"Beacon ID", "wlan_mgt.ht.info.secondarybeacon",
+ {"Beacon ID", "wlan.ht.info.secondarybeacon",
FT_BOOLEAN, 16, TFS(&ht_info_secondary_beacon_flag), 0x0100,
NULL, HFILL }},
{&hf_ieee80211_ht_info_lsig_txop_protection_full_support,
- {"L-SIG TXOP Protection Full Support", "wlan_mgt.ht.info.lsigprotsupport",
+ {"L-SIG TXOP Protection Full Support", "wlan.ht.info.lsigprotsupport",
FT_BOOLEAN, 16, TFS(&ht_info_lsig_txop_protection_full_support_flag), 0x0200,
NULL, HFILL }},
{&hf_ieee80211_ht_info_pco_active,
- {"Phased Coexistence Operation (PCO)", "wlan_mgt.ht.info.pco.active",
+ {"Phased Coexistence Operation (PCO)", "wlan.ht.info.pco.active",
FT_BOOLEAN, 16, TFS(&tfs_active_inactive), 0x0400,
NULL, HFILL }},
{&hf_ieee80211_ht_info_pco_phase,
- {"Phased Coexistence Operation (PCO) Phase", "wlan_mgt.ht.info.pco.phase",
+ {"Phased Coexistence Operation (PCO) Phase", "wlan.ht.info.pco.phase",
FT_BOOLEAN, 16, TFS(&ht_info_pco_phase_flag), 0x0800,
NULL, HFILL }},
{&hf_ieee80211_ht_info_reserved_3,
- {"Reserved", "wlan_mgt.ht.info.reserved3",
+ {"Reserved", "wlan.ht.info.reserved3",
FT_UINT16, BASE_HEX, NULL, 0xf000,
NULL, HFILL }},
{&hf_ieee80211_tag_ap_channel_report_operating_class,
- {"Operating Class", "wlan_mgt.ap_channel_report.operating_class",
+ {"Operating Class", "wlan.ap_channel_report.operating_class",
FT_UINT8, BASE_DEC, NULL, 0,
NULL, HFILL }},
{&hf_ieee80211_tag_ap_channel_report_channel_list,
- {"Channel List", "wlan_mgt.ap_channel_report.channel_list",
+ {"Channel List", "wlan.ap_channel_report.channel_list",
FT_UINT8, BASE_DEC, NULL, 0,
NULL, HFILL }},
{&hf_ieee80211_tag_secondary_channel_offset,
- {"Secondary Channel Offset", "wlan_mgt.secchanoffset",
+ {"Secondary Channel Offset", "wlan.secchanoffset",
FT_UINT8, BASE_HEX, VALS(ieee80211_tag_secondary_channel_offset_flags), 0,
NULL, HFILL }},
{&hf_ieee80211_tag_bss_ap_avg_access_delay,
- {"AP Average Access Delay", "wlan_mgt.bss_ap_avg_access_delay",
+ {"AP Average Access Delay", "wlan.bss_ap_avg_access_delay",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL }},
{&hf_ieee80211_tag_antenna_id,
- {"Antenna ID", "wlan_mgt.antenna.id",
+ {"Antenna ID", "wlan.antenna.id",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL }},
{&hf_ieee80211_tag_rsni,
- {"RSNI", "wlan_mgt.rsni",
+ {"RSNI", "wlan.rsni",
FT_UINT8, BASE_CUSTOM, CF_FUNC(rsni_base_custom), 0x0,
NULL, HFILL }},
{&hf_ieee80211_tag_bss_avb_adm_cap_bitmask,
- {"Available Admission Capacity Bitmask", "wlan_mgt.bss_avb_adm_cap.bitmask",
+ {"Available Admission Capacity Bitmask", "wlan.bss_avb_adm_cap.bitmask",
FT_UINT16, BASE_HEX, NULL, 0,
NULL, HFILL }},
{&hf_ieee80211_tag_bss_avb_adm_cap_bitmask_up0,
- {"UP0 (bit0)", "wlan_mgt.bss_avb_adm_cap.bitmask.up0",
+ {"UP0 (bit0)", "wlan.bss_avb_adm_cap.bitmask.up0",
FT_BOOLEAN, 16, TFS(&tfs_set_notset), BSS_BITMASK_UP0,
NULL, HFILL }},
{&hf_ieee80211_tag_bss_avb_adm_cap_bitmask_up1,
- {"UP1 (bit1)", "wlan_mgt.bss_avb_adm_cap.bitmask.up1",
+ {"UP1 (bit1)", "wlan.bss_avb_adm_cap.bitmask.up1",
FT_BOOLEAN, 16, TFS(&tfs_set_notset), BSS_BITMASK_UP1,
NULL, HFILL }},
{&hf_ieee80211_tag_bss_avb_adm_cap_bitmask_up2,
- {"UP2 (bit2)", "wlan_mgt.bss_avb_adm_cap.bitmask.up2",
+ {"UP2 (bit2)", "wlan.bss_avb_adm_cap.bitmask.up2",
FT_BOOLEAN, 16, TFS(&tfs_set_notset), BSS_BITMASK_UP2,
NULL, HFILL }},
{&hf_ieee80211_tag_bss_avb_adm_cap_bitmask_up3,
- {"UP3 (bit3)", "wlan_mgt.bss_avb_adm_cap.bitmask.up3",
+ {"UP3 (bit3)", "wlan.bss_avb_adm_cap.bitmask.up3",
FT_BOOLEAN, 16, TFS(&tfs_set_notset), BSS_BITMASK_UP3,
NULL, HFILL }},
{&hf_ieee80211_tag_bss_avb_adm_cap_bitmask_up4,
- {"UP4 (bit4)", "wlan_mgt.bss_avb_adm_cap.bitmask.up4",
+ {"UP4 (bit4)", "wlan.bss_avb_adm_cap.bitmask.up4",
FT_BOOLEAN, 16, TFS(&tfs_set_notset), BSS_BITMASK_UP4,
NULL, HFILL }},
{&hf_ieee80211_tag_bss_avb_adm_cap_bitmask_up5,
- {"UP5 (bit5)", "wlan_mgt.bss_avb_adm_cap.bitmask.up5",
+ {"UP5 (bit5)", "wlan.bss_avb_adm_cap.bitmask.up5",
FT_BOOLEAN, 16, TFS(&tfs_set_notset), BSS_BITMASK_UP5,
NULL, HFILL }},
{&hf_ieee80211_tag_bss_avb_adm_cap_bitmask_up6,
- {"UP0 (bit6)", "wlan_mgt.bss_avb_adm_cap.bitmask.up6",
+ {"UP0 (bit6)", "wlan.bss_avb_adm_cap.bitmask.up6",
FT_BOOLEAN, 16, TFS(&tfs_set_notset), BSS_BITMASK_UP6,
NULL, HFILL }},
{&hf_ieee80211_tag_bss_avb_adm_cap_bitmask_up7,
- {"UP7 (bit7)", "wlan_mgt.bss_avb_adm_cap.bitmask.up7",
+ {"UP7 (bit7)", "wlan.bss_avb_adm_cap.bitmask.up7",
FT_BOOLEAN, 16, TFS(&tfs_set_notset), BSS_BITMASK_UP7,
NULL, HFILL }},
{&hf_ieee80211_tag_bss_avb_adm_cap_bitmask_ac0,
- {"AC0 (bit8)", "wlan_mgt.bss_avb_adm_cap.bitmask.ac0",
+ {"AC0 (bit8)", "wlan.bss_avb_adm_cap.bitmask.ac0",
FT_BOOLEAN, 16, TFS(&tfs_set_notset), BSS_BITMASK_AC0,
NULL, HFILL }},
{&hf_ieee80211_tag_bss_avb_adm_cap_bitmask_ac1,
- {"AC1 (bit9)", "wlan_mgt.bss_avb_adm_cap.bitmask.AC1",
+ {"AC1 (bit9)", "wlan.bss_avb_adm_cap.bitmask.AC1",
FT_BOOLEAN, 16, TFS(&tfs_set_notset), BSS_BITMASK_AC1,
NULL, HFILL }},
{&hf_ieee80211_tag_bss_avb_adm_cap_bitmask_ac2,
- {"AC2 (bit10)", "wlan_mgt.bss_avb_adm_cap.bitmask.ac2",
+ {"AC2 (bit10)", "wlan.bss_avb_adm_cap.bitmask.ac2",
FT_BOOLEAN, 16, TFS(&tfs_set_notset), BSS_BITMASK_AC2,
NULL, HFILL }},
{&hf_ieee80211_tag_bss_avb_adm_cap_bitmask_ac3,
- {"AC3 (bit11)", "wlan_mgt.bss_avb_adm_cap.bitmask.ac3",
+ {"AC3 (bit11)", "wlan.bss_avb_adm_cap.bitmask.ac3",
FT_BOOLEAN, 16, TFS(&tfs_set_notset), BSS_BITMASK_AC3,
NULL, HFILL }},
{&hf_ieee80211_tag_bss_avb_adm_cap_bitmask_rsv,
- {"Reserved", "wlan_mgt.bss_avb_adm_cap.bitmask.rsv",
+ {"Reserved", "wlan.bss_avb_adm_cap.bitmask.rsv",
FT_UINT16, BASE_HEX, NULL, BSS_BITMASK_RSV,
NULL, HFILL }},
{&hf_ieee80211_tag_bss_avb_adm_cap_up0,
- {"UP0", "wlan_mgt.bss_avb_adm_cap.up0",
+ {"UP0", "wlan.bss_avb_adm_cap.up0",
FT_UINT16, BASE_DEC, NULL, 0x0,
NULL, HFILL }},
{&hf_ieee80211_tag_bss_avb_adm_cap_up1,
- {"UP1", "wlan_mgt.bss_avb_adm_cap.up1",
+ {"UP1", "wlan.bss_avb_adm_cap.up1",
FT_UINT16, BASE_DEC, NULL, 0x0,
NULL, HFILL }},
{&hf_ieee80211_tag_bss_avb_adm_cap_up2,
- {"UP2", "wlan_mgt.bss_avb_adm_cap.up2",
+ {"UP2", "wlan.bss_avb_adm_cap.up2",
FT_UINT16, BASE_DEC, NULL, 0x0,
NULL, HFILL }},
{&hf_ieee80211_tag_bss_avb_adm_cap_up3,
- {"UP3", "wlan_mgt.bss_avb_adm_cap.up3",
+ {"UP3", "wlan.bss_avb_adm_cap.up3",
FT_UINT16, BASE_DEC, NULL, 0x0,
NULL, HFILL }},
{&hf_ieee80211_tag_bss_avb_adm_cap_up4,
- {"UP4", "wlan_mgt.bss_avb_adm_cap.up4",
+ {"UP4", "wlan.bss_avb_adm_cap.up4",
FT_UINT16, BASE_DEC, NULL, 0x0,
NULL, HFILL }},
{&hf_ieee80211_tag_bss_avb_adm_cap_up5,
- {"UP5", "wlan_mgt.bss_avb_adm_cap.up5",
+ {"UP5", "wlan.bss_avb_adm_cap.up5",
FT_UINT16, BASE_DEC, NULL, 0x0,
NULL, HFILL }},
{&hf_ieee80211_tag_bss_avb_adm_cap_up6,
- {"UP6", "wlan_mgt.bss_avb_adm_cap.up6",
+ {"UP6", "wlan.bss_avb_adm_cap.up6",
FT_UINT16, BASE_DEC, NULL, 0x0,
NULL, HFILL }},
{&hf_ieee80211_tag_bss_avb_adm_cap_up7,
- {"UP7", "wlan_mgt.bss_avb_adm_cap.up7",
+ {"UP7", "wlan.bss_avb_adm_cap.up7",
FT_UINT16, BASE_DEC, NULL, 0x0,
NULL, HFILL }},
{&hf_ieee80211_tag_bss_avb_adm_cap_ac0,
- {"AC0", "wlan_mgt.bss_avb_adm_cap.ac0",
+ {"AC0", "wlan.bss_avb_adm_cap.ac0",
FT_UINT16, BASE_DEC, NULL, 0x0,
NULL, HFILL }},
{&hf_ieee80211_tag_bss_avb_adm_cap_ac1,
- {"AC1", "wlan_mgt.bss_avb_adm_cap.ac1",
+ {"AC1", "wlan.bss_avb_adm_cap.ac1",
FT_UINT16, BASE_DEC, NULL, 0x0,
NULL, HFILL }},
{&hf_ieee80211_tag_bss_avb_adm_cap_ac2,
- {"AC2", "wlan_mgt.bss_avb_adm_cap.ac2",
+ {"AC2", "wlan.bss_avb_adm_cap.ac2",
FT_UINT16, BASE_DEC, NULL, 0x0,
NULL, HFILL }},
{&hf_ieee80211_tag_bss_avb_adm_cap_ac3,
- {"AC3", "wlan_mgt.bss_avb_adm_cap.ac3",
+ {"AC3", "wlan.bss_avb_adm_cap.ac3",
FT_UINT16, BASE_DEC, NULL, 0x0,
NULL, HFILL }},
{&hf_ieee80211_tag_bss_avg_ac_access_delay_be,
- {"AC Average Access Delay for Best Effort", "wlan_mgt.bss_avg_ac_access_delay.be",
+ {"AC Average Access Delay for Best Effort", "wlan.bss_avg_ac_access_delay.be",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL }},
{&hf_ieee80211_tag_bss_avg_ac_access_delay_bk,
- {"AC Average Access Delay for Best Background", "wlan_mgt.bss_avg_ac_access_delay.bk",
+ {"AC Average Access Delay for Best Background", "wlan.bss_avg_ac_access_delay.bk",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL }},
{&hf_ieee80211_tag_bss_avg_ac_access_delay_vi,
- {"AC Average Access Delay for Video", "wlan_mgt.bss_avg_ac_access_delay_vi",
+ {"AC Average Access Delay for Video", "wlan.bss_avg_ac_access_delay_vi",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL }},
{&hf_ieee80211_tag_bss_avg_ac_access_delay_vo,
- {"AC Average Access Delay for Voice", "wlan_mgt.bss_avg_ac_access_delay_vo",
+ {"AC Average Access Delay for Voice", "wlan.bss_avg_ac_access_delay_vo",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL }},
/* 802.11-2012 Table 8-119-RM Enabled Capabilities definition */
{&hf_ieee80211_tag_rm_enabled_capabilities,
- {"RM Capabilities", "wlan_mgt.rmcap",
+ {"RM Capabilities", "wlan.rmcap",
FT_UINT8, BASE_HEX, NULL, 0,
"Signals support for radio measurements in a device", HFILL }},
/* RM Enabled Capability octet 1 */
{&hf_ieee80211_tag_rm_enabled_capabilities_b0,
- {"Link Measurement", "wlan_mgt.rmcap.b0",
+ {"Link Measurement", "wlan.rmcap.b0",
FT_BOOLEAN, 8, TFS(&tfs_enabled_disabled), 0x01,
NULL, HFILL }},
{&hf_ieee80211_tag_rm_enabled_capabilities_b1,
- {"Neighbor Report", "wlan_mgt.rmcap.b1",
+ {"Neighbor Report", "wlan.rmcap.b1",
FT_BOOLEAN, 8, TFS(&tfs_enabled_disabled), 0x02,
NULL, HFILL }},
{&hf_ieee80211_tag_rm_enabled_capabilities_b2,
- {"Parallel Measurements", "wlan_mgt.rmcap.b2",
+ {"Parallel Measurements", "wlan.rmcap.b2",
FT_BOOLEAN, 8, TFS(&tfs_enabled_disabled), 0x04,
NULL, HFILL }},
{&hf_ieee80211_tag_rm_enabled_capabilities_b3,
- {"Repeated Measurements", "wlan_mgt.rmcap.b3",
+ {"Repeated Measurements", "wlan.rmcap.b3",
FT_BOOLEAN, 8, TFS(&tfs_enabled_disabled), 0x08,
NULL, HFILL }},
{&hf_ieee80211_tag_rm_enabled_capabilities_b4,
- {"Beacon Passive Measurement", "wlan_mgt.rmcap.b4",
+ {"Beacon Passive Measurement", "wlan.rmcap.b4",
FT_BOOLEAN, 8, TFS(&tfs_enabled_disabled), 0x10,
NULL, HFILL }},
{&hf_ieee80211_tag_rm_enabled_capabilities_b5,
- {"Beacon Active Measurement", "wlan_mgt.rmcap.b5",
+ {"Beacon Active Measurement", "wlan.rmcap.b5",
FT_BOOLEAN, 8, TFS(&tfs_enabled_disabled), 0x20,
NULL, HFILL }},
{&hf_ieee80211_tag_rm_enabled_capabilities_b6,
- {"Beacon Table Measurement", "wlan_mgt.rmcap.b6",
+ {"Beacon Table Measurement", "wlan.rmcap.b6",
FT_BOOLEAN, 8, TFS(&tfs_supported_not_supported), 0x40,
NULL, HFILL }},
{&hf_ieee80211_tag_rm_enabled_capabilities_b7,
- {"Beacon Measurement Reporting Conditions", "wlan_mgt.rmcap.b7",
+ {"Beacon Measurement Reporting Conditions", "wlan.rmcap.b7",
FT_BOOLEAN, 8, TFS(&tfs_enabled_disabled), 0x80,
NULL, HFILL }},
/* RM Enabled Capability octet 2 */
{&hf_ieee80211_tag_rm_enabled_capabilities_b8,
- {"Frame Measurement", "wlan_mgt.rmcap.b8",
+ {"Frame Measurement", "wlan.rmcap.b8",
FT_BOOLEAN, 8, TFS(&tfs_enabled_disabled), 0x01,
NULL, HFILL }},
{&hf_ieee80211_tag_rm_enabled_capabilities_b9,
- {"Channel Load Measurement", "wlan_mgt.rmcap.b9",
+ {"Channel Load Measurement", "wlan.rmcap.b9",
FT_BOOLEAN, 8, TFS(&tfs_enabled_disabled), 0x02,
NULL, HFILL }},
{&hf_ieee80211_tag_rm_enabled_capabilities_b10,
- {"Noise Histogram Measurement", "wlan_mgt.rmcap.b10",
+ {"Noise Histogram Measurement", "wlan.rmcap.b10",
FT_BOOLEAN, 8, TFS(&tfs_enabled_disabled), 0x04,
NULL, HFILL }},
{&hf_ieee80211_tag_rm_enabled_capabilities_b11,
- {"Statistics Measurement", "wlan_mgt.rmcap.b11",
+ {"Statistics Measurement", "wlan.rmcap.b11",
FT_BOOLEAN, 8, TFS(&tfs_enabled_disabled), 0x08,
NULL, HFILL }},
{&hf_ieee80211_tag_rm_enabled_capabilities_b12,
- {"LCI Measurement", "wlan_mgt.rmcap.b12",
+ {"LCI Measurement", "wlan.rmcap.b12",
FT_BOOLEAN, 8, TFS(&tfs_enabled_disabled), 0x10,
NULL, HFILL }},
{&hf_ieee80211_tag_rm_enabled_capabilities_b13,
- {"LCI Azimuth capability", "wlan_mgt.rmcap.b13",
+ {"LCI Azimuth capability", "wlan.rmcap.b13",
FT_BOOLEAN, 8, TFS(&tfs_enabled_disabled), 0x20,
NULL, HFILL }},
{&hf_ieee80211_tag_rm_enabled_capabilities_b14,
- {"Transmit Stream/Category Measurement", "wlan_mgt.rmcap.b14",
+ {"Transmit Stream/Category Measurement", "wlan.rmcap.b14",
FT_BOOLEAN, 8, TFS(&tfs_supported_not_supported), 0x40,
NULL, HFILL }},
{&hf_ieee80211_tag_rm_enabled_capabilities_b15,
- {"Triggered Transmit Stream/Category Measurement", "wlan_mgt.rmcap.b15",
+ {"Triggered Transmit Stream/Category Measurement", "wlan.rmcap.b15",
FT_BOOLEAN, 8, TFS(&tfs_enabled_disabled), 0x80,
NULL, HFILL }},
/* RM Enabled Capability octet 3 */
{&hf_ieee80211_tag_rm_enabled_capabilities_b16,
- {"AP Channel Report capability", "wlan_mgt.rmcap.b16",
+ {"AP Channel Report capability", "wlan.rmcap.b16",
FT_BOOLEAN, 8, TFS(&tfs_enabled_disabled), 0x01,
NULL, HFILL }},
{&hf_ieee80211_tag_rm_enabled_capabilities_b17,
- {"RM MIB capability", "wlan_mgt.rmcap.b17",
+ {"RM MIB capability", "wlan.rmcap.b17",
FT_BOOLEAN, 8, TFS(&tfs_enabled_disabled), 0x02,
NULL, HFILL }},
{&hf_ieee80211_tag_rm_enabled_capabilities_b18to20,
- {"Operating Channel Max Measurement Duration", "wlan_mgt.rmcap.b18to20",
+ {"Operating Channel Max Measurement Duration", "wlan.rmcap.b18to20",
FT_UINT8, BASE_DEC, NULL, 0x1C,
NULL, HFILL }},
{&hf_ieee80211_tag_rm_enabled_capabilities_b21to23,
- {"Nonoperating Channel Max Measurement Duration", "wlan_mgt.rmcap.b21to23",
+ {"Nonoperating Channel Max Measurement Duration", "wlan.rmcap.b21to23",
FT_UINT8, BASE_DEC, NULL, 0xE0,
NULL, HFILL }},
/* RM Enabled Capability octet 4 */
{&hf_ieee80211_tag_rm_enabled_capabilities_b24to26,
- {"Measurement Pilotcapability", "wlan_mgt.rmcap.b24to26",
+ {"Measurement Pilotcapability", "wlan.rmcap.b24to26",
FT_UINT8, BASE_DEC, NULL, 0x07,
NULL, HFILL }},
{&hf_ieee80211_tag_rm_enabled_capabilities_b27,
- {"Measurement Pilot Transmission Information", "wlan_mgt.rmcap.b27",
+ {"Measurement Pilot Transmission Information", "wlan.rmcap.b27",
FT_BOOLEAN, 8, TFS(&tfs_enabled_disabled), 0x08,
NULL, HFILL }},
{&hf_ieee80211_tag_rm_enabled_capabilities_b28,
- {"Neighbor Report TSF Offset", "wlan_mgt.rmcap.b28",
+ {"Neighbor Report TSF Offset", "wlan.rmcap.b28",
FT_BOOLEAN, 8, TFS(&tfs_enabled_disabled), 0x10,
NULL, HFILL }},
{&hf_ieee80211_tag_rm_enabled_capabilities_b29,
- {"RCPI Measurement capability", "wlan_mgt.rmcap.b29",
+ {"RCPI Measurement capability", "wlan.rmcap.b29",
FT_BOOLEAN, 8, TFS(&tfs_enabled_disabled), 0x20,
NULL, HFILL }},
{&hf_ieee80211_tag_rm_enabled_capabilities_b30,
- {"RSNI Measurement capability", "wlan_mgt.rmcap.b30",
+ {"RSNI Measurement capability", "wlan.rmcap.b30",
FT_BOOLEAN, 8, TFS(&tfs_supported_not_supported), 0x40,
NULL, HFILL }},
{&hf_ieee80211_tag_rm_enabled_capabilities_b31,
- {"BSS Average Access Delay capability", "wlan_mgt.rmcap.b31",
+ {"BSS Average Access Delay capability", "wlan.rmcap.b31",
FT_BOOLEAN, 8, TFS(&tfs_enabled_disabled), 0x80,
NULL, HFILL }},
/* RM Enabled Capability octet 5 */
{&hf_ieee80211_tag_rm_enabled_capabilities_b32,
- {"BSS Available Admission Capacity capability", "wlan_mgt.rmcap.b32",
+ {"BSS Available Admission Capacity capability", "wlan.rmcap.b32",
FT_BOOLEAN, 8, TFS(&tfs_enabled_disabled), 0x01,
NULL, HFILL }},
{&hf_ieee80211_tag_rm_enabled_capabilities_b33,
- {"Antenna capability", "wlan_mgt.rmcap.b33",
+ {"Antenna capability", "wlan.rmcap.b33",
FT_BOOLEAN, 8, TFS(&tfs_enabled_disabled), 0x02,
NULL, HFILL }},
{&hf_ieee80211_tag_rm_enabled_capabilities_o5,
- {"Reserved", "wlan_mgt.rmcap.o5",
+ {"Reserved", "wlan.rmcap.o5",
FT_UINT8, BASE_HEX, NULL, 0xFC,
"Must be zero", HFILL }},
{&hf_ieee80211_tag_power_constraint_local,
- {"Local Power Constraint", "wlan_mgt.powercon.local",
+ {"Local Power Constraint", "wlan.powercon.local",
FT_UINT8, BASE_DEC, NULL, 0,
"Value that allows the mitigation requirements to be satisfied in the current channel", HFILL }},
{&hf_ieee80211_tag_power_capability_min,
- {"Minimum Transmit Power", "wlan_mgt.powercap.min",
+ {"Minimum Transmit Power", "wlan.powercap.min",
FT_UINT8, BASE_DEC_HEX, NULL, 0,
"The nominal minimum transmit power with which the STA is capable of transmitting in the current channel", HFILL }},
{&hf_ieee80211_tag_power_capability_max,
- {"Maximum Transmit Power", "wlan_mgt.powercap.max",
+ {"Maximum Transmit Power", "wlan.powercap.max",
FT_UINT8, BASE_DEC_HEX, NULL, 0,
"The nominal maximum transmit power with which the STA is capable of transmitting in the current channel", HFILL }},
{&hf_ieee80211_tag_tpc_report_trsmt_pow,
- {"Transmit Power", "wlan_mgt.tcprep.trsmt_pow",
+ {"Transmit Power", "wlan.tcprep.trsmt_pow",
FT_INT8, BASE_DEC, NULL, 0,
NULL, HFILL }},
{&hf_ieee80211_tag_tpc_report_link_mrg,
- {"Link Margin", "wlan_mgt.tcprep.link_mrg",
+ {"Link Margin", "wlan.tcprep.link_mrg",
FT_INT8, BASE_DEC, NULL, 0,
NULL, HFILL }},
{&hf_ieee80211_tag_supported_channels,
- {"Supported Channels Set", "wlan_mgt.supchan",
+ {"Supported Channels Set", "wlan.supchan",
FT_NONE, BASE_NONE, NULL, 0,
NULL, HFILL }},
{&hf_ieee80211_tag_supported_channels_first,
- {"First Supported Channel", "wlan_mgt.supchan.first",
+ {"First Supported Channel", "wlan.supchan.first",
FT_UINT8, BASE_DEC, NULL, 0,
NULL, HFILL }},
{&hf_ieee80211_tag_supported_channels_range,
- {"Supported Channel Range", "wlan_mgt.supchan.range",
+ {"Supported Channel Range", "wlan.supchan.range",
FT_UINT8, BASE_DEC, NULL, 0,
NULL, HFILL }},
{&hf_ieee80211_csa_channel_switch_mode,
- {"Channel Switch Mode", "wlan_mgt.csa.channel_switch_mode",
+ {"Channel Switch Mode", "wlan.csa.channel_switch_mode",
FT_UINT8, BASE_HEX, NULL, 0,
"Indicates any restrictions on transmission until a channel switch", HFILL }},
{&hf_ieee80211_csa_new_channel_number,
- {"New Channel Number", "wlan_mgt.csa.new_channel_number",
+ {"New Channel Number", "wlan.csa.new_channel_number",
FT_UINT8, BASE_HEX, NULL, 0,
"Set to the number of the channel to which the STA is moving", HFILL }},
{&hf_ieee80211_csa_channel_switch_count,
- {"Channel Switch Count", "wlan_mgt.csa.channel_switch.count",
+ {"Channel Switch Count", "wlan.csa.channel_switch.count",
FT_UINT8, BASE_DEC, NULL, 0,
"Set to the number of TBTTs until the STA sending the Channel Switch Announcement element switches to the new channel or shall be set to 0", HFILL }},
{&hf_ieee80211_mesh_channel_switch_ttl,
- {"Mesh Channel Switch TTL", "wlan_mgt.csa.mesh_channel_switch.ttl",
+ {"Mesh Channel Switch TTL", "wlan.csa.mesh_channel_switch.ttl",
FT_UINT8, BASE_DEC, NULL, 0,
NULL, HFILL }},
{&hf_ieee80211_mesh_channel_switch_flag,
- {"Mesh Channel Switch Flag", "wlan_mgt.csa.mesh_channel_switch.flag",
+ {"Mesh Channel Switch Flag", "wlan.csa.mesh_channel_switch.flag",
FT_UINT8, BASE_HEX, NULL, 0,
NULL, HFILL }},
{&hf_ieee80211_mesh_chswitch_flag_txrestrict,
- {"CSA Tx Restrict", "wlan_mgt.csa.mesh_channel_switch.flag.txrestrict",
+ {"CSA Tx Restrict", "wlan.csa.mesh_channel_switch.flag.txrestrict",
FT_BOOLEAN, 16, TFS(&csa_txrestrict_flags), 0x0001,
NULL, HFILL }},
{&hf_ieee80211_mesh_chswitch_flag_initiator,
- {"CSA Initiator", "wlan_mgt.csa.mesh_channel_switch.flag.initiator",
+ {"CSA Initiator", "wlan.csa.mesh_channel_switch.flag.initiator",
FT_BOOLEAN, 16, TFS(&csa_initiator_flags), 0x0002,
NULL, HFILL }},
{&hf_ieee80211_mesh_channel_switch_reason_code,
- {"Mesh Channel Switch Reason Code", "wlan_mgt.csa.mesh_channel_switch.reason_code",
+ {"Mesh Channel Switch Reason Code", "wlan.csa.mesh_channel_switch.reason_code",
FT_UINT16, BASE_HEX|BASE_EXT_STRING, &ieee80211_reason_code_ext, 0,
NULL, HFILL }},
{&hf_ieee80211_mesh_channel_switch_precedence_value,
- {"Mesh Channel Switch Precedence Value", "wlan_mgt.csa.mesh_channel_switch.pre_value",
+ {"Mesh Channel Switch Precedence Value", "wlan.csa.mesh_channel_switch.pre_value",
FT_UINT16, BASE_DEC, NULL, 0,
NULL, HFILL }},
{&hf_ieee80211_tag_measure_request_token,
- {"Measurement Token", "wlan_mgt.measure.req.token",
+ {"Measurement Token", "wlan.measure.req.token",
FT_UINT8, BASE_HEX, NULL, 0xff,
NULL, HFILL }},
{&hf_ieee80211_tag_measure_request_mode,
- {"Measurement Request Mode", "wlan_mgt.measure.req.mode",
+ {"Measurement Request Mode", "wlan.measure.req.mode",
FT_UINT8, BASE_HEX, NULL, 0xff,
NULL, HFILL }},
{&hf_ieee80211_tag_measure_request_mode_parallel,
- {"Parallel", "wlan_mgt.measure.req.reqmode.parallel",
+ {"Parallel", "wlan.measure.req.reqmode.parallel",
FT_BOOLEAN, 8, NULL, 0x01,
NULL, HFILL }},
{&hf_ieee80211_tag_measure_request_mode_enable,
- {"Measurement Request Mode Field", "wlan_mgt.measure.req.reqmode.enable",
+ {"Measurement Request Mode Field", "wlan.measure.req.reqmode.enable",
FT_BOOLEAN, 8, TFS(&tfs_enabled_disabled), 0x02,
NULL, HFILL }},
{&hf_ieee80211_tag_measure_request_mode_request,
- {"Measurement Reports", "wlan_mgt.measure.req.reqmode.request",
+ {"Measurement Reports", "wlan.measure.req.reqmode.request",
FT_BOOLEAN, 8, TFS(&tfs_accepted_not_accepted), 0x04,
NULL, HFILL }},
{&hf_ieee80211_tag_measure_request_mode_report,
- {"Autonomous Measurement Reports", "wlan_mgt.measure.req.reqmode.report",
+ {"Autonomous Measurement Reports", "wlan.measure.req.reqmode.report",
FT_BOOLEAN, 8, TFS(&tfs_accepted_not_accepted), 0x08,
NULL, HFILL }},
{&hf_ieee80211_tag_measure_request_mode_duration_mandatory,
- {"Duration Mandatory", "wlan_mgt.measure.req.reqmode.duration_mandatory",
+ {"Duration Mandatory", "wlan.measure.req.reqmode.duration_mandatory",
FT_BOOLEAN, 8, TFS(&tfs_accepted_not_accepted), 0x10,
NULL, HFILL }},
{&hf_ieee80211_tag_measure_request_mode_reserved,
- {"Reserved", "wlan_mgt.measure.req.reqmode.reserved",
+ {"Reserved", "wlan.measure.req.reqmode.reserved",
FT_UINT8, BASE_HEX, NULL, 0xE0,
NULL, HFILL }},
{&hf_ieee80211_tag_measure_request_type,
- {"Measurement Request Type", "wlan_mgt.measure.req.reqtype",
+ {"Measurement Request Type", "wlan.measure.req.reqtype",
FT_UINT8, BASE_HEX|BASE_EXT_STRING, &ieee80211_tag_measure_request_type_flags_ext, 0x00,
NULL, HFILL }},
{&hf_ieee80211_tag_measure_request_channel_number,
- {"Measurement Channel Number", "wlan_mgt.measure.req.channelnumber",
+ {"Measurement Channel Number", "wlan.measure.req.channelnumber",
FT_UINT8, BASE_CUSTOM, CF_FUNC(channel_number_custom), 0,
NULL, HFILL }},
{&hf_ieee80211_tag_measure_request_start_time,
- {"Measurement Start Time", "wlan_mgt.measure.req.starttime",
+ {"Measurement Start Time", "wlan.measure.req.starttime",
FT_UINT64, BASE_HEX, NULL, 0,
NULL, HFILL }},
{&hf_ieee80211_tag_measure_request_duration,
- {"Measurement Duration", "wlan_mgt.measure.req.channelnumber",
+ {"Measurement Duration", "wlan.measure.req.channelnumber",
FT_UINT16, BASE_HEX, NULL, 0,
"in TU (1 TU = 1024 us)", HFILL }},
{&hf_ieee80211_tag_measure_request_operating_class,
- {"Operating Class", "wlan_mgt.measure.req.operatingclass",
+ {"Operating Class", "wlan.measure.req.operatingclass",
FT_UINT8, BASE_DEC, NULL, 0,
NULL, HFILL }},
{&hf_ieee80211_tag_measure_request_randomization_interval,
- {"Randomization Interval", "wlan_mgt.measure.req.randint",
+ {"Randomization Interval", "wlan.measure.req.randint",
FT_UINT16, BASE_HEX, NULL, 0,
"in TU (1 TU = 1024 us)", HFILL }},
{&hf_ieee80211_tag_measure_request_measurement_mode,
- {"Measurement Mode", "wlan_mgt.measure.req.measurementmode",
+ {"Measurement Mode", "wlan.measure.req.measurementmode",
FT_UINT8, BASE_HEX, VALS(ieee80211_tag_measure_request_measurement_mode_flags), 0,
NULL, HFILL }},
{&hf_ieee80211_tag_measure_request_bssid,
- {"BSSID", "wlan_mgt.measure.req.bssid",
+ {"BSSID", "wlan.measure.req.bssid",
FT_ETHER, BASE_NONE, NULL, 0,
NULL, HFILL }},
{&hf_ieee80211_tag_measure_request_subelement_length,
- {"Length", "wlan_mgt.measure.req.sub.length",
+ {"Length", "wlan.measure.req.sub.length",
FT_UINT8, BASE_DEC, NULL, 0,
NULL, HFILL }},
{&hf_ieee80211_tag_measure_request_beacon_sub_id,
- {"SubElement ID", "wlan_mgt.measure.req.beacon.sub.id",
+ {"SubElement ID", "wlan.measure.req.beacon.sub.id",
FT_UINT8, BASE_DEC, VALS(ieee80211_tag_measure_request_beacon_sub_id_flags), 0,
NULL, HFILL }},
{&hf_ieee80211_tag_measure_request_beacon_sub_ssid,
- {"SSID", "wlan_mgt.measure.req.beacon.sub.ssid",
+ {"SSID", "wlan.measure.req.beacon.sub.ssid",
FT_STRING, BASE_NONE, 0, 0,
NULL, HFILL }},
{&hf_ieee80211_tag_measure_request_beacon_sub_bri_reporting_condition,
- {"Reporting Condition", "wlan_mgt.measure.req.beacon.sub.bri.repcond",
+ {"Reporting Condition", "wlan.measure.req.beacon.sub.bri.repcond",
FT_UINT8, BASE_HEX, VALS(ieee80211_tag_measure_request_beacon_sub_bri_reporting_condition_flags), 0,
NULL, HFILL }},
{&hf_ieee80211_tag_measure_request_beacon_sub_bri_threshold_offset,
- {"Threshold/Offset", "wlan_mgt.measure.req.beacon.sub.bri.threshold_offset",
+ {"Threshold/Offset", "wlan.measure.req.beacon.sub.bri.threshold_offset",
FT_UINT8, BASE_HEX, NULL, 0,
NULL, HFILL }},
{&hf_ieee80211_tag_measure_request_beacon_sub_reporting_detail,
- {"Reporting Detail", "wlan_mgt.measure.req.beacon.sub.bri.reporting_detail",
+ {"Reporting Detail", "wlan.measure.req.beacon.sub.bri.reporting_detail",
FT_UINT8, BASE_HEX, VALS(ieee80211_tag_measure_request_beacon_sub_reporting_detail_flags), 0,
NULL, HFILL }},
{&hf_ieee80211_tag_measure_request_beacon_sub_request,
- {"Request", "wlan_mgt.measure.req.beacon.sub.request",
+ {"Request", "wlan.measure.req.beacon.sub.request",
FT_UINT8, BASE_DEC, 0, 0,
NULL, HFILL }},
{&hf_ieee80211_tag_measure_request_beacon_unknown,
- {"Unknown Data", "wlan_mgt.measure.req.beacon.unknown",
+ {"Unknown Data", "wlan.measure.req.beacon.unknown",
FT_BYTES, BASE_NONE, NULL, 0,
"(not interpreted)", HFILL }},
{&hf_ieee80211_tag_measure_request_channel_load_sub_id,
- {"SubElement ID", "wlan_mgt.measure.req.channel_load.sub.id",
+ {"SubElement ID", "wlan.measure.req.channel_load.sub.id",
FT_UINT8, BASE_DEC, VALS(ieee80211_tag_measure_request_channel_load_sub_id_vals), 0,
NULL, HFILL }},
{&hf_ieee80211_tag_measure_request_channel_load_sub_reporting_condition,
- {"Reporting Condition", "wlan_mgt.measure.req.channel_load.sub.repcond",
+ {"Reporting Condition", "wlan.measure.req.channel_load.sub.repcond",
FT_UINT8, BASE_HEX, VALS(ieee80211_tag_measure_request_channel_load_sub_reporting_condition_vals), 0,
NULL, HFILL }},
{&hf_ieee80211_tag_measure_request_channel_load_sub_reporting_ref,
- {"Reference Value", "wlan_mgt.measure.req.channel_load.sub.ref",
+ {"Reference Value", "wlan.measure.req.channel_load.sub.ref",
FT_UINT8, BASE_HEX, NULL, 0,
NULL, HFILL }},
{&hf_ieee80211_tag_measure_request_noise_histogram_sub_id,
- {"SubElement ID", "wlan_mgt.measure.req.noise_histogram.sub.id",
+ {"SubElement ID", "wlan.measure.req.noise_histogram.sub.id",
FT_UINT8, BASE_DEC, VALS(ieee80211_tag_measure_request_noise_histogram_sub_id_vals), 0,
NULL, HFILL }},
{&hf_ieee80211_tag_measure_request_noise_histogram_sub_reporting_condition,
- {"Reporting Condition", "wlan_mgt.measure.reqnoise_histogram.sub.repcond",
+ {"Reporting Condition", "wlan.measure.reqnoise_histogram.sub.repcond",
FT_UINT8, BASE_HEX, VALS(ieee80211_tag_measure_request_noise_histogram_sub_reporting_condition_vals), 0,
NULL, HFILL }},
{&hf_ieee80211_tag_measure_request_noise_histogram_sub_reporting_anpi_ref,
- {"ANPI Reference Value", "wlan_mgt.measure.req.noise_histogram.sub.anpiref",
+ {"ANPI Reference Value", "wlan.measure.req.noise_histogram.sub.anpiref",
FT_UINT8, BASE_HEX, NULL, 0,
NULL, HFILL }},
{&hf_ieee80211_tag_measure_request_frame_request_type,
- {"Frame Request Type", "wlan_mgt.measure.req.frame_request_type",
+ {"Frame Request Type", "wlan.measure.req.frame_request_type",
FT_UINT8, BASE_HEX, NULL, 0,
NULL, HFILL }},
{&hf_ieee80211_tag_measure_request_mac_address,
- {"MAC Address", "wlan_mgt.measure.req.mac_address",
+ {"MAC Address", "wlan.measure.req.mac_address",
FT_BYTES, BASE_NONE, NULL, 0,
NULL, HFILL }},
{&hf_ieee80211_tag_measure_request_peer_mac_address,
- {"Peer MAC Address", "wlan_mgt.measure.req.peer_mac_address",
+ {"Peer MAC Address", "wlan.measure.req.peer_mac_address",
FT_BYTES, BASE_NONE, NULL, 0,
NULL, HFILL }},
{&hf_ieee80211_tag_measure_request_group_id,
- {"Group ID", "wlan_mgt.measure.req.groupid",
+ {"Group ID", "wlan.measure.req.groupid",
FT_UINT8, BASE_HEX|BASE_EXT_STRING, &ieee80211_tag_measure_request_group_id_flags_ext, 0,
NULL, HFILL }},
{&hf_ieee80211_tag_measure_request_unknown,
- {"Unknown Data", "wlan_mgt.measure.req.unknown",
+ {"Unknown Data", "wlan.measure.req.unknown",
FT_BYTES, BASE_NONE, NULL, 0,
"(not interpreted)", HFILL }},
{&hf_ieee80211_tag_measure_report_measurement_token,
- {"Measurement Token", "wlan_mgt.measure.req.token",
+ {"Measurement Token", "wlan.measure.req.token",
FT_UINT8, BASE_HEX, NULL, 0,
NULL, HFILL }},
{&hf_ieee80211_tag_measure_report_mode,
- {"Measurement Report Mode", "wlan_mgt.measure.req.mode",
+ {"Measurement Report Mode", "wlan.measure.req.mode",
FT_UINT8, BASE_HEX, NULL, 0,
NULL, HFILL }},
{&hf_ieee80211_tag_measure_report_mode_late,
- {"Measurement Report Mode Field", "wlan_mgt.measure.rep.repmode.late",
+ {"Measurement Report Mode Field", "wlan.measure.rep.repmode.late",
FT_BOOLEAN, 8, TFS(&tfs_enabled_disabled), 0x01,
NULL, HFILL }},
{&hf_ieee80211_tag_measure_report_mode_incapable,
- {"Measurement Reports", "wlan_mgt.measure.rep.repmode.incapable",
+ {"Measurement Reports", "wlan.measure.rep.repmode.incapable",
FT_BOOLEAN, 8, TFS(&tfs_accepted_not_accepted), 0x02,
NULL, HFILL }},
{&hf_ieee80211_tag_measure_report_mode_refused,
- {"Autonomous Measurement Reports", "wlan_mgt.measure.rep.repmode.refused",
+ {"Autonomous Measurement Reports", "wlan.measure.rep.repmode.refused",
FT_BOOLEAN, 8, TFS(&tfs_accepted_not_accepted), 0x04,
NULL, HFILL }},
{&hf_ieee80211_tag_measure_report_mode_reserved,
- {"Reserved", "wlan_mgt.measure.rep.repmode.reserved",
+ {"Reserved", "wlan.measure.rep.repmode.reserved",
FT_UINT8, BASE_HEX, NULL, 0xf8,
NULL, HFILL }},
{&hf_ieee80211_tag_measure_report_type,
- {"Measurement Report Type", "wlan_mgt.measure.rep.reptype",
+ {"Measurement Report Type", "wlan.measure.rep.reptype",
FT_UINT8, BASE_HEX|BASE_EXT_STRING, &ieee80211_tag_measure_report_type_flags_ext, 0x00,
NULL, HFILL }},
{&hf_ieee80211_tag_measure_report_channel_number,
- {"Measurement Channel Number", "wlan_mgt.measure.rep.channelnumber",
+ {"Measurement Channel Number", "wlan.measure.rep.channelnumber",
FT_UINT8, BASE_CUSTOM, CF_FUNC(channel_number_custom), 0,
NULL, HFILL }},
{&hf_ieee80211_tag_measure_report_start_time,
- {"Measurement Start Time", "wlan_mgt.measure.rep.starttime",
+ {"Measurement Start Time", "wlan.measure.rep.starttime",
FT_UINT64, BASE_HEX, NULL, 0,
NULL, HFILL }},
{&hf_ieee80211_tag_measure_report_duration,
- {"Measurement Duration", "wlan_mgt.measure.rep.channelnumber",
+ {"Measurement Duration", "wlan.measure.rep.channelnumber",
FT_UINT16, BASE_HEX, NULL, 0,
NULL, HFILL }},
{&hf_ieee80211_tag_measure_cca_busy_fraction,
- {"CCA Busy Fraction", "wlan_mgt.measure.rep.ccabusy",
+ {"CCA Busy Fraction", "wlan.measure.rep.ccabusy",
FT_UINT8, BASE_HEX, NULL, 0,
NULL, HFILL }},
{&hf_ieee80211_tag_measure_basic_map_field,
- {"Map Field", "wlan_mgt.measure.rep.mapfield",
+ {"Map Field", "wlan.measure.rep.mapfield",
FT_UINT8, BASE_HEX, NULL, 0,
NULL, HFILL }},
{&hf_ieee80211_tag_measure_map_field_bss,
- {"BSS", "wlan_mgt.measure.rep.repmode.mapfield.bss",
+ {"BSS", "wlan.measure.rep.repmode.mapfield.bss",
FT_BOOLEAN, 8, TFS(&ieee80211_tag_measure_map_field_bss_flag), 0x01,
NULL, HFILL }},
{&hf_ieee80211_tag_measure_map_field_odfm,
- {"Orthogonal Frequency Division Multiplexing (ODFM) Preamble", "wlan_mgt.measure.rep.repmode.mapfield.bss",
+ {"Orthogonal Frequency Division Multiplexing (ODFM) Preamble", "wlan.measure.rep.repmode.mapfield.bss",
FT_BOOLEAN, 8, TFS(&tfs_detected_not_detected), 0x02,
NULL, HFILL }},
{&hf_ieee80211_tag_measure_map_field_unident_signal,
- {"Unidentified Signal", "wlan_mgt.measure.rep.repmode.mapfield.unidentsig",
+ {"Unidentified Signal", "wlan.measure.rep.repmode.mapfield.unidentsig",
FT_BOOLEAN, 8, TFS(&tfs_detected_not_detected), 0x04,
NULL, HFILL }},
{&hf_ieee80211_tag_measure_map_field_radar,
- {"Radar", "wlan_mgt.measure.rep.repmode.mapfield.radar",
+ {"Radar", "wlan.measure.rep.repmode.mapfield.radar",
FT_BOOLEAN, 8, TFS(&tfs_detected_not_detected), 0x08,
NULL, HFILL }},
{&hf_ieee80211_tag_measure_map_field_unmeasured,
- {"Unmeasured", "wlan_mgt.measure.rep.repmode.mapfield.unmeasured",
+ {"Unmeasured", "wlan.measure.rep.repmode.mapfield.unmeasured",
FT_BOOLEAN, 8, TFS(&tfs_true_false), 0x10,
NULL, HFILL }},
{&hf_ieee80211_tag_measure_map_field_reserved,
- {"Reserved", "wlan_mgt.measure.rep.repmode.mapfield.reserved",
+ {"Reserved", "wlan.measure.rep.repmode.mapfield.reserved",
FT_UINT8, BASE_HEX, NULL, 0xe0,
NULL, HFILL }},
{&hf_ieee80211_tag_measure_rpi_histogram_report,
- {"Receive Power Indicator (RPI) Histogram Report", "wlan_mgt.measure.rep.rpi.histogram_report",
+ {"Receive Power Indicator (RPI) Histogram Report", "wlan.measure.rep.rpi.histogram_report",
FT_BYTES, BASE_NONE, NULL, 0,
NULL, HFILL }},
{&hf_ieee80211_tag_measure_rpi_histogram_report_0,
- {"RPI 0 Density", "wlan_mgt.measure.rep.rpi.rpi0density",
+ {"RPI 0 Density", "wlan.measure.rep.rpi.rpi0density",
FT_UINT8, BASE_HEX, NULL, 0,
"Receive Power Indicator (RPI) 0 Density", HFILL }},
{&hf_ieee80211_tag_measure_rpi_histogram_report_1,
- {"RPI 1 Density", "wlan_mgt.measure.rep.rpi.rpi1density",
+ {"RPI 1 Density", "wlan.measure.rep.rpi.rpi1density",
FT_UINT8, BASE_HEX, NULL, 0,
"Receive Power Indicator (RPI) 1 Density", HFILL }},
{&hf_ieee80211_tag_measure_rpi_histogram_report_2,
- {"RPI 2 Density", "wlan_mgt.measure.rep.rpi.rpi2density",
+ {"RPI 2 Density", "wlan.measure.rep.rpi.rpi2density",
FT_UINT8, BASE_HEX, NULL, 0,
"Receive Power Indicator (RPI) 2 Density", HFILL }},
{&hf_ieee80211_tag_measure_rpi_histogram_report_3,
- {"RPI 3 Density", "wlan_mgt.measure.rep.rpi.rpi3density",
+ {"RPI 3 Density", "wlan.measure.rep.rpi.rpi3density",
FT_UINT8, BASE_HEX, NULL, 0,
"Receive Power Indicator (RPI) 3 Density", HFILL }},
{&hf_ieee80211_tag_measure_rpi_histogram_report_4,
- {"RPI 4 Density", "wlan_mgt.measure.rep.rpi.rpi4density",
+ {"RPI 4 Density", "wlan.measure.rep.rpi.rpi4density",
FT_UINT8, BASE_HEX, NULL, 0,
"Receive Power Indicator (RPI) 4 Density", HFILL }},
{&hf_ieee80211_tag_measure_rpi_histogram_report_5,
- {"RPI 5 Density", "wlan_mgt.measure.rep.rpi.rpi5density",
+ {"RPI 5 Density", "wlan.measure.rep.rpi.rpi5density",
FT_UINT8, BASE_HEX, NULL, 0,
"Receive Power Indicator (RPI) 5 Density", HFILL }},
{&hf_ieee80211_tag_measure_rpi_histogram_report_6,
- {"RPI 6 Density", "wlan_mgt.measure.rep.rpi.rpi6density",
+ {"RPI 6 Density", "wlan.measure.rep.rpi.rpi6density",
FT_UINT8, BASE_HEX, NULL, 0,
"Receive Power Indicator (RPI) 6 Density", HFILL }},
{&hf_ieee80211_tag_measure_rpi_histogram_report_7,
- {"RPI 7 Density", "wlan_mgt.measure.rep.rpi.rpi7density",
+ {"RPI 7 Density", "wlan.measure.rep.rpi.rpi7density",
FT_UINT8, BASE_HEX, NULL, 0,
"Receive Power Indicator (RPI) 7 Density", HFILL }},
{&hf_ieee80211_tag_measure_report_operating_class,
- {"Operating Class", "wlan_mgt.measure.rep.operatingclass",
+ {"Operating Class", "wlan.measure.rep.operatingclass",
FT_UINT8, BASE_DEC, NULL, 0,
NULL, HFILL }},
{&hf_ieee80211_tag_measure_report_channel_load,
- {"Channel Load", "wlan_mgt.measure.rep.chanload",
+ {"Channel Load", "wlan.measure.rep.chanload",
FT_UINT8, BASE_HEX, NULL, 0,
NULL, HFILL }},
{&hf_ieee80211_tag_measure_report_frame_info,
- {"Reported Frame Information", "wlan_mgt.measure.rep.frameinfo",
+ {"Reported Frame Information", "wlan.measure.rep.frameinfo",
FT_UINT8, BASE_HEX, NULL, 0,
NULL, HFILL }},
{&hf_ieee80211_tag_measure_report_frame_info_phy_type,
- {"Condensed PHY", "wlan_mgt.measure.rep.frameinfo.phytype",
+ {"Condensed PHY", "wlan.measure.rep.frameinfo.phytype",
FT_UINT8, BASE_HEX, NULL, 0x7F,
NULL, HFILL }},
{&hf_ieee80211_tag_measure_report_frame_info_frame_type,
- {"Reported Frame Type", "wlan_mgt.measure.rep.frameinfo.frametype",
+ {"Reported Frame Type", "wlan.measure.rep.frameinfo.frametype",
FT_BOOLEAN, 8, TFS(&ieee80211_tag_measure_report_frame_info_frame_type_flag), 0x80,
NULL, HFILL }},
{&hf_ieee80211_tag_measure_report_rcpi,
- {"Received Channel Power Indicator (RCPI)", "wlan_mgt.measure.rep.rcpi",
+ {"Received Channel Power Indicator (RCPI)", "wlan.measure.rep.rcpi",
FT_UINT8, BASE_HEX, NULL, 0,
"in dBm", HFILL }},
{&hf_ieee80211_tag_measure_report_rsni,
- {"Received Signal to Noise Indicator (RSNI)", "wlan_mgt.measure.rep.rsni",
+ {"Received Signal to Noise Indicator (RSNI)", "wlan.measure.rep.rsni",
FT_UINT8, BASE_HEX, NULL, 0,
"in dB", HFILL }},
{&hf_ieee80211_tag_measure_report_bssid,
- {"BSSID Being Reported", "wlan_mgt.measure.rep.bssid",
+ {"BSSID Being Reported", "wlan.measure.rep.bssid",
FT_ETHER, BASE_NONE, NULL, 0,
NULL, HFILL }},
{&hf_ieee80211_tag_measure_report_ant_id,
- {"Antenna ID", "wlan_mgt.measure.rep.antid",
+ {"Antenna ID", "wlan.measure.rep.antid",
FT_UINT8, BASE_HEX, NULL, 0,
NULL, HFILL }},
{&hf_ieee80211_tag_measure_report_anpi,
- {"ANPI", "wlan_mgt.measure.rep.anpi",
+ {"ANPI", "wlan.measure.rep.anpi",
FT_UINT8, BASE_HEX, NULL, 0,
NULL, HFILL }},
{&hf_ieee80211_tag_measure_report_ipi_density_0,
- {"IPI Density 0", "wlan_mgt.measure.rep.ipi_density0",
+ {"IPI Density 0", "wlan.measure.rep.ipi_density0",
FT_UINT8, BASE_HEX, NULL, 0,
NULL, HFILL }},
{&hf_ieee80211_tag_measure_report_ipi_density_1,
- {"IPI Density 1", "wlan_mgt.measure.rep.ipi_density1",
+ {"IPI Density 1", "wlan.measure.rep.ipi_density1",
FT_UINT8, BASE_HEX, NULL, 0,
NULL, HFILL }},
{&hf_ieee80211_tag_measure_report_ipi_density_2,
- {"IPI Density 2", "wlan_mgt.measure.rep.ipi_density2",
+ {"IPI Density 2", "wlan.measure.rep.ipi_density2",
FT_UINT8, BASE_HEX, NULL, 0,
NULL, HFILL }},
{&hf_ieee80211_tag_measure_report_ipi_density_3,
- {"IPI Density 3", "wlan_mgt.measure.rep.ipi_density3",
+ {"IPI Density 3", "wlan.measure.rep.ipi_density3",
FT_UINT8, BASE_HEX, NULL, 0,
NULL, HFILL }},
{&hf_ieee80211_tag_measure_report_ipi_density_4,
- {"IPI Density 4", "wlan_mgt.measure.rep.ipi_density4",
+ {"IPI Density 4", "wlan.measure.rep.ipi_density4",
FT_UINT8, BASE_HEX, NULL, 0,
NULL, HFILL }},
{&hf_ieee80211_tag_measure_report_ipi_density_5,
- {"IPI Density 5", "wlan_mgt.measure.rep.ipi_density5",
+ {"IPI Density 5", "wlan.measure.rep.ipi_density5",
FT_UINT8, BASE_HEX, NULL, 0,
NULL, HFILL }},
{&hf_ieee80211_tag_measure_report_ipi_density_6,
- {"IPI Density 6", "wlan_mgt.measure.rep.ipi_density6",
+ {"IPI Density 6", "wlan.measure.rep.ipi_density6",
FT_UINT8, BASE_HEX, NULL, 0,
NULL, HFILL }},
{&hf_ieee80211_tag_measure_report_ipi_density_7,
- {"IPI Density 7", "wlan_mgt.measure.rep.ipi_density7",
+ {"IPI Density 7", "wlan.measure.rep.ipi_density7",
FT_UINT8, BASE_HEX, NULL, 0,
NULL, HFILL }},
{&hf_ieee80211_tag_measure_report_ipi_density_8,
- {"IPI Density 8", "wlan_mgt.measure.rep.ipi_density8",
+ {"IPI Density 8", "wlan.measure.rep.ipi_density8",
FT_UINT8, BASE_HEX, NULL, 0,
NULL, HFILL }},
{&hf_ieee80211_tag_measure_report_ipi_density_9,
- {"IPI Density 9", "wlan_mgt.measure.rep.ipi_density9",
+ {"IPI Density 9", "wlan.measure.rep.ipi_density9",
FT_UINT8, BASE_HEX, NULL, 0,
NULL, HFILL }},
{&hf_ieee80211_tag_measure_report_ipi_density_10,
- {"IPI Density 10", "wlan_mgt.measure.rep.ipi_density10",
+ {"IPI Density 10", "wlan.measure.rep.ipi_density10",
FT_UINT8, BASE_HEX, NULL, 0,
NULL, HFILL }},
{&hf_ieee80211_tag_measure_report_parent_tsf,
- {"Parent Timing Synchronization Function (TSF)", "wlan_mgt.measure.rep.parenttsf",
+ {"Parent Timing Synchronization Function (TSF)", "wlan.measure.rep.parenttsf",
FT_UINT32, BASE_HEX, NULL, 0,
NULL, HFILL }},
{&hf_ieee80211_tag_measure_report_subelement_length,
- {"Length", "wlan_mgt.measure.req.sub.length",
+ {"Length", "wlan.measure.req.sub.length",
FT_UINT8, BASE_DEC, NULL, 0,
NULL, HFILL }},
{&hf_ieee80211_tag_measure_report_beacon_sub_id,
- {"SubElement ID", "wlan_mgt.measure.req.beacon.sub.id",
+ {"SubElement ID", "wlan.measure.req.beacon.sub.id",
FT_UINT8, BASE_DEC, VALS(ieee80211_tag_measure_report_beacon_sub_id_vals), 0,
NULL, HFILL }},
{&hf_ieee80211_tag_measure_report_unknown,
- {"Unknown Data", "wlan_mgt.measure.rep.unknown",
+ {"Unknown Data", "wlan.measure.rep.unknown",
FT_BYTES, BASE_NONE, NULL, 0,
"(not interpreted)", HFILL }},
{&hf_ieee80211_tag_quiet_count,
- {"Count", "wlan_mgt.quiet.count",
+ {"Count", "wlan.quiet.count",
FT_UINT8, BASE_DEC, NULL, 0,
"Set to the number of TBTTs until the beacon interval during which the next quiet interval shall start", HFILL }},
{&hf_ieee80211_tag_quiet_period,
- {"Period", "wlan_mgt.quiet.period",
+ {"Period", "wlan.quiet.period",
FT_UINT8, BASE_DEC, NULL, 0,
"Set to the number of beacon intervals between the start of regularly scheduled quiet intervals", HFILL }},
{&hf_ieee80211_tag_quiet_duration,
- {"Duration", "wlan_mgt.quiet.duration",
+ {"Duration", "wlan.quiet.duration",
FT_UINT16, BASE_DEC, NULL, 0,
"Set to the duration of the quiet interval", HFILL }},
{&hf_ieee80211_tag_quiet_offset,
- {"Offset", "wlan_mgt.quiet.offset",
+ {"Offset", "wlan.quiet.offset",
FT_UINT16, BASE_DEC, NULL, 0,
"Set to the offset of the start of the quiet interval from the TBTT", HFILL }},
{&hf_ieee80211_tag_dfs_owner,
- {"Owner", "wlan_mgt.dfs.owner",
+ {"Owner", "wlan.dfs.owner",
FT_ETHER, BASE_NONE, NULL, 0,
"Set to the individual IEEE MAC address of the STA that is the currently known DFS Owner in the IBSS", HFILL }},
{&hf_ieee80211_tag_dfs_recovery_interval,
- {"Recovery Interval", "wlan_mgt.dfs.recovery_interval",
+ {"Recovery Interval", "wlan.dfs.recovery_interval",
FT_UINT8, BASE_DEC, NULL, 0,
"Indicates the time interval that shall be used for DFS owner recovery", HFILL }},
{&hf_ieee80211_tag_dfs_channel_map,
- {"Channel Map", "wlan_mgt.dfs.channel_map",
+ {"Channel Map", "wlan.dfs.channel_map",
FT_NONE, BASE_NONE, NULL, 0,
NULL, HFILL }},
{&hf_ieee80211_tag_dfs_channel_number,
- {"Channel Number", "wlan_mgt.dfs.channel_number",
+ {"Channel Number", "wlan.dfs.channel_number",
FT_UINT8, BASE_DEC, NULL, 0,
NULL, HFILL }},
{&hf_ieee80211_tag_dfs_map,
- {"Map", "wlan_mgt.dfs.map",
+ {"Map", "wlan.dfs.map",
FT_UINT8, BASE_HEX, NULL, 0,
NULL, HFILL }},
{&hf_ieee80211_tag_erp_info,
- {"ERP Information", "wlan_mgt.erp_info",
+ {"ERP Information", "wlan.erp_info",
FT_UINT8, BASE_HEX, NULL, 0,
NULL, HFILL }},
{&hf_ieee80211_tag_erp_info_erp_present,
- {"Non ERP Present", "wlan_mgt.erp_info.erp_present",
+ {"Non ERP Present", "wlan.erp_info.erp_present",
FT_BOOLEAN, 8, TFS(&tfs_set_notset), 0x01,
NULL, HFILL }},
{&hf_ieee80211_tag_erp_info_use_protection,
- {"Use Protection", "wlan_mgt.erp_info.use_protection",
+ {"Use Protection", "wlan.erp_info.use_protection",
FT_BOOLEAN, 8, TFS(&tfs_set_notset), 0x02,
NULL, HFILL }},
{&hf_ieee80211_tag_erp_info_barker_preamble_mode,
- {"Barker Preamble Mode", "wlan_mgt.erp_info.barker_preamble_mode",
+ {"Barker Preamble Mode", "wlan.erp_info.barker_preamble_mode",
FT_BOOLEAN, 8, TFS(&tfs_set_notset), 0x04,
NULL, HFILL }},
{&hf_ieee80211_tag_erp_info_reserved,
- {"Reserved", "wlan_mgt.erp_info.reserved",
+ {"Reserved", "wlan.erp_info.reserved",
FT_UINT8, BASE_HEX, NULL, 0xF8,
NULL, HFILL }},
/* Table 8-103-Capabilities field */
{&hf_ieee80211_tag_extended_capabilities,
- {"Extended Capabilities", "wlan_mgt.extcap",
+ {"Extended Capabilities", "wlan.extcap",
FT_UINT8, BASE_HEX, NULL, 0,
NULL, HFILL }},
/* P802.11n/D6.0 */
/* Extended Capability octet 1 */
{&hf_ieee80211_tag_extended_capabilities_b0,
- {"20/40 BSS Coexistence Management Support", "wlan_mgt.extcap.b0",
+ {"20/40 BSS Coexistence Management Support", "wlan.extcap.b0",
FT_BOOLEAN, 8, TFS(&tfs_supported_not_supported), 0x01,
"HT Information Exchange Support", HFILL }},
/* P802.11p/D4.0 */
{&hf_ieee80211_tag_extended_capabilities_b1,
- {"On-demand beacon", "wlan_mgt.extcap.b1",
+ {"On-demand beacon", "wlan.extcap.b1",
FT_BOOLEAN, 8, TFS(&tfs_supported_not_supported), 0x02,
NULL, HFILL }},
{&hf_ieee80211_tag_extended_capabilities_b2,
- {"Extended Channel Switching", "wlan_mgt.extcap.b2",
+ {"Extended Channel Switching", "wlan.extcap.b2",
FT_BOOLEAN, 8, TFS(&tfs_supported_not_supported), 0x04,
NULL, HFILL }},
{&hf_ieee80211_tag_extended_capabilities_b3,
- {"WAVE indication", "wlan_mgt.extcap.b3",
+ {"WAVE indication", "wlan.extcap.b3",
FT_BOOLEAN, 8, TFS(&tfs_supported_not_supported), 0x08,
NULL, HFILL }},
/*End: P802.11p/D4.0 */
{&hf_ieee80211_tag_extended_capabilities_b4,
- {"PSMP Capability", "wlan_mgt.extcap.b4",
+ {"PSMP Capability", "wlan.extcap.b4",
FT_BOOLEAN, 8, TFS(&tfs_supported_not_supported), 0x10,
NULL, HFILL }},
{&hf_ieee80211_tag_extended_capabilities_b5,
- {"Reserved", "wlan_mgt.extcap.b5",
+ {"Reserved", "wlan.extcap.b5",
FT_UINT8, BASE_HEX, NULL, 0x20,
"Must be zero", HFILL }},
{&hf_ieee80211_tag_extended_capabilities_b6,
- {"S-PSMP Support", "wlan_mgt.extcap.b6",
+ {"S-PSMP Support", "wlan.extcap.b6",
FT_BOOLEAN, 8, TFS(&tfs_supported_not_supported), 0x40,
NULL, HFILL }},
{&hf_ieee80211_tag_extended_capabilities_b7,
- {"Event", "wlan_mgt.extcap.b7",
+ {"Event", "wlan.extcap.b7",
FT_BOOLEAN, 8, TFS(&tfs_supported_not_supported), 0x80,
NULL, HFILL }},
/* Extended Capability octet 2 */
{&hf_ieee80211_tag_extended_capabilities_b8,
- {"Diagnostics", "wlan_mgt.extcap.b8",
+ {"Diagnostics", "wlan.extcap.b8",
FT_BOOLEAN, 8, TFS(&tfs_supported_not_supported), 0x01,
NULL, HFILL }},
{&hf_ieee80211_tag_extended_capabilities_b9,
- {"Multicast Diagnostics", "wlan_mgt.extcap.b9",
+ {"Multicast Diagnostics", "wlan.extcap.b9",
FT_BOOLEAN, 8, TFS(&tfs_supported_not_supported), 0x02,
NULL, HFILL }},
{&hf_ieee80211_tag_extended_capabilities_b10,
- {"Location Tracking", "wlan_mgt.extcap.b10",
+ {"Location Tracking", "wlan.extcap.b10",
FT_BOOLEAN, 8, TFS(&tfs_supported_not_supported), 0x04,
NULL, HFILL }},
{&hf_ieee80211_tag_extended_capabilities_b11,
- {"FMS", "wlan_mgt.extcap.b11",
+ {"FMS", "wlan.extcap.b11",
FT_BOOLEAN, 8, TFS(&tfs_supported_not_supported), 0x08,
NULL, HFILL }},
{&hf_ieee80211_tag_extended_capabilities_b12,
- {"Proxy ARP Service", "wlan_mgt.extcap.b12",
+ {"Proxy ARP Service", "wlan.extcap.b12",
FT_BOOLEAN, 8, TFS(&tfs_supported_not_supported), 0x10,
NULL, HFILL }},
{&hf_ieee80211_tag_extended_capabilities_b13,
- {"Collocated Interference Reporting", "wlan_mgt.extcap.b13",
+ {"Collocated Interference Reporting", "wlan.extcap.b13",
FT_BOOLEAN, 8, TFS(&tfs_supported_not_supported), 0x20,
NULL, HFILL }},
{&hf_ieee80211_tag_extended_capabilities_b14,
- {"Civic Location", "wlan_mgt.extcap.b14",
+ {"Civic Location", "wlan.extcap.b14",
FT_BOOLEAN, 8, TFS(&tfs_supported_not_supported), 0x40,
NULL, HFILL }},
{&hf_ieee80211_tag_extended_capabilities_b15,
- {"Geospatial Location", "wlan_mgt.extcap.b15",
+ {"Geospatial Location", "wlan.extcap.b15",
FT_BOOLEAN, 8, TFS(&tfs_supported_not_supported), 0x80,
NULL, HFILL }},
/* Extended Capability octet 3 */
{&hf_ieee80211_tag_extended_capabilities_b16,
- {"TFS", "wlan_mgt.extcap.b16",
+ {"TFS", "wlan.extcap.b16",
FT_BOOLEAN, 8, TFS(&tfs_supported_not_supported), 0x01,
NULL, HFILL }},
{&hf_ieee80211_tag_extended_capabilities_b17,
- {"WNM-Sleep Mode", "wlan_mgt.extcap.b17",
+ {"WNM-Sleep Mode", "wlan.extcap.b17",
FT_BOOLEAN, 8, TFS(&tfs_supported_not_supported), 0x02,
NULL, HFILL }},
{&hf_ieee80211_tag_extended_capabilities_b18,
- {"TIM Broadcast", "wlan_mgt.extcap.b18",
+ {"TIM Broadcast", "wlan.extcap.b18",
FT_BOOLEAN, 8, TFS(&tfs_supported_not_supported), 0x04,
NULL, HFILL }},
{&hf_ieee80211_tag_extended_capabilities_b19,
- {"BSS Transition", "wlan_mgt.extcap.b19",
+ {"BSS Transition", "wlan.extcap.b19",
FT_BOOLEAN, 8, TFS(&tfs_supported_not_supported), 0x08,
NULL, HFILL }},
{&hf_ieee80211_tag_extended_capabilities_b20,
- {"QoS Traffic Capability", "wlan_mgt.extcap.b20",
+ {"QoS Traffic Capability", "wlan.extcap.b20",
FT_BOOLEAN, 8, TFS(&tfs_supported_not_supported), 0x10,
NULL, HFILL }},
{&hf_ieee80211_tag_extended_capabilities_b21,
- {"AC Station Count", "wlan_mgt.extcap.b21",
+ {"AC Station Count", "wlan.extcap.b21",
FT_BOOLEAN, 8, TFS(&tfs_supported_not_supported), 0x20,
NULL, HFILL }},
{&hf_ieee80211_tag_extended_capabilities_b22,
- {"Multiple BSSID", "wlan_mgt.extcap.b22",
+ {"Multiple BSSID", "wlan.extcap.b22",
FT_BOOLEAN, 8, TFS(&tfs_supported_not_supported), 0x40,
NULL, HFILL }},
{&hf_ieee80211_tag_extended_capabilities_b23,
- {"Timing Measurement", "wlan_mgt.extcap.b23",
+ {"Timing Measurement", "wlan.extcap.b23",
FT_BOOLEAN, 8, TFS(&tfs_supported_not_supported), 0x80,
NULL, HFILL }},
/* Extended Capability octet 4 */
{&hf_ieee80211_tag_extended_capabilities_b24,
- {"Channel Usage", "wlan_mgt.extcap.b24",
+ {"Channel Usage", "wlan.extcap.b24",
FT_BOOLEAN, 8, TFS(&tfs_supported_not_supported), 0x01,
NULL, HFILL }},
{&hf_ieee80211_tag_extended_capabilities_b25,
- {"SSID List", "wlan_mgt.extcap.b25",
+ {"SSID List", "wlan.extcap.b25",
FT_BOOLEAN, 8, TFS(&tfs_supported_not_supported), 0x02,
NULL, HFILL }},
{&hf_ieee80211_tag_extended_capabilities_b26,
- {"DMS", "wlan_mgt.extcap.b26",
+ {"DMS", "wlan.extcap.b26",
FT_BOOLEAN, 8, TFS(&tfs_supported_not_supported), 0x04,
NULL, HFILL }},
{&hf_ieee80211_tag_extended_capabilities_b27,
- {"UTC TSF Offset", "wlan_mgt.extcap.b27",
+ {"UTC TSF Offset", "wlan.extcap.b27",
FT_BOOLEAN, 8, TFS(&tfs_supported_not_supported), 0x08,
NULL, HFILL }},
{&hf_ieee80211_tag_extended_capabilities_b28,
- {"Peer U-APSD Buffer STA Support", "wlan_mgt.extcap.b28",
+ {"Peer U-APSD Buffer STA Support", "wlan.extcap.b28",
FT_BOOLEAN, 8, TFS(&tfs_supported_not_supported), 0x10,
NULL, HFILL }},
{&hf_ieee80211_tag_extended_capabilities_b29,
- {"TDLS Peer PSM Support", "wlan_mgt.extcap.b29",
+ {"TDLS Peer PSM Support", "wlan.extcap.b29",
FT_BOOLEAN, 8, TFS(&tfs_supported_not_supported), 0x20,
NULL, HFILL }},
{&hf_ieee80211_tag_extended_capabilities_b30,
- {"TDLS channel switching", "wlan_mgt.extcap.b30",
+ {"TDLS channel switching", "wlan.extcap.b30",
FT_BOOLEAN, 8, TFS(&tfs_supported_not_supported), 0x40,
NULL, HFILL }},
{&hf_ieee80211_tag_extended_capabilities_b31,
- {"Interworking", "wlan_mgt.extcap.b31",
+ {"Interworking", "wlan.extcap.b31",
FT_BOOLEAN, 8, TFS(&tfs_supported_not_supported), 0x80,
NULL, HFILL }},
/* Extended Capability octet 5 */
{&hf_ieee80211_tag_extended_capabilities_b32,
- {"QoS Map", "wlan_mgt.extcap.b32",
+ {"QoS Map", "wlan.extcap.b32",
FT_BOOLEAN, 8, TFS(&tfs_supported_not_supported), 0x01,
NULL, HFILL }},
{&hf_ieee80211_tag_extended_capabilities_b33,
- {"EBR", "wlan_mgt.extcap.b33",
+ {"EBR", "wlan.extcap.b33",
FT_BOOLEAN, 8, TFS(&tfs_supported_not_supported), 0x02,
NULL, HFILL }},
{&hf_ieee80211_tag_extended_capabilities_b34,
- {"SSPN Interface", "wlan_mgt.extcap.b34",
+ {"SSPN Interface", "wlan.extcap.b34",
FT_BOOLEAN, 8, TFS(&tfs_supported_not_supported), 0x04,
NULL, HFILL }},
{&hf_ieee80211_tag_extended_capabilities_b35,
- {"Reserved", "wlan_mgt.extcap.b35",
+ {"Reserved", "wlan.extcap.b35",
FT_UINT8, BASE_HEX, NULL, 0x08,
"Must be zero", HFILL }},
{&hf_ieee80211_tag_extended_capabilities_b36,
- {"MSGCF Capability", "wlan_mgt.extcap.b36",
+ {"MSGCF Capability", "wlan.extcap.b36",
FT_BOOLEAN, 8, TFS(&tfs_supported_not_supported), 0x10,
NULL, HFILL }},
{&hf_ieee80211_tag_extended_capabilities_b37,
- {"TDLS support", "wlan_mgt.extcap.b37",
+ {"TDLS support", "wlan.extcap.b37",
FT_BOOLEAN, 8, TFS(&tfs_supported_not_supported), 0x20,
NULL, HFILL }},
{&hf_ieee80211_tag_extended_capabilities_b38,
- {"TDLS Prohibited", "wlan_mgt.extcap.b38",
+ {"TDLS Prohibited", "wlan.extcap.b38",
FT_BOOLEAN, 8, TFS(&tfs_supported_not_supported), 0x40,
NULL, HFILL }},
{&hf_ieee80211_tag_extended_capabilities_b39,
- {"TDLS Channel Switching Prohibited", "wlan_mgt.extcap.b39",
+ {"TDLS Channel Switching Prohibited", "wlan.extcap.b39",
FT_BOOLEAN, 8, TFS(&tfs_supported_not_supported), 0x80,
NULL, HFILL }},
/* Extended Capability octet 6 */
{&hf_ieee80211_tag_extended_capabilities_b40,
- {"Reject Unadmitted Frame", "wlan_mgt.extcap.b40",
+ {"Reject Unadmitted Frame", "wlan.extcap.b40",
FT_BOOLEAN, 8, TFS(&tfs_supported_not_supported), 0x01,
NULL, HFILL }},
{&hf_ieee80211_tag_extended_capabilities_serv_int_granularity,
{"Service Interval Granularity",
- "wlan_mgt.extcap.serv_int_granularity",
+ "wlan.extcap.serv_int_granularity",
FT_UINT8, BASE_DEC, VALS(service_interval_granularity_vals), 0x0e,
NULL, HFILL }},
{&hf_ieee80211_tag_extended_capabilities_b44,
- {"Identifier Location", "wlan_mgt.extcap.b44",
+ {"Identifier Location", "wlan.extcap.b44",
FT_BOOLEAN, 8, TFS(&tfs_supported_not_supported), 0x10,
NULL, HFILL }},
{&hf_ieee80211_tag_extended_capabilities_b45,
- {"U-APSD Coexistence", "wlan_mgt.extcap.b45",
+ {"U-APSD Coexistence", "wlan.extcap.b45",
FT_BOOLEAN, 8, TFS(&tfs_supported_not_supported), 0x20,
NULL, HFILL }},
{&hf_ieee80211_tag_extended_capabilities_b46,
- {"WNM-Notification", "wlan_mgt.extcap.b46",
+ {"WNM-Notification", "wlan.extcap.b46",
FT_BOOLEAN, 8, TFS(&tfs_supported_not_supported), 0x40,
NULL, HFILL }},
{&hf_ieee80211_tag_extended_capabilities_b47,
- {"QAB Capability", "wlan_mgt.extcap.b47",
+ {"QAB Capability", "wlan.extcap.b47",
FT_UINT8, BASE_HEX, NULL, 0x80,
"AP supports QAB", HFILL }},
/* Extended Capability octet 7 */
{&hf_ieee80211_tag_extended_capabilities_b48,
- {"UTF-8 SSID", "wlan_mgt.extcap.b48",
+ {"UTF-8 SSID", "wlan.extcap.b48",
FT_BOOLEAN, 8, TFS(&tfs_supported_not_supported), 0x01,
"The SSID in this BSS is interpreted using UTF-8 encoding", HFILL }},
{&hf_ieee80211_tag_extended_capabilities_o7,
- {"Reserved", "wlan_mgt.extcap.o7",
+ {"Reserved", "wlan.extcap.o7",
FT_UINT8, BASE_HEX, NULL, 0xfe,
"Must be zero", HFILL }},
/* Extended Capability octet 8 */
{&hf_ieee80211_tag_extended_capabilities_b61,
- {"TDLS Wider Bandwidth", "wlan_mgt.extcap.b61",
+ {"TDLS Wider Bandwidth", "wlan.extcap.b61",
FT_BOOLEAN, 8, TFS(&tfs_supported_not_supported), 0x20,
NULL, HFILL }},
{&hf_ieee80211_tag_extended_capabilities_b62,
- {"Operating Mode Notification", "wlan_mgt.extcap.b62",
+ {"Operating Mode Notification", "wlan.extcap.b62",
FT_BOOLEAN, 8, TFS(&tfs_supported_not_supported), 0x40,
NULL, HFILL }},
{&hf_ieee80211_tag_extended_capabilities_b63,
- {"Max Number Of MSDUs In A-MSDU", "wlan_mgt.extcap.b63",
+ {"Max Number Of MSDUs In A-MSDU", "wlan.extcap.b63",
FT_UINT8, BASE_DEC, NULL, 0x80,
"Part 1 (bit63)", HFILL }},
{&hf_ieee80211_tag_extended_capabilities_o8,
- {"Reserved", "wlan_mgt.extcap.o8",
+ {"Reserved", "wlan.extcap.o8",
FT_UINT8, BASE_HEX, NULL, 0x1f,
"Must be zero", HFILL }},
/* Extended Capability octet 9 */
{&hf_ieee80211_tag_extended_capabilities_b64,
- {"Max Number Of MSDUs In A-MSDU64", "wlan_mgt.extcap.b64",
+ {"Max Number Of MSDUs In A-MSDU64", "wlan.extcap.b64",
FT_UINT8, BASE_DEC, NULL, 0x01,
"Part 2 (bit64)", HFILL }},
{&hf_ieee80211_tag_extended_capabilities_o9,
- {"Reserved", "wlan_mgt.extcap.o9",
+ {"Reserved", "wlan.extcap.o9",
FT_UINT8, BASE_HEX, NULL, 0xfe,
"Must be zero", HFILL }},
{&hf_ieee80211_tag_cisco_ccx1_unknown,
- {"Unknown", "wlan_mgt.cisco.ccx1.unknown",
+ {"Unknown", "wlan.cisco.ccx1.unknown",
FT_BYTES, BASE_NONE, NULL, 0,
NULL, HFILL }},
{&hf_ieee80211_tag_cisco_ccx1_name,
- {"Name", "wlan_mgt.cisco.ccx1.name",
+ {"Name", "wlan.cisco.ccx1.name",
FT_STRING, BASE_NONE, NULL, 0,
NULL, HFILL }},
{&hf_ieee80211_tag_cisco_ccx1_clients,
- {"Clients", "wlan_mgt.cisco.ccx1.clients",
+ {"Clients", "wlan.cisco.ccx1.clients",
FT_UINT8, BASE_DEC, NULL, 0,
NULL, HFILL }},
{&hf_ieee80211_tag_cisco_ccx1_unknown2,
- {"Unknown2", "wlan_mgt.cisco.ccx1.unknown2",
+ {"Unknown2", "wlan.cisco.ccx1.unknown2",
FT_BYTES, BASE_NONE, NULL, 0,
NULL, HFILL }},
{&hf_ieee80211_tag_neighbor_report_bssid,
- {"BSSID", "wlan_mgt.nreport.bssid",
+ {"BSSID", "wlan.nreport.bssid",
FT_ETHER, BASE_NONE, NULL, 0,
NULL, HFILL }},
{&hf_ieee80211_tag_neighbor_report_bssid_info,
- {"BSSID Information", "wlan_mgt.nreport.bssid.info",
+ {"BSSID Information", "wlan.nreport.bssid.info",
FT_UINT32, BASE_HEX, NULL, 0,
NULL, HFILL }},
{&hf_ieee80211_tag_neighbor_report_bssid_info_reachability,
- {"AP Reachability", "wlan_mgt.nreport.bssid.info.reachability",
+ {"AP Reachability", "wlan.nreport.bssid.info.reachability",
FT_UINT32, BASE_HEX, VALS(ieee80211_neighbor_report_bssid_info_reachability_vals), 0x00000003,
"Indicates whether the AP identified by this BSSID is reachable by the STA that requested the neighbor report", HFILL }},
{&hf_ieee80211_tag_neighbor_report_bssid_info_security,
- {"Security", "wlan_mgt.nreport.bssid.info.security",
+ {"Security", "wlan.nreport.bssid.info.security",
FT_BOOLEAN, 32, NULL, 0x00000004,
"Indicates that the AP identified by this BSSID supports the same security provisioning as used by the STA in its current association", HFILL }},
{&hf_ieee80211_tag_neighbor_report_bssid_info_key_scope,
- {"Key Scope", "wlan_mgt.nreport.bssid.info.keyscope",
+ {"Key Scope", "wlan.nreport.bssid.info.keyscope",
FT_BOOLEAN, 32, NULL, 0x00000008,
"indicates the AP indicated by this BSSID has the same authenticator as the AP sending the report", HFILL }},
{&hf_ieee80211_tag_neighbor_report_bssid_info_capability,
- {"Capability", "wlan_mgt.nreport.bssid.info.capability",
+ {"Capability", "wlan.nreport.bssid.info.capability",
FT_UINT32, BASE_HEX, NULL, 0x000003F0,
"Contains selected capability information for the AP indicated by this BSSID", HFILL }},
{&hf_ieee80211_tag_neighbor_report_bssid_info_capability_spec_mng,
- {"Spectrum Management", "wlan_mgt.nreport.bssid.info.capability.specmngt",
+ {"Spectrum Management", "wlan.nreport.bssid.info.capability.specmngt",
FT_BOOLEAN, 32, NULL, 0x00000010,
NULL, HFILL }},
{&hf_ieee80211_tag_neighbor_report_bssid_info_capability_qos,
- {"QoS", "wlan_mgt.nreport.bssid.info.capability.qos",
+ {"QoS", "wlan.nreport.bssid.info.capability.qos",
FT_BOOLEAN, 32, NULL, 0x00000020,
NULL, HFILL }},
{&hf_ieee80211_tag_neighbor_report_bssid_info_capability_apsd,
- {"APSD", "wlan_mgt.nreport.bssid.info.capability.apsd",
+ {"APSD", "wlan.nreport.bssid.info.capability.apsd",
FT_BOOLEAN, 32, NULL, 0x00000040,
NULL, HFILL }},
{&hf_ieee80211_tag_neighbor_report_bssid_info_capability_radio_msnt,
- {"Radio Measurement", "wlan_mgt.nreport.bssid.info.capability.radiomsnt",
+ {"Radio Measurement", "wlan.nreport.bssid.info.capability.radiomsnt",
FT_BOOLEAN, 32, NULL, 0x00000080,
NULL, HFILL }},
{&hf_ieee80211_tag_neighbor_report_bssid_info_capability_dback,
- {"Delayed Block Ack", "wlan_mgt.nreport.bssid.info.capability.dback",
+ {"Delayed Block Ack", "wlan.nreport.bssid.info.capability.dback",
FT_BOOLEAN, 32, NULL, 0x000000100,
NULL, HFILL }},
{&hf_ieee80211_tag_neighbor_report_bssid_info_capability_iback,
- {"Immediate Block Ack", "wlan_mgt.nreport.bssid.info.capability.iback",
+ {"Immediate Block Ack", "wlan.nreport.bssid.info.capability.iback",
FT_BOOLEAN, 32, NULL, 0x00000200,
NULL, HFILL }},
{&hf_ieee80211_tag_neighbor_report_bssid_info_mobility_domain,
- {"Mobility Domain", "wlan_mgt.nreport.bssid.info.mobilitydomain",
+ {"Mobility Domain", "wlan.nreport.bssid.info.mobilitydomain",
FT_BOOLEAN, 32, NULL, 0x00000400,
"", HFILL }},
{&hf_ieee80211_tag_neighbor_report_bssid_info_high_throughput,
- {"High Throughput Control (+HTC)", "wlan_mgt.nreport.bssid.info.hthoughput",
+ {"High Throughput Control (+HTC)", "wlan.nreport.bssid.info.hthoughput",
FT_BOOLEAN, 32, NULL, 0x00000800,
NULL, HFILL }},
{&hf_ieee80211_tag_neighbor_report_bssid_info_reserved,
- {"Reserved", "wlan_mgt.nreport.bssid.info.reserved",
+ {"Reserved", "wlan.nreport.bssid.info.reserved",
FT_UINT32, BASE_HEX, NULL, 0xFFFFF000,
"Must be zero", HFILL }},
{&hf_ieee80211_tag_neighbor_report_ope_class,
- {"Operating Class", "wlan_mgt.nreport.opeclass",
+ {"Operating Class", "wlan.nreport.opeclass",
FT_UINT8, BASE_DEC, NULL, 0,
NULL, HFILL }},
{&hf_ieee80211_tag_neighbor_report_channel_number,
- {"Channel Number", "wlan_mgt.nreport.channumber",
+ {"Channel Number", "wlan.nreport.channumber",
FT_UINT8, BASE_CUSTOM, CF_FUNC(channel_number_custom), 0,
NULL, HFILL }},
{&hf_ieee80211_tag_neighbor_report_phy_type,
- {"PHY Type", "wlan_mgt.nreport.phytype",
+ {"PHY Type", "wlan.nreport.phytype",
FT_UINT8, BASE_HEX, NULL, 0,
NULL, HFILL }},
{&hf_ieee80211_tag_neighbor_report_subelement_id,
- {"Subelement ID", "wlan_mgt.nreport.subelement_id",
+ {"Subelement ID", "wlan.nreport.subelement_id",
FT_UINT8, BASE_HEX, VALS(ieee80211_neighbor_report_subelement_id_vals), 0,
NULL, HFILL }},
{&hf_ieee80211_tag_neighbor_report_subelement_length,
- {"Length", "wlan_mgt.nreport.phytype.subelement_length",
+ {"Length", "wlan.nreport.phytype.subelement_length",
FT_UINT8, BASE_HEX, NULL, 0,
NULL, HFILL }},
{&hf_ieee80211_tag_supported_ope_classes_current,
- {"Current Operating Class", "wlan_mgt.supopeclass.current",
+ {"Current Operating Class", "wlan.supopeclass.current",
FT_UINT8, BASE_HEX, NULL, 0,
NULL, HFILL }},
{&hf_ieee80211_tag_supported_ope_classes_alternate,
- {"Alternate Operating Classes", "wlan_mgt.supopeclass.alt",
+ {"Alternate Operating Classes", "wlan.supopeclass.alt",
FT_STRING, BASE_NONE, NULL, 0,
NULL, HFILL }},
{&hf_ieee80211_wfa_ie_type,
- {"Type", "wlan_mgt.wfa.ie.type",
+ {"Type", "wlan.wfa.ie.type",
FT_UINT8, BASE_HEX, VALS(ieee802111_wfa_ie_type_vals), 0,
NULL, HFILL }},
{&hf_ieee80211_wfa_ie_wpa_version,
- {"WPA Version", "wlan_mgt.wfa.ie.wpa.version",
+ {"WPA Version", "wlan.wfa.ie.wpa.version",
FT_UINT16, BASE_DEC, NULL, 0,
NULL, HFILL }},
{&hf_ieee80211_wfa_ie_wpa_mcs,
- {"Multicast Cipher Suite", "wlan_mgt.wfa.ie.wpa.mcs",
+ {"Multicast Cipher Suite", "wlan.wfa.ie.wpa.mcs",
FT_UINT32, BASE_CUSTOM, CF_FUNC(wpa_mcs_base_custom), 0,
"Contains the cipher suite selector used by the BSS to protect broadcast/multicasttraffic", HFILL }},
{&hf_ieee80211_wfa_ie_wpa_mcs_oui,
- {"Multicast Cipher Suite OUI", "wlan_mgt.wfa.ie.wpa.mcs.oui",
+ {"Multicast Cipher Suite OUI", "wlan.wfa.ie.wpa.mcs.oui",
FT_UINT24, BASE_CUSTOM, CF_FUNC(oui_base_custom), 0,
NULL, HFILL }},
{&hf_ieee80211_wfa_ie_wpa_mcs_type,
- {"Multicast Cipher Suite type", "wlan_mgt.wfa.ie.wpa.mcs.type",
+ {"Multicast Cipher Suite type", "wlan.wfa.ie.wpa.mcs.type",
FT_UINT8, BASE_DEC, NULL, 0,
NULL, HFILL }},
{&hf_ieee80211_wfa_ie_wpa_mcs_wfa_type,
- {"Multicast Cipher Suite type", "wlan_mgt.wfa.ie.wpa.mcs.type",
+ {"Multicast Cipher Suite type", "wlan.wfa.ie.wpa.mcs.type",
FT_UINT8, BASE_DEC, VALS(ieee80211_wfa_ie_wpa_cipher_vals), 0,
NULL, HFILL }},
{&hf_ieee80211_wfa_ie_wpa_ucs_count,
- {"Unicast Cipher Suite Count", "wlan_mgt.wfa.ie.wpa.ucs.count",
+ {"Unicast Cipher Suite Count", "wlan.wfa.ie.wpa.ucs.count",
FT_UINT16, BASE_DEC, NULL, 0,
"Indicates the number of pairwise cipher suite selectors that are contained in the Unicast Cipher Suite List", HFILL }},
{&hf_ieee80211_wfa_ie_wpa_ucs_list,
- {"Unicast Cipher Suite List", "wlan_mgt.wfa.ie.wpa.ucs.list",
+ {"Unicast Cipher Suite List", "wlan.wfa.ie.wpa.ucs.list",
FT_NONE, BASE_NONE, NULL, 0,
"Contains a series of cipher suite selectors that indicate the Unicast cipher suites", HFILL }},
{&hf_ieee80211_wfa_ie_wpa_ucs,
- {"Unicast Cipher Suite", "wlan_mgt.wfa.ie.wpa.ucs",
+ {"Unicast Cipher Suite", "wlan.wfa.ie.wpa.ucs",
FT_UINT32, BASE_CUSTOM, CF_FUNC(wpa_ucs_base_custom), 0,
NULL, HFILL }},
{&hf_ieee80211_wfa_ie_wpa_ucs_oui,
- {"Unicast Cipher Suite OUI", "wlan_mgt.wfa.ie.wpau.cs.oui",
+ {"Unicast Cipher Suite OUI", "wlan.wfa.ie.wpau.cs.oui",
FT_UINT24, BASE_CUSTOM, CF_FUNC(oui_base_custom), 0,
NULL, HFILL }},
{&hf_ieee80211_wfa_ie_wpa_ucs_type,
- {"Unicast Cipher Suite type", "wlan_mgt.wfa.ie.wpa.ucs.type",
+ {"Unicast Cipher Suite type", "wlan.wfa.ie.wpa.ucs.type",
FT_UINT8, BASE_DEC, NULL, 0,
NULL, HFILL }},
{&hf_ieee80211_wfa_ie_wpa_ucs_wfa_type,
- {"Unicast Cipher Suite type", "wlan_mgt.wfa.ie.wpa.ucs.type",
+ {"Unicast Cipher Suite type", "wlan.wfa.ie.wpa.ucs.type",
FT_UINT8, BASE_DEC, VALS(ieee80211_wfa_ie_wpa_cipher_vals), 0,
NULL, HFILL }},
{&hf_ieee80211_wfa_ie_wpa_akms_count,
- {"Auth Key Management (AKM) Suite Count", "wlan_mgt.wfa.ie.wpa.akms.count",
+ {"Auth Key Management (AKM) Suite Count", "wlan.wfa.ie.wpa.akms.count",
FT_UINT16, BASE_DEC, NULL, 0,
"Indicates the number of Auth Key Management suite selectors that are contained in the Auth Key Management Suite List", HFILL }},
{&hf_ieee80211_wfa_ie_wpa_akms_list,
- {"Auth Key Management (AKM) List", "wlan_mgt.wfa.ie.wpa.akms.list",
+ {"Auth Key Management (AKM) List", "wlan.wfa.ie.wpa.akms.list",
FT_NONE, BASE_NONE, NULL, 0,
"Contains a series of cipher suite selectors that indicate the AKM suites", HFILL }},
{&hf_ieee80211_wfa_ie_wpa_akms,
- {"Auth Key Management (AKM) Suite", "wlan_mgt.wfa.ie.wpa.akms",
+ {"Auth Key Management (AKM) Suite", "wlan.wfa.ie.wpa.akms",
FT_UINT32, BASE_CUSTOM, CF_FUNC(wpa_akms_base_custom), 0,
NULL, HFILL }},
{&hf_ieee80211_wfa_ie_wpa_akms_oui,
- {"Auth Key Management (AKM) OUI", "wlan_mgt.wfa.ie.wpa.akms.oui",
+ {"Auth Key Management (AKM) OUI", "wlan.wfa.ie.wpa.akms.oui",
FT_UINT24, BASE_CUSTOM, CF_FUNC(oui_base_custom), 0,
NULL, HFILL }},
{&hf_ieee80211_wfa_ie_wpa_akms_type,
- {"Auth Key Management (AKM) type", "wlan_mgt.wfa.ie.wpa.akms.type",
+ {"Auth Key Management (AKM) type", "wlan.wfa.ie.wpa.akms.type",
FT_UINT8, BASE_DEC, NULL, 0,
NULL, HFILL }},
{&hf_ieee80211_wfa_ie_wpa_akms_wfa_type,
- {"Auth Key Management (AKM) type", "wlan_mgt.wfa.ie.wpa.type",
+ {"Auth Key Management (AKM) type", "wlan.wfa.ie.wpa.type",
FT_UINT8, BASE_DEC, VALS(ieee80211_wfa_ie_wpa_keymgmt_vals), 0,
NULL, HFILL }},
{&hf_ieee80211_wfa_ie_wme_subtype,
- {"WME Subtype", "wlan_mgt.wfa.ie.wme.subtype",
+ {"WME Subtype", "wlan.wfa.ie.wme.subtype",
FT_UINT8, BASE_DEC, VALS(ieee802111_wfa_ie_wme_type), 0,
NULL, HFILL }},
{&hf_ieee80211_wfa_ie_wme_version,
- {"WME Version", "wlan_mgt.wfa.ie.wme.version",
+ {"WME Version", "wlan.wfa.ie.wme.version",
FT_UINT8, BASE_DEC, NULL, 0,
NULL, HFILL }},
{&hf_ieee80211_wfa_ie_wme_qos_info,
- {"WME QoS Info", "wlan_mgt.wfa.ie.wme.qos_info",
+ {"WME QoS Info", "wlan.wfa.ie.wme.qos_info",
FT_UINT8, BASE_HEX, NULL, 0,
NULL, HFILL }},
{&hf_ieee80211_wfa_ie_wme_qos_info_sta_max_sp_length,
- {"Max SP Length", "wlan_mgt.wfa.ie.wme.qos_info.sta.max_sp_length",
+ {"Max SP Length", "wlan.wfa.ie.wme.qos_info.sta.max_sp_length",
FT_UINT8, BASE_HEX, VALS(ieee802111_wfa_ie_wme_qos_info_sta_max_sp_length_vals), 0x60,
NULL, HFILL }},
{&hf_ieee80211_wfa_ie_wme_qos_info_sta_ac_be,
- {"AC_BE", "wlan_mgt.wfa.ie.wme.qos_info.sta.ac_be",
+ {"AC_BE", "wlan.wfa.ie.wme.qos_info.sta.ac_be",
FT_BOOLEAN, 8, TFS(&ieee802111_wfa_ie_wme_qos_info_sta_ac_tfs), 0x08,
NULL, HFILL }},
{&hf_ieee80211_wfa_ie_wme_qos_info_sta_ac_bk,
- {"AC_BK", "wlan_mgt.wfa.ie.wme.qos_info.sta.ac_bk",
+ {"AC_BK", "wlan.wfa.ie.wme.qos_info.sta.ac_bk",
FT_BOOLEAN, 8, TFS(&ieee802111_wfa_ie_wme_qos_info_sta_ac_tfs), 0x04,
NULL, HFILL }},
{&hf_ieee80211_wfa_ie_wme_qos_info_sta_ac_vi,
- {"AC_VI", "wlan_mgt.wfa.ie.wme.qos_info.sta.ac_vi",
+ {"AC_VI", "wlan.wfa.ie.wme.qos_info.sta.ac_vi",
FT_BOOLEAN, 8, TFS(&ieee802111_wfa_ie_wme_qos_info_sta_ac_tfs), 0x02,
NULL, HFILL }},
{&hf_ieee80211_wfa_ie_wme_qos_info_sta_ac_vo,
- {"AC_VO", "wlan_mgt.wfa.ie.wme.qos_info.sta.ac_vo",
+ {"AC_VO", "wlan.wfa.ie.wme.qos_info.sta.ac_vo",
FT_BOOLEAN, 8, TFS(&ieee802111_wfa_ie_wme_qos_info_sta_ac_tfs), 0x01,
NULL, HFILL }},
{&hf_ieee80211_wfa_ie_wme_qos_info_sta_reserved,
- {"Reserved", "wlan_mgt.wfa.ie.wme.qos_info.sta.reserved",
+ {"Reserved", "wlan.wfa.ie.wme.qos_info.sta.reserved",
FT_UINT8, BASE_HEX, NULL, 0x90,
"Must Be Zero", HFILL }},
{&hf_ieee80211_wfa_ie_wme_qos_info_ap_u_apsd,
- {"U-APSD", "wlan_mgt.wfa.ie.wme.qos_info.ap.u_apsd",
+ {"U-APSD", "wlan.wfa.ie.wme.qos_info.ap.u_apsd",
FT_BOOLEAN, 8, TFS(&tfs_enabled_disabled), 0x80,
"Indicates the WMM AP is currently supporting unscheduled automatic power save delivery", HFILL }},
{&hf_ieee80211_wfa_ie_wme_qos_info_ap_parameter_set_count,
- {"Parameter Set Count", "wlan_mgt.wfa.ie.wme.qos_info.ap.parameter_set_count",
+ {"Parameter Set Count", "wlan.wfa.ie.wme.qos_info.ap.parameter_set_count",
FT_UINT8, BASE_HEX, NULL, 0x0F,
NULL, HFILL }},
{&hf_ieee80211_wfa_ie_wme_qos_info_ap_reserved,
- {"Reserved", "wlan_mgt.wfa.ie.wme.qos_info.ap.reserved",
+ {"Reserved", "wlan.wfa.ie.wme.qos_info.ap.reserved",
FT_UINT8, BASE_HEX, NULL, 0x70,
"Must Be Zero", HFILL }},
{&hf_ieee80211_wfa_ie_wme_reserved,
- {"Reserved", "wlan_mgt.wfa.ie.wme.reserved",
+ {"Reserved", "wlan.wfa.ie.wme.reserved",
FT_BYTES, BASE_NONE, NULL, 0,
"Must Be Zero", HFILL }},
{&hf_ieee80211_wfa_ie_wme_ac_parameters,
- {"Ac Parameters", "wlan_mgt.wfa.ie.wme.acp",
+ {"Ac Parameters", "wlan.wfa.ie.wme.acp",
FT_NONE, BASE_NONE, NULL, 0,
NULL, HFILL }},
{&hf_ieee80211_wfa_ie_wme_acp_aci_aifsn,
- {"ACI / AIFSN Field", "wlan_mgt.wfa.ie.wme.acp.aci_aifsn",
+ {"ACI / AIFSN Field", "wlan.wfa.ie.wme.acp.aci_aifsn",
FT_UINT8, BASE_HEX, NULL, 0,
NULL, HFILL }},
{&hf_ieee80211_wfa_ie_wme_acp_aci,
- {"ACI", "wlan_mgt.wfa.ie.wme.acp.aci",
+ {"ACI", "wlan.wfa.ie.wme.acp.aci",
FT_UINT8, BASE_DEC, VALS(ieee80211_wfa_ie_wme_acs_vals), 0x60,
NULL, HFILL }},
{&hf_ieee80211_wfa_ie_wme_acp_acm,
- {"Admission Control Mandatory", "wlan_mgt.wfa.ie.wme.acp.acm",
+ {"Admission Control Mandatory", "wlan.wfa.ie.wme.acp.acm",
FT_BOOLEAN, 8, TFS(&tfs_yes_no), 0x10,
NULL, HFILL }},
{&hf_ieee80211_wfa_ie_wme_acp_aifsn,
- {"AIFSN", "wlan_mgt.wfa.ie.wme.acp.aifsn",
+ {"AIFSN", "wlan.wfa.ie.wme.acp.aifsn",
FT_UINT8, BASE_DEC, NULL, 0x0F,
NULL, HFILL }},
{&hf_ieee80211_wfa_ie_wme_acp_reserved,
- {"Reserved", "wlan_mgt.wfa.ie.wme.acp.reserved",
+ {"Reserved", "wlan.wfa.ie.wme.acp.reserved",
FT_UINT8, BASE_DEC, NULL, 0x80,
"Must be Zero", HFILL }},
{&hf_ieee80211_wfa_ie_wme_acp_ecw,
- {"ECW", "wlan_mgt.wfa.ie.wme.acp.ecw",
+ {"ECW", "wlan.wfa.ie.wme.acp.ecw",
FT_UINT8, BASE_HEX, NULL, 0x00,
NULL, HFILL }},
{&hf_ieee80211_wfa_ie_wme_acp_ecw_max,
- {"ECW Max", "wlan_mgt.wfa.ie.wme.acp.ecw.max",
+ {"ECW Max", "wlan.wfa.ie.wme.acp.ecw.max",
FT_UINT8, BASE_DEC, NULL, 0xF0,
NULL, HFILL }},
{&hf_ieee80211_wfa_ie_wme_acp_ecw_min,
- {"ECW Min", "wlan_mgt.wfa.ie.wme.acp.ecw.min",
+ {"ECW Min", "wlan.wfa.ie.wme.acp.ecw.min",
FT_UINT8, BASE_DEC, NULL, 0x0F,
NULL, HFILL }},
{&hf_ieee80211_wfa_ie_wme_acp_cw_max,
- {"CW Max", "wlan_mgt.wfa.ie.wme.acp.cw.max",
+ {"CW Max", "wlan.wfa.ie.wme.acp.cw.max",
FT_UINT8, BASE_DEC, NULL, 0,
NULL, HFILL }},
{&hf_ieee80211_wfa_ie_wme_acp_cw_min,
- {"CW Min", "wlan_mgt.wfa.ie.wme.acp.cw.min",
+ {"CW Min", "wlan.wfa.ie.wme.acp.cw.min",
FT_UINT8, BASE_DEC, NULL, 0,
NULL, HFILL }},
{&hf_ieee80211_wfa_ie_wme_acp_txop_limit,
- {"TXOP Limit", "wlan_mgt.wfa.ie.wme.acp.txop_limit",
+ {"TXOP Limit", "wlan.wfa.ie.wme.acp.txop_limit",
FT_UINT16, BASE_DEC, NULL, 0x00,
NULL, HFILL }},
{&hf_ieee80211_wfa_ie_wme_tspec_tsinfo,
- {"TS Info", "wlan_mgt.wfa.ie.wme.tspec.ts_info",
+ {"TS Info", "wlan.wfa.ie.wme.tspec.ts_info",
FT_UINT24, BASE_HEX, NULL, 0,
"Traffic Stream (TS) Info", HFILL }},
{&hf_ieee80211_wfa_ie_wme_tspec_tsinfo_tid,
- {"TID", "wlan_mgt.wfa.ie.wme.tspec.ts_info.tid",
+ {"TID", "wlan.wfa.ie.wme.tspec.ts_info.tid",
FT_UINT24, BASE_DEC, NULL, 0x00001E,
"Traffic Stream Info ID (TID)", HFILL }},
{&hf_ieee80211_wfa_ie_wme_tspec_tsinfo_direction,
- {"Direction", "wlan_mgt.wfa.ie.wme.tspec.ts_info.dir",
+ {"Direction", "wlan.wfa.ie.wme.tspec.ts_info.dir",
FT_UINT24, BASE_DEC, VALS(ieee80211_wfa_ie_wme_tspec_tsinfo_direction_vals), 0x000060,
"Traffic Stream (TS) Info Direction", HFILL }},
{&hf_ieee80211_wfa_ie_wme_tspec_tsinfo_psb,
- {"PSB", "wlan_mgt.wfa.ie.wme.tspec.ts_info.psb",
+ {"PSB", "wlan.wfa.ie.wme.tspec.ts_info.psb",
FT_UINT24, BASE_DEC, VALS(ieee80211_wfa_ie_wme_tspec_tsinfo_psb_vals), 0x000400,
"Traffic Stream (TS) Info Power Save Behavior (PSB)", HFILL }},
{&hf_ieee80211_wfa_ie_wme_tspec_tsinfo_up,
- {"UP", "wlan_mgt.wfa.ie.wme.tspec.ts_info.up",
+ {"UP", "wlan.wfa.ie.wme.tspec.ts_info.up",
FT_UINT24, BASE_DEC, VALS(ieee80211_wfa_ie_wme_tspec_tsinfo_up_vals), 0x003800,
"Traffic Stream (TS) Info User Priority (UP)", HFILL }},
{&hf_ieee80211_wfa_ie_wme_tspec_tsinfo_reserved,
- {"Reserved", "wlan_mgt.wfa.ie.wme.tspec.ts_info.reserved",
+ {"Reserved", "wlan.wfa.ie.wme.tspec.ts_info.reserved",
FT_UINT24, BASE_HEX, NULL, 0xFFC381,
"Must be Zero", HFILL }},
{&hf_ieee80211_wfa_ie_wme_tspec_nor_msdu,
- {"Normal MSDU Size", "wlan_mgt.wfa.ie.wme.tspec.nor_msdu",
+ {"Normal MSDU Size", "wlan.wfa.ie.wme.tspec.nor_msdu",
FT_UINT16, BASE_DEC, NULL, 0,
NULL, HFILL }},
{&hf_ieee80211_wfa_ie_wme_tspec_max_msdu,
- {"Maximum MSDU Size", "wlan_mgt.wfa.ie.wme.tspec.max_msdu",
+ {"Maximum MSDU Size", "wlan.wfa.ie.wme.tspec.max_msdu",
FT_UINT16, BASE_DEC, NULL, 0,
NULL, HFILL }},
{&hf_ieee80211_wfa_ie_wme_tspec_min_srv,
- {"Minimum Service Interval", "wlan_mgt.wfa.ie.wme.tspec.min_srv",
+ {"Minimum Service Interval", "wlan.wfa.ie.wme.tspec.min_srv",
FT_UINT32, BASE_DEC, NULL, 0,
NULL, HFILL }},
{&hf_ieee80211_wfa_ie_wme_tspec_max_srv,
- {"Maximum Service Interval", "wlan_mgt.wfa.ie.wme.tspec.max_srv",
+ {"Maximum Service Interval", "wlan.wfa.ie.wme.tspec.max_srv",
FT_UINT32, BASE_DEC, NULL, 0,
NULL, HFILL }},
{&hf_ieee80211_wfa_ie_wme_tspec_inact_int,
- {"Inactivity Interval", "wlan_mgt.wfa.ie.wme.tspec.inact_int",
+ {"Inactivity Interval", "wlan.wfa.ie.wme.tspec.inact_int",
FT_UINT32, BASE_DEC, NULL, 0,
NULL, HFILL }},
{&hf_ieee80211_wfa_ie_wme_tspec_susp_int,
- {"Suspension Interval", "wlan_mgt.wfa.ie.wme.tspec.susp_int",
+ {"Suspension Interval", "wlan.wfa.ie.wme.tspec.susp_int",
FT_UINT32, BASE_DEC, NULL, 0,
NULL, HFILL }},
{&hf_ieee80211_wfa_ie_wme_tspec_srv_start,
- {"Service Start Time", "wlan_mgt.wfa.ie.wme.tspec.srv_start",
+ {"Service Start Time", "wlan.wfa.ie.wme.tspec.srv_start",
FT_UINT32, BASE_DEC, NULL, 0,
NULL, HFILL }},
{&hf_ieee80211_wfa_ie_wme_tspec_min_data,
- {"Minimum Data Rate", "wlan_mgt.wfa.ie.wme.tspec.min_data",
+ {"Minimum Data Rate", "wlan.wfa.ie.wme.tspec.min_data",
FT_UINT32, BASE_DEC, NULL, 0,
NULL, HFILL }},
{&hf_ieee80211_wfa_ie_wme_tspec_mean_data,
- {"Mean Data Rate", "wlan_mgt.wfa.ie.wme.tspec.mean_data",
+ {"Mean Data Rate", "wlan.wfa.ie.wme.tspec.mean_data",
FT_UINT32, BASE_DEC, NULL, 0,
NULL, HFILL }},
{&hf_ieee80211_wfa_ie_wme_tspec_peak_data,
- {"Peak Data Rate", "wlan_mgt.wfa.ie.wme.tspec.peak_data",
+ {"Peak Data Rate", "wlan.wfa.ie.wme.tspec.peak_data",
FT_UINT32, BASE_DEC, NULL, 0,
NULL, HFILL }},
{&hf_ieee80211_wfa_ie_wme_tspec_burst_size,
- {"Burst Size", "wlan_mgt.wfa.ie.wme.tspec.burst_size",
+ {"Burst Size", "wlan.wfa.ie.wme.tspec.burst_size",
FT_UINT32, BASE_DEC, NULL, 0,
NULL, HFILL }},
{&hf_ieee80211_wfa_ie_wme_tspec_delay_bound,
- {"Delay Bound", "wlan_mgt.wfa.ie.wme.tspec.delay_bound",
+ {"Delay Bound", "wlan.wfa.ie.wme.tspec.delay_bound",
FT_UINT32, BASE_DEC, NULL, 0,
NULL, HFILL }},
{&hf_ieee80211_wfa_ie_wme_tspec_min_phy,
- {"Minimum PHY Rate", "wlan_mgt.wfa.ie.wme.tspec.min_phy",
+ {"Minimum PHY Rate", "wlan.wfa.ie.wme.tspec.min_phy",
FT_UINT32, BASE_DEC, NULL, 0,
NULL, HFILL }},
{&hf_ieee80211_wfa_ie_wme_tspec_surplus,
- {"Surplus Bandwidth Allowance", "wlan_mgt.wfa.ie.wme.tspec.surplus",
+ {"Surplus Bandwidth Allowance", "wlan.wfa.ie.wme.tspec.surplus",
FT_UINT16, BASE_DEC, NULL, 0,
NULL, HFILL }},
{&hf_ieee80211_wfa_ie_wme_tspec_medium,
- {"Medium Time", "wlan_mgt.wfa.ie.wme.tspec.medium",
+ {"Medium Time", "wlan.wfa.ie.wme.tspec.medium",
FT_UINT16, BASE_DEC, NULL, 0,
NULL, HFILL }},
{&hf_ieee80211_rsn_ie_pmkid,
- {"RSN PMKID", "wlan_mgt.rsn.ie.pmkid",
+ {"RSN PMKID", "wlan.rsn.ie.pmkid",
FT_BYTES, BASE_NONE, NULL, 0,
NULL, HFILL }},
{&hf_ieee80211_rsn_ie_unknown,
- {"RSN Unknown", "wlan_mgt.rsn.ie.unknown",
+ {"RSN Unknown", "wlan.rsn.ie.unknown",
FT_BYTES, BASE_NONE, NULL, 0,
NULL, HFILL }},
{&hf_ieee80211_marvell_ie_type,
- {"Type", "wlan_mgt.marvell.ie.type",
+ {"Type", "wlan.marvell.ie.type",
FT_UINT8, BASE_HEX, NULL, 0,
NULL, HFILL }},
{&hf_ieee80211_marvell_ie_mesh_subtype,
- {"Subtype", "wlan_mgt.marvell.ie.subtype",
+ {"Subtype", "wlan.marvell.ie.subtype",
FT_UINT8, BASE_HEX, NULL, 0,
NULL, HFILL }},
{&hf_ieee80211_marvell_ie_mesh_version,
- {"Version", "wlan_mgt.marvell.ie.version",
+ {"Version", "wlan.marvell.ie.version",
FT_UINT8, BASE_HEX, NULL, 0,
NULL, HFILL }},
{&hf_ieee80211_marvell_ie_mesh_active_proto_id,
- {"Path Selection Protocol", "wlan_mgt.marvell.ie.proto_id",
+ {"Path Selection Protocol", "wlan.marvell.ie.proto_id",
FT_UINT8, BASE_HEX, VALS(mesh_path_selection_codes), 0,
NULL, HFILL }},
{&hf_ieee80211_marvell_ie_mesh_active_metric_id,
- {"Path Selection Metric", "wlan_mgt.marvell.ie.metric_id",
+ {"Path Selection Metric", "wlan.marvell.ie.metric_id",
FT_UINT8, BASE_HEX, VALS(mesh_metric_codes), 0,
NULL, HFILL }},
{&hf_ieee80211_marvell_ie_mesh_cap,
- {"Mesh Capabilities", "wlan_mgt.marvell.ie.cap",
+ {"Mesh Capabilities", "wlan.marvell.ie.cap",
FT_UINT8, BASE_HEX, NULL, 0,
NULL, HFILL }},
{&hf_ieee80211_marvell_ie_data,
- { "Marvell IE data", "wlan_mgt.marvell.data",
+ { "Marvell IE data", "wlan.marvell.data",
FT_BYTES, BASE_NONE, NULL, 0x0,
NULL, HFILL }},
{&hf_ieee80211_atheros_ie_type,
- {"Type", "wlan_mgt.atheros.ie.type",
+ {"Type", "wlan.atheros.ie.type",
FT_UINT8, BASE_HEX, VALS(atheros_ie_type_vals), 0,
NULL, HFILL }},
{&hf_ieee80211_atheros_ie_subtype,
- {"Subtype", "wlan_mgt.atheros.ie.subtype",
+ {"Subtype", "wlan.atheros.ie.subtype",
FT_UINT8, BASE_HEX, NULL, 0,
NULL, HFILL }},
{&hf_ieee80211_atheros_ie_version,
- {"Version", "wlan_mgt.atheros.ie.version",
+ {"Version", "wlan.atheros.ie.version",
FT_UINT8, BASE_HEX, NULL, 0,
NULL, HFILL }},
{&hf_ieee80211_atheros_ie_cap_f_turbop,
- {"Turbo Prime", "wlan_mgt.ie.atheros.capabilities.turbop",
+ {"Turbo Prime", "wlan.ie.atheros.capabilities.turbop",
FT_BOOLEAN, 8, NULL, ATHEROS_IE_CAP_TURBOP,
NULL, HFILL }},
{&hf_ieee80211_atheros_ie_cap_f_comp,
- {"Compression", "wlan_mgt.ie.atheros.capabilities.comp",
+ {"Compression", "wlan.ie.atheros.capabilities.comp",
FT_BOOLEAN, 8, NULL, ATHEROS_IE_CAP_COMP,
NULL, HFILL }},
{&hf_ieee80211_atheros_ie_cap_f_ff,
- {"Fast Frames", "wlan_mgt.ie.atheros.capabilities.ff",
+ {"Fast Frames", "wlan.ie.atheros.capabilities.ff",
FT_BOOLEAN, 8, NULL, ATHEROS_IE_CAP_FF,
NULL, HFILL }},
{&hf_ieee80211_atheros_ie_cap_f_xr,
- {"eXtended Range", "wlan_mgt.ie.atheros.capabilities.xr",
+ {"eXtended Range", "wlan.ie.atheros.capabilities.xr",
FT_BOOLEAN, 8, NULL, ATHEROS_IE_CAP_XR,
NULL, HFILL }},
{&hf_ieee80211_atheros_ie_cap_f_ar,
- {"Advanced Radar", "wlan_mgt.ie.atheros.capabilities.ar",
+ {"Advanced Radar", "wlan.ie.atheros.capabilities.ar",
FT_BOOLEAN, 8, NULL, ATHEROS_IE_CAP_AR,
NULL, HFILL }},
{&hf_ieee80211_atheros_ie_cap_f_burst,
- {"Burst", "wlan_mgt.ie.atheros.capabilities.burst",
+ {"Burst", "wlan.ie.atheros.capabilities.burst",
FT_BOOLEAN, 8, NULL, ATHEROS_IE_CAP_BURST,
NULL, HFILL }},
{&hf_ieee80211_atheros_ie_cap_f_wme,
- {"CWMin tuning", "wlan_mgt.ie.atheros.capabilities.wme",
+ {"CWMin tuning", "wlan.ie.atheros.capabilities.wme",
FT_BOOLEAN, 8, NULL, ATHEROS_IE_CAP_WME,
NULL, HFILL }},
{&hf_ieee80211_atheros_ie_cap_f_boost,
- {"Boost", "wlan_mgt.ie.atheros.capabilities.boost",
+ {"Boost", "wlan.ie.atheros.capabilities.boost",
FT_BOOLEAN, 8, NULL, ATHEROS_IE_CAP_BOOST,
NULL, HFILL }},
{&hf_ieee80211_atheros_ie_advcap_cap,
- {"Capabilities", "wlan_mgt.atheros.ie.advcap.cap",
+ {"Capabilities", "wlan.atheros.ie.advcap.cap",
FT_UINT8, BASE_HEX, NULL, 0,
NULL, HFILL }},
{&hf_ieee80211_atheros_ie_advcap_defkey,
- {"Default key index", "wlan_mgt.atheros.ie.advcap.defkey",
+ {"Default key index", "wlan.atheros.ie.advcap.defkey",
FT_UINT16, BASE_HEX, NULL, 0,
NULL, HFILL }},
{&hf_ieee80211_atheros_ie_xr_info,
- {"Info", "wlan_mgt.atheros.ie.xr.info",
+ {"Info", "wlan.atheros.ie.xr.info",
FT_UINT8, BASE_HEX, NULL, 0,
NULL, HFILL }},
{&hf_ieee80211_atheros_ie_xr_base_bssid,
- {"Base BSS Id", "wlan_mgt.atheros.ie.xr.base_bssid",
+ {"Base BSS Id", "wlan.atheros.ie.xr.base_bssid",
FT_ETHER, BASE_NONE, NULL, 0,
NULL, HFILL }},
{&hf_ieee80211_atheros_ie_xr_xr_bssid,
- {"XR BSS Id", "wlan_mgt.atheros.ie.xr.xr_bssid",
+ {"XR BSS Id", "wlan.atheros.ie.xr.xr_bssid",
FT_ETHER, BASE_NONE, NULL, 0,
NULL, HFILL }},
{&hf_ieee80211_atheros_ie_xr_xr_beacon,
- {"XR Beacon Interval", "wlan_mgt.atheros.ie.xr.xr_beacon",
+ {"XR Beacon Interval", "wlan.atheros.ie.xr.xr_beacon",
FT_UINT32, BASE_CUSTOM, CF_FUNC(beacon_interval_base_custom), 0,
NULL, HFILL }},
{&hf_ieee80211_atheros_ie_xr_base_cap,
- {"Base capabilities", "wlan_mgt.atheros.ie.xr.base_cap",
+ {"Base capabilities", "wlan.atheros.ie.xr.base_cap",
FT_UINT8, BASE_HEX, NULL, 0,
NULL, HFILL }},
{&hf_ieee80211_atheros_ie_xr_xr_cap,
- {"XR capabilities", "wlan_mgt.atheros.ie.xr.xr_cap",
+ {"XR capabilities", "wlan.atheros.ie.xr.xr_cap",
FT_UINT8, BASE_HEX, NULL, 0,
NULL, HFILL }},
{&hf_ieee80211_atheros_ie_data,
- {"Atheros IE data", "wlan_mgt.atheros.data",
+ {"Atheros IE data", "wlan.atheros.data",
FT_BYTES, BASE_NONE, NULL, 0,
NULL, HFILL }},
{&hf_ieee80211_aironet_ie_type,
- {"Aironet IE type", "wlan_mgt.aironet.type",
+ {"Aironet IE type", "wlan.aironet.type",
FT_UINT8, BASE_DEC, VALS(aironet_ie_type_vals), 0,
NULL, HFILL }},
{&hf_ieee80211_aironet_ie_dtpc,
- {"Aironet IE CCX DTCP", "wlan_mgt.aironet.dtpc",
+ {"Aironet IE CCX DTCP", "wlan.aironet.dtpc",
FT_BYTES, BASE_NONE, NULL, 0,
NULL, HFILL }},
{&hf_ieee80211_aironet_ie_version,
- {"Aironet IE CCX version", "wlan_mgt.aironet.version",
+ {"Aironet IE CCX version", "wlan.aironet.version",
FT_UINT8, BASE_DEC, NULL, 0,
NULL, HFILL }},
{&hf_ieee80211_aironet_ie_data,
- { "Aironet IE data", "wlan_mgt.aironet.data",
+ { "Aironet IE data", "wlan.aironet.data",
FT_BYTES, BASE_NONE, NULL, 0x0,
NULL, HFILL }},
{&hf_ieee80211_qbss_version,
- {"QBSS Version", "wlan_mgt.qbss.version",
+ {"QBSS Version", "wlan.qbss.version",
FT_UINT8, BASE_DEC, NULL, 0,
NULL, HFILL }},
{&hf_ieee80211_qbss_scount,
- {"Station Count", "wlan_mgt.qbss.scount",
+ {"Station Count", "wlan.qbss.scount",
FT_UINT16, BASE_DEC, NULL, 0,
NULL, HFILL }},
{&hf_ieee80211_qbss_cu,
- {"Channel Utilization", "wlan_mgt.qbss.cu",
+ {"Channel Utilization", "wlan.qbss.cu",
FT_UINT8, BASE_DEC, NULL, 0,
NULL, HFILL }},
{&hf_ieee80211_qbss_adc,
- {"Available Admission Capabilities", "wlan_mgt.qbss.adc",
+ {"Available Admission Capabilities", "wlan.qbss.adc",
FT_UINT8, BASE_DEC, NULL, 0,
NULL, HFILL }},
{&hf_ieee80211_qbss2_cu,
- {"Channel Utilization", "wlan_mgt.qbss2.cu",
+ {"Channel Utilization", "wlan.qbss2.cu",
FT_UINT8, BASE_DEC, NULL, 0,
NULL, HFILL }},
{&hf_ieee80211_qbss2_gl,
- {"G.711 CU Quantum", "wlan_mgt.qbss2.glimit",
+ {"G.711 CU Quantum", "wlan.qbss2.glimit",
FT_UINT8, BASE_DEC, NULL, 0,
NULL, HFILL }},
{&hf_ieee80211_qbss2_cal,
- {"Call Admission Limit", "wlan_mgt.qbss2.cal",
+ {"Call Admission Limit", "wlan.qbss2.cal",
FT_UINT8, BASE_DEC, NULL, 0,
NULL, HFILL }},
{&hf_ieee80211_qbss2_scount,
- {"Station Count", "wlan_mgt.qbss2.scount",
+ {"Station Count", "wlan.qbss2.scount",
FT_UINT16, BASE_DEC, NULL, 0,
NULL, HFILL }},
{&hf_ieee80211_aironet_ie_qos_reserved,
- {"Aironet IE QoS reserved", "wlan_mgt.aironet.qos.reserved",
+ {"Aironet IE QoS reserved", "wlan.aironet.qos.reserved",
FT_UINT8, BASE_HEX, NULL, 0,
NULL, HFILL }},
{&hf_ieee80211_aironet_ie_qos_paramset,
- {"Aironet IE QoS paramset", "wlan_mgt.aironet.qos.paramset",
+ {"Aironet IE QoS paramset", "wlan.aironet.qos.paramset",
FT_UINT8, BASE_DEC, NULL, 0,
NULL, HFILL }},
{&hf_ieee80211_aironet_ie_qos_val,
- {"Aironet IE QoS valueset", "wlan_mgt.aironet.qos.val",
+ {"Aironet IE QoS valueset", "wlan.aironet.qos.val",
FT_BYTES, BASE_NONE, NULL, 0,
NULL, HFILL }},
{&hf_ieee80211_aironet_ie_clientmfp,
- {"Aironet IE Client MFP", "wlan_mgt.aironet.clientmfp",
+ {"Aironet IE Client MFP", "wlan.aironet.clientmfp",
FT_BOOLEAN, 8, TFS(&tfs_enabled_disabled), 0x01,
NULL, HFILL }},
/* Vendor Specific : Nintendo */
{&hf_ieee80211_vs_nintendo_type,
- {"Type", "wlan_mgt.vs.nintendo.type",
+ {"Type", "wlan.vs.nintendo.type",
FT_UINT8, BASE_DEC, VALS(ieee80211_vs_nintendo_type_vals), 0,
NULL, HFILL }},
{&hf_ieee80211_vs_nintendo_length,
- {"Length", "wlan_mgt.vs.nintendo.length",
+ {"Length", "wlan.vs.nintendo.length",
FT_UINT8, BASE_DEC, NULL, 0,
NULL, HFILL }},
{&hf_ieee80211_vs_nintendo_servicelist,
- {"Servicelist", "wlan_mgt.vs.nintendo.servicelist",
+ {"Servicelist", "wlan.vs.nintendo.servicelist",
FT_BYTES, BASE_NONE, NULL, 0,
NULL, HFILL }},
{&hf_ieee80211_vs_nintendo_service,
- {"Service", "wlan_mgt.vs.nintendo.service",
+ {"Service", "wlan.vs.nintendo.service",
FT_BYTES, BASE_NONE, NULL, 0,
NULL, HFILL }},
{&hf_ieee80211_vs_nintendo_consoleid,
- {"Console ID", "wlan_mgt.vs.nintendo.consoleid",
+ {"Console ID", "wlan.vs.nintendo.consoleid",
FT_BYTES, BASE_NONE, NULL, 0,
NULL, HFILL }},
{&hf_ieee80211_vs_nintendo_unknown,
- {"Unknown", "wlan_mgt.vs.nintendo.unknown",
+ {"Unknown", "wlan.vs.nintendo.unknown",
FT_BYTES, BASE_NONE, NULL, 0,
NULL, HFILL }},
/* Vendor Specific : Aruba Networks */
{&hf_ieee80211_vs_aruba_subtype,
- {"Subtype", "wlan_mgt.vs.aruba.subtype",
+ {"Subtype", "wlan.vs.aruba.subtype",
FT_UINT8, BASE_DEC, VALS(ieee80211_vs_aruba_subtype_vals), 0,
NULL, HFILL }},
{&hf_ieee80211_vs_aruba_apname,
- {"AP Name", "wlan_mgt.vs.aruba.ap_name",
+ {"AP Name", "wlan.vs.aruba.ap_name",
FT_STRINGZ, BASE_NONE, NULL, 0,
NULL, HFILL }},
{&hf_ieee80211_vs_aruba_data,
- {"Data", "wlan_mgt.vs.aruba.data",
+ {"Data", "wlan.vs.aruba.data",
FT_BYTES, BASE_NONE, NULL, 0,
NULL, HFILL }},
{&hf_ieee80211_vs_mikrotik_unknown,
- {"Unknown", "wlan_mgt.vs.mikrotik.unknown",
+ {"Unknown", "wlan.vs.mikrotik.unknown",
FT_BYTES, BASE_NONE, NULL, 0,
NULL, HFILL }},
{&hf_ieee80211_vs_mikrotik_subitem,
- {"Sub IE", "wlan_mgt.vs.mikrotik.unknown",
+ {"Sub IE", "wlan.vs.mikrotik.unknown",
FT_BYTES, BASE_NONE, NULL, 0,
NULL, HFILL }},
{&hf_ieee80211_vs_mikrotik_subtype,
- {"Subtype", "wlan_mgt.vs.mikrotik.subtype",
+ {"Subtype", "wlan.vs.mikrotik.subtype",
FT_UINT8, BASE_DEC, NULL, 0,
NULL, HFILL }},
{&hf_ieee80211_vs_mikrotik_sublength,
- {"Sublength", "wlan_mgt.vs.mikrotik.sublength",
+ {"Sublength", "wlan.vs.mikrotik.sublength",
FT_UINT8, BASE_DEC, NULL, 0,
NULL, HFILL }},
{&hf_ieee80211_vs_mikrotik_subdata,
- {"Subdata", "wlan_mgt.vs.mikrotik.subdata",
+ {"Subdata", "wlan.vs.mikrotik.subdata",
FT_BYTES, BASE_NONE, NULL, 0,
NULL, HFILL }},
{&hf_ieee80211_tsinfo,
- {"Traffic Stream (TS) Info", "wlan_mgt.ts_info",
+ {"Traffic Stream (TS) Info", "wlan.ts_info",
FT_UINT24, BASE_HEX, NULL, 0,
"Traffic Stream (TS) Info field", HFILL }},
{&hf_ieee80211_tsinfo_type,
- {"Traffic Type", "wlan_mgt.ts_info.type",
+ {"Traffic Type", "wlan.ts_info.type",
FT_UINT24, BASE_DEC, VALS(tsinfo_type), 0x000001,
"Traffic Stream (TS) Info Traffic Type", HFILL }},
{&hf_ieee80211_tsinfo_tsid,
- {"Traffic Stream ID (TSID)", "wlan_mgt.ts_info.tsid",
+ {"Traffic Stream ID (TSID)", "wlan.ts_info.tsid",
FT_UINT24, BASE_DEC, NULL, 0x00001E,
"Traffic Stream ID (TSID) Info TSID", HFILL }},
{&hf_ieee80211_tsinfo_dir,
- {"Direction", "wlan_mgt.ts_info.dir",
+ {"Direction", "wlan.ts_info.dir",
FT_UINT24, BASE_DEC, VALS(tsinfo_direction), 0x000060,
"Traffic Stream (TS) Info Direction", HFILL }},
{&hf_ieee80211_tsinfo_access,
- {"Access Policy", "wlan_mgt.ts_info.dir",
+ {"Access Policy", "wlan.ts_info.dir",
FT_UINT24, BASE_DEC, VALS(tsinfo_access), 0x000180,
"Traffic Stream (TS) Info Access Policy", HFILL }},
{&hf_ieee80211_tsinfo_agg,
- {"Aggregation", "wlan_mgt.ts_info.agg",
+ {"Aggregation", "wlan.ts_info.agg",
FT_UINT24, BASE_DEC, NULL, 0x000200,
"Traffic Stream (TS) Info Access Policy", HFILL }},
{&hf_ieee80211_tsinfo_apsd,
- {"Automatic Power-Save Delivery (APSD)", "wlan_mgt.ts_info.apsd",
+ {"Automatic Power-Save Delivery (APSD)", "wlan.ts_info.apsd",
FT_UINT24, BASE_DEC, NULL, 0x000400,
"Traffic Stream (TS) Info Automatic Power-Save Delivery (APSD)", HFILL }},
{&hf_ieee80211_tsinfo_up,
- {"User Priority", "wlan_mgt.ts_info.up",
+ {"User Priority", "wlan.ts_info.up",
FT_UINT24, BASE_DEC, VALS(qos_up), 0x003800,
"Traffic Stream (TS) Info User Priority", HFILL }},
{&hf_ieee80211_tsinfo_ack,
- {"Ack Policy", "wlan_mgt.ts_info.ack",
+ {"Ack Policy", "wlan.ts_info.ack",
FT_UINT24, BASE_DEC, VALS(ack_policy), 0x00C000,
"Traffic Stream (TS) Info Ack Policy", HFILL }},
{&hf_ieee80211_tsinfo_sched,
- {"Schedule", "wlan_mgt.ts_info.sched",
+ {"Schedule", "wlan.ts_info.sched",
FT_UINT24, BASE_DEC, NULL, 0x010000,
"Traffic Stream (TS) Info Schedule", HFILL }},
{&hf_ieee80211_tsinfo_rsv,
- {"Reserved", "wlan_mgt.ts_info.rsv",
+ {"Reserved", "wlan.ts_info.rsv",
FT_UINT24, BASE_HEX, NULL, 0xFE0000,
"Must be Zero", HFILL }},
{&hf_ieee80211_tspec_nor_msdu,
- {"Normal MSDU Size", "wlan_mgt.tspec.nor_msdu",
+ {"Normal MSDU Size", "wlan.tspec.nor_msdu",
FT_UINT16, BASE_DEC, NULL, 0,
NULL, HFILL }},
{&hf_ieee80211_tspec_max_msdu,
- {"Maximum MSDU Size", "wlan_mgt.tspec.max_msdu",
+ {"Maximum MSDU Size", "wlan.tspec.max_msdu",
FT_UINT16, BASE_DEC, NULL, 0,
NULL, HFILL }},
{&hf_ieee80211_tspec_min_srv,
- {"Minimum Service Interval", "wlan_mgt.tspec.min_srv",
+ {"Minimum Service Interval", "wlan.tspec.min_srv",
FT_UINT32, BASE_DEC, NULL, 0,
NULL, HFILL }},
{&hf_ieee80211_tspec_max_srv,
- {"Maximum Service Interval", "wlan_mgt.tspec.max_srv",
+ {"Maximum Service Interval", "wlan.tspec.max_srv",
FT_UINT32, BASE_DEC, NULL, 0,
NULL, HFILL }},
{&hf_ieee80211_tspec_inact_int,
- {"Inactivity Interval", "wlan_mgt.tspec.inact_int",
+ {"Inactivity Interval", "wlan.tspec.inact_int",
FT_UINT32, BASE_DEC, NULL, 0,
NULL, HFILL }},
{&hf_ieee80211_tspec_susp_int,
- {"Suspension Interval", "wlan_mgt.tspec.susp_int",
+ {"Suspension Interval", "wlan.tspec.susp_int",
FT_UINT32, BASE_DEC, NULL, 0,
NULL, HFILL }},
{&hf_ieee80211_tspec_srv_start,
- {"Service Start Time", "wlan_mgt.tspec.srv_start",
+ {"Service Start Time", "wlan.tspec.srv_start",
FT_UINT32, BASE_DEC, NULL, 0,
NULL, HFILL }},
{&hf_ieee80211_tspec_min_data,
- {"Minimum Data Rate", "wlan_mgt.tspec.min_data",
+ {"Minimum Data Rate", "wlan.tspec.min_data",
FT_UINT32, BASE_DEC, NULL, 0,
NULL, HFILL }},
{&hf_ieee80211_tspec_mean_data,
- {"Mean Data Rate", "wlan_mgt.tspec.mean_data",
+ {"Mean Data Rate", "wlan.tspec.mean_data",
FT_UINT32, BASE_DEC, NULL, 0,
NULL, HFILL }},
{&hf_ieee80211_tspec_peak_data,
- {"Peak Data Rate", "wlan_mgt.tspec.peak_data",
+ {"Peak Data Rate", "wlan.tspec.peak_data",
FT_UINT32, BASE_DEC, NULL, 0,
NULL, HFILL }},
{&hf_ieee80211_tspec_burst_size,
- {"Burst Size", "wlan_mgt.tspec.burst_size",
+ {"Burst Size", "wlan.tspec.burst_size",
FT_UINT32, BASE_DEC, NULL, 0,
NULL, HFILL }},
{&hf_ieee80211_tspec_delay_bound,
- {"Delay Bound", "wlan_mgt.tspec.delay_bound",
+ {"Delay Bound", "wlan.tspec.delay_bound",
FT_UINT32, BASE_DEC, NULL, 0,
NULL, HFILL }},
{&hf_ieee80211_tspec_min_phy,
- {"Minimum PHY Rate", "wlan_mgt.tspec.min_phy",
+ {"Minimum PHY Rate", "wlan.tspec.min_phy",
FT_UINT32, BASE_DEC, NULL, 0,
NULL, HFILL }},
{&hf_ieee80211_tspec_surplus,
- {"Surplus Bandwidth Allowance", "wlan_mgt.tspec.surplus",
+ {"Surplus Bandwidth Allowance", "wlan.tspec.surplus",
FT_UINT16, BASE_DEC, NULL, 0,
NULL, HFILL }},
{&hf_ieee80211_tspec_medium,
- {"Medium Time", "wlan_mgt.tspec.medium",
+ {"Medium Time", "wlan.tspec.medium",
FT_UINT16, BASE_DEC, NULL, 0,
NULL, HFILL }},
{&hf_ieee80211_tspec_dmg,
- {"DMG attributes", "wlan_mgt.tspec.dmg",
+ {"DMG attributes", "wlan.tspec.dmg",
FT_UINT16, BASE_DEC, NULL, 0,
NULL, HFILL }},
{&hf_ieee80211_ts_delay,
- {"Traffic Stream (TS) Delay", "wlan_mgt.ts_delay",
+ {"Traffic Stream (TS) Delay", "wlan.ts_delay",
FT_UINT32, BASE_DEC, NULL, 0,
NULL, HFILL }},
{&hf_ieee80211_tclas_process,
- {"Processing", "wlan_mgt.tclas_proc.processing",
+ {"Processing", "wlan.tclas_proc.processing",
FT_UINT8, BASE_DEC, VALS(ieee80211_tclas_process_flag), 0,
NULL, HFILL }},
{&hf_ieee80211_tag_ext_supp_rates,
- {"Extended Supported Rates", "wlan_mgt.extended_supported_rates",
+ {"Extended Supported Rates", "wlan.extended_supported_rates",
FT_UINT8, BASE_HEX|BASE_EXT_STRING, &ieee80211_supported_rates_vals_ext, 0x0,
"In Mbit/sec, (B) for Basic Rates", HFILL }},
{&hf_ieee80211_sched_info,
- {"Schedule Info", "wlan_mgt.sched.sched_info",
+ {"Schedule Info", "wlan.sched.sched_info",
FT_UINT16, BASE_HEX, NULL, 0,
"Schedule Info field", HFILL }},
{&hf_ieee80211_sched_info_agg,
- {"Schedule Aggregation", "wlan_mgt.sched_info.agg",
+ {"Schedule Aggregation", "wlan.sched_info.agg",
FT_UINT16, BASE_DEC, NULL, 0x0001,
"Traffic Stream (TS) Info Access Policy", HFILL }},
{&hf_ieee80211_sched_info_tsid,
- {"Schedule Traffic Stream ID (TSID)", "wlan_mgt.sched_info.tsid",
+ {"Schedule Traffic Stream ID (TSID)", "wlan.sched_info.tsid",
FT_UINT16, BASE_DEC, NULL, 0x001E,
"Traffic Stream ID (TSID) Info TSID", HFILL }},
{&hf_ieee80211_sched_info_dir,
- {"Schedule Direction", "wlan_mgt.sched_info.dir",
+ {"Schedule Direction", "wlan.sched_info.dir",
FT_UINT16, BASE_DEC, VALS(tsinfo_direction), 0x0060,
"Traffic Stream (TS) Info Direction", HFILL }},
{&hf_ieee80211_sched_srv_start,
- {"Service Start Time", "wlan_mgt.sched.srv_start",
+ {"Service Start Time", "wlan.sched.srv_start",
FT_UINT32, BASE_HEX, NULL, 0,
NULL, HFILL }},
{&hf_ieee80211_sched_srv_int,
- {"Service Interval", "wlan_mgt.sched.srv_int",
+ {"Service Interval", "wlan.sched.srv_int",
FT_UINT32, BASE_HEX, NULL, 0,
NULL, HFILL }},
{&hf_ieee80211_sched_spec_int,
- {"Specification Interval", "wlan_mgt.sched.spec_int",
+ {"Specification Interval", "wlan.sched.spec_int",
FT_UINT16, BASE_HEX, NULL, 0,
NULL, HFILL }},
{&hf_ieee80211_aruba,
- {"Aruba Type", "wlan_mgt.aruba.type",
+ {"Aruba Type", "wlan.aruba.type",
FT_UINT16, BASE_DEC|BASE_EXT_STRING, &aruba_mgt_typevals_ext, 0,
"Aruba Management", HFILL }},
{&hf_ieee80211_aruba_hb_seq,
- {"Aruba Heartbeat Sequence", "wlan_mgt.aruba.heartbeat_sequence",
+ {"Aruba Heartbeat Sequence", "wlan.aruba.heartbeat_sequence",
FT_UINT64, BASE_DEC, NULL, 0,
NULL, HFILL }},
{&hf_ieee80211_aruba_mtu,
- {"Aruba MTU Size", "wlan_mgt.aruba.mtu_size",
+ {"Aruba MTU Size", "wlan.aruba.mtu_size",
FT_UINT16, BASE_DEC, NULL, 0,
NULL, HFILL }},
/* Start: HT Control (+HTC) */
{&hf_ieee80211_htc,
- {"HT Control (+HTC)", "wlan_mgt.htc",
+ {"HT Control (+HTC)", "wlan.htc",
FT_UINT32, BASE_HEX, NULL, 0,
"High Throughput Control (+HTC)", HFILL }},
{&hf_ieee80211_htc_vht,
- {"VHT", "wlan_mgt.htc.lac.vht",
+ {"VHT", "wlan.htc.lac.vht",
FT_BOOLEAN, 32, NULL, HTC_VHT,
"High Throughput Control HT/VHT flag", HFILL }},
{&hf_ieee80211_htc_lac,
- {"Link Adaptation Control (LAC)", "wlan_mgt.htc.lac",
+ {"Link Adaptation Control (LAC)", "wlan.htc.lac",
FT_UINT32, BASE_HEX, NULL, 0x0000FFFE,
"High Throughput Control Link Adaptation Control (LAC)", HFILL }},
{&hf_ieee80211_htc_lac_trq,
- {"Training Request (TRQ)", "wlan_mgt.htc.lac.trq",
+ {"Training Request (TRQ)", "wlan.htc.lac.trq",
FT_BOOLEAN, 16, TFS(&htc_lac_trq_flag), 0x0002,
"High Throughput Control Link Adaptation Control Training Request (TRQ)", HFILL }},
{&hf_ieee80211_htc_lac_mai_aseli,
- {"Antenna Selection Indication (ASELI)", "wlan_mgt.htc.lac.mai.aseli",
+ {"Antenna Selection Indication (ASELI)", "wlan.htc.lac.mai.aseli",
FT_UINT16, BASE_HEX, NULL, 0x003C,
"High Throughput Control Link Adaptation Control MAI Antenna Selection Indication", HFILL }},
{&hf_ieee80211_htc_lac_mai_mrq,
- {"MCS Request (MRQ)", "wlan_mgt.htc.lac.mai.mrq",
+ {"MCS Request (MRQ)", "wlan.htc.lac.mai.mrq",
FT_BOOLEAN, 16, TFS(&htc_lac_mai_mrq_flag), 0x0004,
"High Throughput Control Link Adaptation Control MAI MCS Request", HFILL }},
{&hf_ieee80211_htc_lac_mai_msi,
- {"MCS Request Sequence Identifier (MSI)", "wlan_mgt.htc.lac.mai.msi",
+ {"MCS Request Sequence Identifier (MSI)", "wlan.htc.lac.mai.msi",
FT_UINT16, BASE_HEX, NULL, 0x0038,
"High Throughput Control Link Adaptation Control MAI MCS Request Sequence Identifier", HFILL }},
{&hf_ieee80211_htc_lac_mai_reserved,
- {"Reserved", "wlan_mgt.htc.lac.mai.reserved",
+ {"Reserved", "wlan.htc.lac.mai.reserved",
FT_UINT16, BASE_HEX, NULL, 0x0038,
"High Throughput Control Link Adaptation Control MAI Reserved", HFILL }},
{&hf_ieee80211_htc_lac_mfsi,
- {"MCS Feedback Sequence Identifier (MFSI)", "wlan_mgt.htc.lac.mfsi",
+ {"MCS Feedback Sequence Identifier (MFSI)", "wlan.htc.lac.mfsi",
FT_UINT16, BASE_DEC, NULL, 0x01C0,
"High Throughput Control Link Adaptation Control MCS Feedback Sequence Identifier (MSI)", HFILL }},
{&hf_ieee80211_htc_lac_asel_command,
- {"Antenna Selection (ASEL) Command", "wlan_mgt.htc.lac.asel.command",
+ {"Antenna Selection (ASEL) Command", "wlan.htc.lac.asel.command",
FT_UINT16, BASE_HEX, VALS(ieee80211_htc_lac_asel_command_flags), 0x0E00,
"High Throughput Control Link Adaptation Control Antenna Selection (ASEL) Command", HFILL }},
{&hf_ieee80211_htc_lac_asel_data,
- {"Antenna Selection (ASEL) Data", "wlan_mgt.htc.lac.asel.data",
+ {"Antenna Selection (ASEL) Data", "wlan.htc.lac.asel.data",
FT_UINT16, BASE_HEX, NULL, 0xF000,
"High Throughput Control Link Adaptation Control Antenna Selection (ASEL) Data", HFILL }},
{&hf_ieee80211_htc_lac_mfb,
- {"MCS Feedback (MFB)", "wlan_mgt.htc.lac.mfb",
+ {"MCS Feedback (MFB)", "wlan.htc.lac.mfb",
FT_UINT16, BASE_HEX, NULL, 0xFE00,
"High Throughput Control Link Adaptation Control MCS Feedback", HFILL }},
{&hf_ieee80211_htc_cal_pos,
- {"Calibration Position", "wlan_mgt.htc.cal.pos",
+ {"Calibration Position", "wlan.htc.cal.pos",
FT_UINT32, BASE_DEC, VALS(ieee80211_htc_cal_pos_flags), 0x00030000,
"High Throughput Control Calibration Position", HFILL }},
{&hf_ieee80211_htc_cal_seq,
- {"Calibration Sequence Identifier", "wlan_mgt.htc.cal.seq",
+ {"Calibration Sequence Identifier", "wlan.htc.cal.seq",
FT_UINT32, BASE_DEC, NULL, 0x000C0000,
"High Throughput Control Calibration Sequence Identifier", HFILL }},
{&hf_ieee80211_htc_reserved1,
- {"Reserved", "wlan_mgt.htc.reserved1",
+ {"Reserved", "wlan.htc.reserved1",
FT_UINT32, BASE_HEX, NULL, 0x00300000,
"High Throughput Control Reserved", HFILL }},
{&hf_ieee80211_htc_csi_steering,
- {"CSI/Steering", "wlan_mgt.htc.csi_steering",
+ {"CSI/Steering", "wlan.htc.csi_steering",
FT_UINT32, BASE_DEC, VALS(ieee80211_htc_csi_steering_flags), 0x00C00000,
"High Throughput Control CSI/Steering", HFILL }},
{&hf_ieee80211_htc_ndp_announcement,
- {"NDP Announcement", "wlan_mgt.htc.ndp_announcement",
+ {"NDP Announcement", "wlan.htc.ndp_announcement",
FT_BOOLEAN, 32, TFS(&ieee80211_htc_ndp_announcement_flag), 0x01000000,
"High Throughput Control NDP Announcement", HFILL }},
{&hf_ieee80211_htc_reserved2,
- {"Reserved", "wlan_mgt.htc.reserved2",
+ {"Reserved", "wlan.htc.reserved2",
FT_UINT32, BASE_HEX, NULL, 0x3E000000,
"High Throughput Control Reserved", HFILL }},
{&hf_ieee80211_htc_mrq,
- {"MRQ", "wlan_mgt.htc.mrq",
+ {"MRQ", "wlan.htc.mrq",
FT_BOOLEAN, 32, NULL, HTC_MRQ,
"VHT-MCS feedback request", HFILL }},
{&hf_ieee80211_htc_msi,
- {"MSI", "wlan_mgt.htc.msi",
+ {"MSI", "wlan.htc.msi",
FT_UINT32, BASE_DEC, NULL, 0x00000038,
"MRQ sequence number", HFILL }},
{&hf_ieee80211_htc_msi_stbc_reserved,
- {"Reserved", "wlan_mgt.htc.msi_stbc_reserved",
+ {"Reserved", "wlan.htc.msi_stbc_reserved",
FT_UINT32, BASE_HEX, NULL, 0x00000038,
NULL, HFILL }},
{&hf_ieee80211_htc_compressed_msi,
- {"Compressed MSI", "wlan_mgt.htc.compressed_msi",
+ {"Compressed MSI", "wlan.htc.compressed_msi",
FT_UINT32, BASE_DEC, NULL, 0x00000018,
NULL, HFILL }},
{&hf_ieee80211_htc_ppdu_stbc_encoded,
- {"PPDU was STBC encoded", "wlan_mgt.htc.ppdu_stbc_encoded",
+ {"PPDU was STBC encoded", "wlan.htc.ppdu_stbc_encoded",
FT_BOOLEAN, 32, NULL, 0x00000020,
NULL, HFILL }},
{&hf_ieee80211_htc_mfsi,
- {"MFSI", "wlan_mgt.htc.mfsi",
+ {"MFSI", "wlan.htc.mfsi",
FT_BOOLEAN, 32, NULL, 0x000001C0,
"MFB sequence identifier", HFILL }},
{&hf_ieee80211_htc_gid_l,
- {"GID-L", "wlan_mgt.htc.gid_l",
+ {"GID-L", "wlan.htc.gid_l",
FT_BOOLEAN, 32, NULL, 0x000001C0,
"LSBs of group ID", HFILL }},
{&hf_ieee80211_htc_mfb,
- {"MFB", "wlan_mgt.htc.mfb",
+ {"MFB", "wlan.htc.mfb",
FT_UINT32, BASE_HEX, NULL, 0x00FFFE00,
"Recommended MFB", HFILL }},
{&hf_ieee80211_htc_num_sts,
- {"NUM_STS", "wlan_mgt.htc.num_sts",
+ {"NUM_STS", "wlan.htc.num_sts",
FT_UINT32, BASE_DEC, NULL, 0x00000E00,
"Recommended NUM_STS", HFILL }},
{&hf_ieee80211_htc_vht_mcs,
- {"VHT-MCS", "wlan_mgt.htc.vht_mcs",
+ {"VHT-MCS", "wlan.htc.vht_mcs",
FT_UINT32, BASE_DEC, NULL, 0x0000F000,
"Recommended VHT-MCS", HFILL }},
{&hf_ieee80211_htc_bw,
- {"BW", "wlan_mgt.htc.bw",
+ {"BW", "wlan.htc.bw",
FT_UINT32, BASE_DEC, VALS(ieee80211_htc_bw_recommended_vht_mcs_vals), 0x00030000,
"Bandwidth for recommended VHT-MCS", HFILL }},
{&hf_ieee80211_htc_snr,
- {"SNR", "wlan_mgt.htc.snr",
+ {"SNR", "wlan.htc.snr",
FT_INT32, BASE_DEC, NULL, 0x00FC0000,
"Average SNR + 22", HFILL }},
{&hf_ieee80211_htc_reserved3,
- {"Reserved", "wlan_mgt.htc.reserved3",
+ {"Reserved", "wlan.htc.reserved3",
FT_UINT32, BASE_HEX, NULL, 0x1F000000,
NULL, HFILL }},
{&hf_ieee80211_htc_gid_h,
- {"GID-H", "wlan_mgt.htc.gid_h",
+ {"GID-H", "wlan.htc.gid_h",
FT_UINT32, BASE_DEC, NULL, 0x07000000,
NULL, HFILL }},
{&hf_ieee80211_htc_coding_type,
- {"Coding type", "wlan_mgt.htc.coding_type",
+ {"Coding type", "wlan.htc.coding_type",
FT_UINT32, BASE_DEC, VALS(ieee80211_htc_coding_type_vals), 0x08000000,
NULL, HFILL }},
{&hf_ieee80211_htc_fb_tx_type,
- {"FB Tx type", "wlan_mgt.htc.fb_tx_type",
+ {"FB Tx type", "wlan.htc.fb_tx_type",
FT_UINT32, BASE_DEC, VALS(ieee80211_htc_fb_tx_type_vals), 0x10000000,
NULL, HFILL }},
{&hf_ieee80211_htc_unsolicited_mfb,
- {"Unsolicited MFB", "wlan_mgt.htc.unsolicited_mfb",
+ {"Unsolicited MFB", "wlan.htc.unsolicited_mfb",
FT_BOOLEAN, 32, NULL, HTC_UNSOLICITED_MFB,
"High Throughput Control Unsolicited MFB", HFILL }},
{&hf_ieee80211_htc_ac_constraint,
- {"AC Constraint", "wlan_mgt.htc.ac_constraint",
+ {"AC Constraint", "wlan.htc.ac_constraint",
FT_BOOLEAN, 32, NULL, 0x40000000,
"High Throughput Control AC Constraint", HFILL }},
{&hf_ieee80211_htc_rdg_more_ppdu,
- {"RDG/More PPDU", "wlan_mgt.htc.rdg_more_ppdu",
+ {"RDG/More PPDU", "wlan.htc.rdg_more_ppdu",
FT_BOOLEAN, 32, NULL, 0x80000000,
"High Throughput Control RDG/More PPDU", HFILL }},
/* End: HT Control (+HTC) */
/* MDIE */
{&hf_ieee80211_tag_mobility_domain_mdid,
- {"Mobility Domain Identifier", "wlan_mgt.mobility_domain.mdid",
+ {"Mobility Domain Identifier", "wlan.mobility_domain.mdid",
FT_UINT16, BASE_HEX, NULL, 0,
NULL, HFILL }},
{&hf_ieee80211_tag_mobility_domain_ft_capab,
- {"FT Capability and Policy", "wlan_mgt.mobility_domain.ft_capab",
+ {"FT Capability and Policy", "wlan.mobility_domain.ft_capab",
FT_UINT8, BASE_HEX, NULL, 0,
NULL, HFILL }},
{&hf_ieee80211_tag_mobility_domain_ft_capab_ft_over_ds,
{"Fast BSS Transition over DS",
- "wlan_mgt.mobility_domain.ft_capab.ft_over_ds",
+ "wlan.mobility_domain.ft_capab.ft_over_ds",
FT_UINT8, BASE_HEX, NULL, 0x01,
NULL, HFILL }},
{&hf_ieee80211_tag_mobility_domain_ft_capab_resource_req,
{"Resource Request Protocol Capability",
- "wlan_mgt.mobility_domain.ft_capab.resource_req",
+ "wlan.mobility_domain.ft_capab.resource_req",
FT_UINT8, BASE_HEX, NULL, 0x02,
NULL, HFILL }},
/* FTIE */
{&hf_ieee80211_tag_ft_mic_control,
- {"MIC Control", "wlan_mgt.ft.mic_control",
+ {"MIC Control", "wlan.ft.mic_control",
FT_UINT16, BASE_HEX, NULL, 0,
NULL, HFILL }},
{&hf_ieee80211_tag_ft_element_count,
- {"Element Count", "wlan_mgt.ft.element_count",
+ {"Element Count", "wlan.ft.element_count",
FT_UINT16, BASE_DEC, NULL, 0xff00,
NULL, HFILL }},
{&hf_ieee80211_tag_ft_mic,
- {"MIC", "wlan_mgt.ft.mic",
+ {"MIC", "wlan.ft.mic",
FT_BYTES, BASE_NONE, NULL, 0,
NULL, HFILL }},
{&hf_ieee80211_tag_ft_anonce,
- {"ANonce", "wlan_mgt.ft.anonce",
+ {"ANonce", "wlan.ft.anonce",
FT_BYTES, BASE_NONE, NULL, 0,
NULL, HFILL }},
{&hf_ieee80211_tag_ft_snonce,
- {"SNonce", "wlan_mgt.ft.snonce",
+ {"SNonce", "wlan.ft.snonce",
FT_BYTES, BASE_NONE, NULL, 0,
NULL, HFILL }},
{&hf_ieee80211_tag_ft_subelem_id,
- {"Subelement ID", "wlan_mgt.ft.subelem.id",
+ {"Subelement ID", "wlan.ft.subelem.id",
FT_UINT8, BASE_DEC, VALS(ft_subelem_id_vals), 0,
NULL, HFILL }},
{&hf_ieee80211_tag_ft_subelem_len,
- {"Length", "wlan_mgt.ft.subelem.len",
+ {"Length", "wlan.ft.subelem.len",
FT_UINT8, BASE_DEC, NULL, 0,
NULL, HFILL }},
{&hf_ieee80211_tag_ft_subelem_data,
- {"Data", "wlan_mgt.ft.subelem.data",
+ {"Data", "wlan.ft.subelem.data",
FT_BYTES, BASE_NONE, NULL, 0,
NULL, HFILL }},
{&hf_ieee80211_tag_ft_subelem_r1kh_id,
- {"PMK-R1 key holder identifier (R1KH-ID)", "wlan_mgt.ft.subelem.r1kh_id",
+ {"PMK-R1 key holder identifier (R1KH-ID)", "wlan.ft.subelem.r1kh_id",
FT_BYTES, BASE_NONE, NULL, 0,
NULL, HFILL }},
{&hf_ieee80211_tag_ft_subelem_gtk_key_info,
- {"Key Info", "wlan_mgt.ft.subelem.gtk.key_info",
+ {"Key Info", "wlan.ft.subelem.gtk.key_info",
FT_UINT16, BASE_HEX, NULL, 0,
NULL, HFILL }},
{&hf_ieee80211_tag_ft_subelem_gtk_key_id,
- {"Key ID", "wlan_mgt.ft.subelem.gtk.key_id",
+ {"Key ID", "wlan.ft.subelem.gtk.key_id",
FT_UINT16, BASE_DEC, NULL, 0x0003,
NULL, HFILL }},
{&hf_ieee80211_tag_ft_subelem_gtk_key_length,
- {"Key Length", "wlan_mgt.ft.subelem.gtk.key_length",
+ {"Key Length", "wlan.ft.subelem.gtk.key_length",
FT_UINT8, BASE_HEX, NULL, 0,
NULL, HFILL }},
{&hf_ieee80211_tag_ft_subelem_gtk_rsc,
- {"RSC", "wlan_mgt.ft.subelem.gtk.rsc",
+ {"RSC", "wlan.ft.subelem.gtk.rsc",
FT_BYTES, BASE_NONE, NULL, 0,
NULL, HFILL }},
{&hf_ieee80211_tag_ft_subelem_gtk_key,
- {"GTK", "wlan_mgt.ft.subelem.gtk.key",
+ {"GTK", "wlan.ft.subelem.gtk.key",
FT_BYTES, BASE_NONE, NULL, 0,
NULL, HFILL }},
{&hf_ieee80211_tag_ft_subelem_r0kh_id,
- {"PMK-R0 key holder identifier (R0KH-ID)", "wlan_mgt.ft.subelem.r0kh_id",
+ {"PMK-R0 key holder identifier (R0KH-ID)", "wlan.ft.subelem.r0kh_id",
FT_STRING, BASE_NONE, NULL, 0,
NULL, HFILL }},
{&hf_ieee80211_tag_ft_subelem_igtk_key_id,
- {"Key ID", "wlan_mgt.ft.subelem.igtk.key_id",
+ {"Key ID", "wlan.ft.subelem.igtk.key_id",
FT_UINT16, BASE_DEC, NULL, 0,
NULL, HFILL }},
{&hf_ieee80211_tag_ft_subelem_igtk_ipn,
- {"IPN", "wlan_mgt.ft.subelem.igtk.ipn",
+ {"IPN", "wlan.ft.subelem.igtk.ipn",
FT_BYTES, BASE_NONE, NULL, 0,
NULL, HFILL }},
{&hf_ieee80211_tag_ft_subelem_igtk_key_length,
- {"Key Length", "wlan_mgt.ft.subelem.igtk.key_length",
+ {"Key Length", "wlan.ft.subelem.igtk.key_length",
FT_UINT8, BASE_HEX, NULL, 0,
NULL, HFILL }},
{&hf_ieee80211_tag_ft_subelem_igtk_key,
- {"Wrapped Key (IGTK)", "wlan_mgt.ft.subelem.igtk.key",
+ {"Wrapped Key (IGTK)", "wlan.ft.subelem.igtk.key",
FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
/* RIC Data IE: 802.11-2012: 8.4.2.52 */
{&hf_ieee80211_tag_ric_data_id,
- {"Resource Handshake Identifier", "wlan_mgt.ric_data.id",
+ {"Resource Handshake Identifier", "wlan.ric_data.id",
FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
{&hf_ieee80211_tag_ric_data_desc_cnt,
- {"Resource Descriptor Count", "wlan_mgt.ric_data.desc_cnt",
+ {"Resource Descriptor Count", "wlan.ric_data.desc_cnt",
FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
{&hf_ieee80211_tag_ric_data_status_code,
- {"Status Code", "wlan_mgt.ric_data.status_code",
+ {"Status Code", "wlan.ric_data.status_code",
FT_UINT16, BASE_HEX|BASE_EXT_STRING, &ieee80211_status_code_ext, 0,
"Status of requested Resource", HFILL }},
/* OBSS IE: 802.11-2012: 8.4.2.61 */
{&hf_ieee80211_tag_obss_spd,
- {"Scan Passive Dwell", "wlan_mgt.obss.spd",
+ {"Scan Passive Dwell", "wlan.obss.spd",
FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
{&hf_ieee80211_tag_obss_sad,
- {"Scan Active Dwell", "wlan_mgt.obss.sad",
+ {"Scan Active Dwell", "wlan.obss.sad",
FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
{&hf_ieee80211_tag_obss_cwtsi,
- {"Channel Width Trigger Scan Interval", "wlan_mgt.obss.cwtsi",
+ {"Channel Width Trigger Scan Interval", "wlan.obss.cwtsi",
FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
{&hf_ieee80211_tag_obss_sptpc,
- {"Scan Passive Total Per Channel", "wlan_mgt.obss.sptpc",
+ {"Scan Passive Total Per Channel", "wlan.obss.sptpc",
FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
{&hf_ieee80211_tag_obss_satpc,
- {"Scan Active Total Per Channel", "wlan_mgt.obss.satpc",
+ {"Scan Active Total Per Channel", "wlan.obss.satpc",
FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
{&hf_ieee80211_tag_obss_wctdf,
- {"Width Channel Transition Delay Factor", "wlan_mgt.obss.wctdf",
+ {"Width Channel Transition Delay Factor", "wlan.obss.wctdf",
FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
{&hf_ieee80211_tag_obss_sat,
- {"Scan Activity Threshold", "wlan_mgt.obss.sat",
+ {"Scan Activity Threshold", "wlan.obss.sat",
FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
/* RIC Descriptor IE: 802.11-2012: 8.4.2.53 */
{&hf_ieee80211_tag_ric_desc_rsrc_type,
- {"Resource Type", "wlan_mgt.ric_desc.rsrc_type",
+ {"Resource Type", "wlan.ric_desc.rsrc_type",
FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
{&hf_ieee80211_tag_ric_desc_var_params,
- {"Variable Params", "wlan_mgt.ric_desc.var_params",
+ {"Variable Params", "wlan.ric_desc.var_params",
FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
/* MMIE */
{&hf_ieee80211_tag_mmie_keyid,
- {"KeyID", "wlan_mgt.mmie.keyid",
+ {"KeyID", "wlan.mmie.keyid",
FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
{&hf_ieee80211_tag_mmie_ipn,
- {"IPN", "wlan_mgt.mmie.ipn",
+ {"IPN", "wlan.mmie.ipn",
FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
{&hf_ieee80211_tag_mmie_mic,
- {"MIC", "wlan_mgt.mmie.mic",
+ {"MIC", "wlan.mmie.mic",
FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
/* WAPI Parameter Set*/
{&hf_ieee80211_tag_wapi_param_set_version,
- {"Version", "wlan_mgt.wapi.version",
+ {"Version", "wlan.wapi.version",
FT_UINT16, BASE_DEC, NULL, 0,
NULL, HFILL }},
{&hf_ieee80211_tag_wapi_param_set_akm_suite_count,
- {"AKM Suite Count", "wlan_mgt.wapi.akm_suite.count",
+ {"AKM Suite Count", "wlan.wapi.akm_suite.count",
FT_UINT16, BASE_DEC, NULL, 0,
NULL, HFILL }},
{&hf_ieee80211_tag_wapi_param_set_akm_suite_oui,
- {"AKM Suite OUI", "wlan_mgt.wapi.akm_suite.oui",
+ {"AKM Suite OUI", "wlan.wapi.akm_suite.oui",
FT_UINT24, BASE_CUSTOM, CF_FUNC(oui_base_custom), 0,
NULL, HFILL }},
{&hf_ieee80211_tag_wapi_param_set_akm_suite_type,
- {"AKM Suite Type", "wlan_mgt.wapi.akm_suite.type",
+ {"AKM Suite Type", "wlan.wapi.akm_suite.type",
FT_UINT8, BASE_DEC, VALS(ieee80211_wapi_suite_type) , 0,
NULL, HFILL }},
{&hf_ieee80211_tag_wapi_param_set_ucast_cipher_suite_count,
- {"Unicast Cipher Suite Count", "wlan_mgt.wapi.unicast_cipher.suite.count",
+ {"Unicast Cipher Suite Count", "wlan.wapi.unicast_cipher.suite.count",
FT_UINT16, BASE_DEC, NULL, 0,
NULL, HFILL }},
{&hf_ieee80211_tag_wapi_param_set_ucast_cipher_suite_oui,
- {"Unicast Cipher Suite OUI", "wlan_mgt.wapi.unicast_cipher.suite.oui",
+ {"Unicast Cipher Suite OUI", "wlan.wapi.unicast_cipher.suite.oui",
FT_UINT24, BASE_CUSTOM, CF_FUNC(oui_base_custom), 0,
NULL, HFILL }},
{&hf_ieee80211_tag_wapi_param_set_ucast_cipher_suite_type,
- {"Unicast Cipher Suite Type", "wlan_mgt.wapi.unicast_cipher.suite.type",
+ {"Unicast Cipher Suite Type", "wlan.wapi.unicast_cipher.suite.type",
FT_UINT8, BASE_DEC, VALS(ieee80211_wapi_cipher_type) , 0,
NULL, HFILL }},
{&hf_ieee80211_tag_wapi_param_set_mcast_cipher_suite_oui,
- {"Multicast Cipher Suite OUI", "wlan_mgt.wapi.multicast_cipher.suite.oui",
+ {"Multicast Cipher Suite OUI", "wlan.wapi.multicast_cipher.suite.oui",
FT_UINT24, BASE_CUSTOM, CF_FUNC(oui_base_custom), 0,
NULL, HFILL }},
{&hf_ieee80211_tag_wapi_param_set_mcast_cipher_suite_type,
- {"Multicast Cipher Suite Type", "wlan_mgt.wapi.multicast_cipher.suite.type",
+ {"Multicast Cipher Suite Type", "wlan.wapi.multicast_cipher.suite.type",
FT_UINT8, BASE_DEC, VALS(ieee80211_wapi_cipher_type) , 0,
NULL, HFILL }},
{&hf_ieee80211_tag_wapi_param_set_capab,
- {"WAPI Capability Info", "wlan_mgt.wapi.capab",
+ {"WAPI Capability Info", "wlan.wapi.capab",
FT_UINT16, BASE_HEX, NULL, 0,
NULL, HFILL }},
{&hf_ieee80211_tag_wapi_param_set_capab_preauth,
- {"Supports Preauthentication?", "wlan_mgt.wapi.capab.preauth",
+ {"Supports Preauthentication?", "wlan.wapi.capab.preauth",
FT_BOOLEAN, 16 , NULL, 0x0001,
NULL, HFILL }},
{&hf_ieee80211_tag_wapi_param_set_capab_rsvd,
- {"Reserved", "wlan_mgt.wapi.capab.rsvd",
+ {"Reserved", "wlan.wapi.capab.rsvd",
FT_UINT16, BASE_DEC , NULL, 0xFFFE,
NULL, HFILL }},
{&hf_ieee80211_tag_wapi_param_set_bkid_count,
- {"No of BKID's", "wlan_mgt.wapi.bkid.count",
+ {"No of BKID's", "wlan.wapi.bkid.count",
FT_UINT16, BASE_DEC, NULL, 0,
NULL, HFILL }},
{&hf_ieee80211_tag_wapi_param_set_bkid_list,
- {"BKID", "wlan_mgt.wapi.bkid",
+ {"BKID", "wlan.wapi.bkid",
FT_BYTES, BASE_NONE, NULL, 0,
NULL, HFILL }},
/* BSS Max Idle Period */
{&hf_ieee80211_tag_bss_max_idle_period,
- {"BSS Max Idle Period (1000 TUs)", "wlan_mgt.bss_max_idle.period",
+ {"BSS Max Idle Period (1000 TUs)", "wlan.bss_max_idle.period",
FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
{&hf_ieee80211_tag_bss_max_idle_options_protected,
{"BSS Max Idle Period Options: Protected Keep-Alive Required",
- "wlan_mgt.bss_max_idle.options.protected",
+ "wlan.bss_max_idle.options.protected",
FT_UINT8, BASE_DEC, NULL, 0x01, NULL, HFILL }},
/* TFS Request */
{&hf_ieee80211_tag_tfs_request_id,
- {"TFS ID", "wlan_mgt.tfs_request.id",
+ {"TFS ID", "wlan.tfs_request.id",
FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
{&hf_ieee80211_tag_tfs_request_ac_delete_after_match,
{"TFS Action Code - Delete after match",
- "wlan_mgt.tfs_request.action_code.delete_after_match",
+ "wlan.tfs_request.action_code.delete_after_match",
FT_UINT8, BASE_DEC, NULL, 0x01, NULL, HFILL }},
{&hf_ieee80211_tag_tfs_request_ac_notify,
{"TFS Action Code - Notify",
- "wlan_mgt.tfs_request.action_code.notify",
+ "wlan.tfs_request.action_code.notify",
FT_UINT8, BASE_DEC, NULL, 0x02, NULL, HFILL }},
{&hf_ieee80211_tag_tfs_request_subelem_id,
- {"Subelement ID", "wlan_mgt.tfs_request.subelem.id",
+ {"Subelement ID", "wlan.tfs_request.subelem.id",
FT_UINT8, BASE_DEC, VALS(tfs_request_subelem_ids), 0,
"TFS Request Subelement ID", HFILL }},
{&hf_ieee80211_tag_tfs_request_subelem_len,
- {"Length", "wlan_mgt.tfs_request.subelem.len",
+ {"Length", "wlan.tfs_request.subelem.len",
FT_UINT8, BASE_DEC, NULL, 0,
"TFS Request Subelement Length", HFILL }},
{&hf_ieee80211_tag_tfs_request_subelem,
- {"Subelement Data", "wlan_mgt.tfs_request.subelem",
+ {"Subelement Data", "wlan.tfs_request.subelem",
FT_BYTES, BASE_NONE, NULL, 0,
"TFS Request Subelement Data", HFILL }},
/* TFS Response */
{&hf_ieee80211_tag_tfs_response_subelem_id,
- {"Subelement ID", "wlan_mgt.tfs_response.subelem.id",
+ {"Subelement ID", "wlan.tfs_response.subelem.id",
FT_UINT8, BASE_DEC, VALS(tfs_response_subelem_ids), 0,
"TFS Response Subelement ID", HFILL }},
{&hf_ieee80211_tag_tfs_response_subelem_len,
- {"Length", "wlan_mgt.tfs_response.subelem.len",
+ {"Length", "wlan.tfs_response.subelem.len",
FT_UINT8, BASE_DEC, NULL, 0,
"TFS Response Subelement Length", HFILL }},
{&hf_ieee80211_tag_tfs_response_subelem,
- {"Subelement Data", "wlan_mgt.tfs_response.subelem",
+ {"Subelement Data", "wlan.tfs_response.subelem",
FT_BYTES, BASE_NONE, NULL, 0,
"TFS Response Subelement Data", HFILL }},
{&hf_ieee80211_tag_tfs_response_status,
- {"TFS Response Status", "wlan_mgt.tfs_response.status",
+ {"TFS Response Status", "wlan.tfs_response.status",
FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
{&hf_ieee80211_tag_tfs_response_id,
- {"TFS ID", "wlan_mgt.tfs_response.tfs_id",
+ {"TFS ID", "wlan.tfs_response.tfs_id",
FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
/* WNM-Sleep Mode */
{&hf_ieee80211_tag_wnm_sleep_mode_action_type,
- {"Action Type", "wlan_mgt.wnm_sleep_mode.action_type",
+ {"Action Type", "wlan.wnm_sleep_mode.action_type",
FT_UINT8, BASE_DEC, VALS(wnm_sleep_mode_action_types), 0,
"WNM-Sleep Mode Action Type", HFILL }},
{&hf_ieee80211_tag_wnm_sleep_mode_response_status,
{"WNM-Sleep Mode Response Status",
- "wlan_mgt.wnm_sleep_mode.response_status",
+ "wlan.wnm_sleep_mode.response_status",
FT_UINT8, BASE_DEC, VALS(wnm_sleep_mode_response_status_vals), 0, NULL,
HFILL }},
{&hf_ieee80211_tag_wnm_sleep_mode_interval,
- {"WNM-Sleep Interval", "wlan_mgt.wnm_sleep_mode.interval",
+ {"WNM-Sleep Interval", "wlan.wnm_sleep_mode.interval",
FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
/* Time Advertisement */
{&hf_ieee80211_tag_time_adv_timing_capab,
- {"Timing capabilities", "wlan_mgt.time_adv.timing_capab",
+ {"Timing capabilities", "wlan.time_adv.timing_capab",
FT_UINT8, BASE_DEC, VALS(time_adv_timing_capab_vals), 0,
NULL, HFILL }},
{&hf_ieee80211_tag_time_adv_time_value,
- {"Time Value", "wlan_mgt.time_adv.time_value",
+ {"Time Value", "wlan.time_adv.time_value",
FT_BYTES, BASE_NONE, NULL, 0,
NULL, HFILL }},
{&hf_ieee80211_tag_time_adv_time_value_year,
- {"Time Value: Year", "wlan_mgt.time_adv.time_value.year",
+ {"Time Value: Year", "wlan.time_adv.time_value.year",
FT_UINT16, BASE_DEC, NULL, 0,
NULL, HFILL }},
{&hf_ieee80211_tag_time_adv_time_value_month,
- {"Time Value: Month", "wlan_mgt.time_adv.time_value.month",
+ {"Time Value: Month", "wlan.time_adv.time_value.month",
FT_UINT8, BASE_DEC, NULL, 0,
NULL, HFILL }},
{&hf_ieee80211_tag_time_adv_time_value_day,
- {"Time Value: Day", "wlan_mgt.time_adv.time_value.month",
+ {"Time Value: Day", "wlan.time_adv.time_value.month",
FT_UINT8, BASE_DEC, NULL, 0,
NULL, HFILL }},
{&hf_ieee80211_tag_time_adv_time_value_hours,
- {"Time Value: Hours", "wlan_mgt.time_adv.time_value.hours",
+ {"Time Value: Hours", "wlan.time_adv.time_value.hours",
FT_UINT8, BASE_DEC, NULL, 0,
NULL, HFILL }},
{&hf_ieee80211_tag_time_adv_time_value_minutes,
- {"Time Value: Minutes", "wlan_mgt.time_adv.time_value.minutes",
+ {"Time Value: Minutes", "wlan.time_adv.time_value.minutes",
FT_UINT8, BASE_DEC, NULL, 0,
NULL, HFILL }},
{&hf_ieee80211_tag_time_adv_time_value_seconds,
- {"Time Value: Seconds", "wlan_mgt.time_adv.time_value.seconds",
+ {"Time Value: Seconds", "wlan.time_adv.time_value.seconds",
FT_UINT8, BASE_DEC, NULL, 0,
NULL, HFILL }},
{&hf_ieee80211_tag_time_adv_time_value_milliseconds,
- {"Time Value: Milliseconds", "wlan_mgt.time_adv.time_value.milliseconds",
+ {"Time Value: Milliseconds", "wlan.time_adv.time_value.milliseconds",
FT_UINT16, BASE_DEC, NULL, 0,
NULL, HFILL }},
{&hf_ieee80211_tag_time_adv_time_value_reserved,
- {"Time Value: Reserved", "wlan_mgt.time_adv.time_value.reserved",
+ {"Time Value: Reserved", "wlan.time_adv.time_value.reserved",
FT_UINT8, BASE_DEC, NULL, 0,
NULL, HFILL }},
{&hf_ieee80211_tag_time_adv_time_error,
- {"Time Error", "wlan_mgt.time_adv.time_error",
+ {"Time Error", "wlan.time_adv.time_error",
FT_BYTES, BASE_NONE, NULL, 0,
NULL, HFILL }},
{&hf_ieee80211_tag_time_adv_time_update_counter,
- {"Time Update Counter", "wlan_mgt.time_adv.time_update_counter",
+ {"Time Update Counter", "wlan.time_adv.time_update_counter",
FT_UINT8, BASE_DEC, NULL, 0,
NULL, HFILL }},
/* Time Zone */
{&hf_ieee80211_tag_time_zone,
- {"Time Zone", "wlan_mgt.time_zone",
+ {"Time Zone", "wlan.time_zone",
FT_STRING, BASE_NONE, NULL, 0,
NULL, HFILL }},
/* Interworking */
{&hf_ieee80211_tag_interworking_access_network_type,
- {"Access Network Type", "wlan_mgt.interworking.access_network_type",
+ {"Access Network Type", "wlan.interworking.access_network_type",
FT_UINT8, BASE_DEC, VALS(access_network_type_vals), 0x0f,
NULL, HFILL }},
{&hf_ieee80211_tag_interworking_internet,
- {"Internet", "wlan_mgt.interworking.internet",
+ {"Internet", "wlan.interworking.internet",
FT_UINT8, BASE_DEC, NULL, 0x10,
NULL, HFILL }},
{&hf_ieee80211_tag_interworking_asra,
- {"ASRA", "wlan_mgt.interworking.asra",
+ {"ASRA", "wlan.interworking.asra",
FT_UINT8, BASE_DEC, NULL, 0x20,
"Additional Step Required for Access", HFILL }},
{&hf_ieee80211_tag_interworking_esr,
- {"ESR", "wlan_mgt.interworking.esr",
+ {"ESR", "wlan.interworking.esr",
FT_UINT8, BASE_DEC, NULL, 0x40,
"Emergency services reachable", HFILL }},
{&hf_ieee80211_tag_interworking_uesa,
- {"UESA", "wlan_mgt.interworking.uesa",
+ {"UESA", "wlan.interworking.uesa",
FT_UINT8, BASE_DEC, NULL, 0x80,
"Unauthenticated emergency service accessible", HFILL }},
{&hf_ieee80211_tag_interworking_hessid,
- {"HESSID", "wlan_mgt.interworking.hessid",
+ {"HESSID", "wlan.interworking.hessid",
FT_ETHER, BASE_NONE, NULL, 0,
"Homogeneous ESS identifier", HFILL }},
/* QoS Map Set element */
{&hf_ieee80211_tag_qos_map_set_dscp_exc,
- {"DSCP Exception", "wlan_mgt.qos_map_set.dscp_exception",
+ {"DSCP Exception", "wlan.qos_map_set.dscp_exception",
FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
{&hf_ieee80211_tag_qos_map_set_dscp_exc_val,
- {"DSCP Value", "wlan_mgt.qos_map_set.dscp_value",
+ {"DSCP Value", "wlan.qos_map_set.dscp_value",
FT_UINT8, BASE_DEC, NULL, 0,
"DSCP Exception - DSCP Value", HFILL }},
{&hf_ieee80211_tag_qos_map_set_dscp_exc_up,
- {"User Priority", "wlan_mgt.qos_map_set.up",
+ {"User Priority", "wlan.qos_map_set.up",
FT_UINT8, BASE_DEC, NULL, 0,
"DSCP Exception - User Priority", HFILL }},
{&hf_ieee80211_tag_qos_map_set_range,
- {"DSCP Range description", "wlan_mgt.qos_map_set.range",
+ {"DSCP Range description", "wlan.qos_map_set.range",
FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
{&hf_ieee80211_tag_qos_map_set_low,
- {"DSCP Low Value", "wlan_mgt.qos_map_set.dscp_low_value",
+ {"DSCP Low Value", "wlan.qos_map_set.dscp_low_value",
FT_UINT8, BASE_DEC, NULL, 0,
"DSCP Range description - DSCP Low Value", HFILL }},
{&hf_ieee80211_tag_qos_map_set_high,
- {"DSCP High Value", "wlan_mgt.qos_map_set.dscp_high_value",
+ {"DSCP High Value", "wlan.qos_map_set.dscp_high_value",
FT_UINT8, BASE_DEC, NULL, 0,
"DSCP Range description - DSCP High Value", HFILL }},
/* Advertisement Protocol */
{&hf_ieee80211_tag_adv_proto_resp_len_limit,
- {"Query Response Length Limit", "wlan_mgt.adv_proto.resp_len_limit",
+ {"Query Response Length Limit", "wlan.adv_proto.resp_len_limit",
FT_UINT8, BASE_DEC, NULL, 0x7f,
NULL, HFILL }},
{&hf_ieee80211_tag_adv_proto_pame_bi,
- {"PAME-BI", "wlan_mgt.adv_proto.pame_bi",
+ {"PAME-BI", "wlan.adv_proto.pame_bi",
FT_UINT8, BASE_DEC, NULL, 0x80,
"Pre-Association Message Xchange BSSID Independent (PAME-BI)", HFILL }},
{&hf_ieee80211_tag_adv_proto_id,
- {"Advertisement Protocol ID", "wlan_mgt.adv_proto.id",
+ {"Advertisement Protocol ID", "wlan.adv_proto.id",
FT_UINT8, BASE_DEC, VALS(adv_proto_id_vals), 0,
NULL, HFILL }},
{&hf_ieee80211_tag_adv_proto_vs_info,
- {"Advertisement Protocol Vendor Specific info", "wlan_mgt.adv_proto.vs_info",
+ {"Advertisement Protocol Vendor Specific info", "wlan.adv_proto.vs_info",
FT_NONE, BASE_NONE, NULL, 0,
NULL, HFILL }},
/* Roaming Consortium */
{&hf_ieee80211_tag_roaming_consortium_num_anqp_oi,
- {"Number of ANQP OIs", "wlan_mgt.roaming_consortium.num_anqp_oi",
+ {"Number of ANQP OIs", "wlan.roaming_consortium.num_anqp_oi",
FT_UINT8, BASE_DEC, NULL, 0,
NULL, HFILL }},
{&hf_ieee80211_tag_roaming_consortium_oi1_len,
- {"OI #1 Length", "wlan_mgt.roaming_consortium.oi1_len",
+ {"OI #1 Length", "wlan.roaming_consortium.oi1_len",
FT_UINT8, BASE_DEC, NULL, 0x0f,
NULL, HFILL }},
{&hf_ieee80211_tag_roaming_consortium_oi2_len,
- {"OI #2 Length", "wlan_mgt.roaming_consortium.oi2_len",
+ {"OI #2 Length", "wlan.roaming_consortium.oi2_len",
FT_UINT8, BASE_DEC, NULL, 0xf0,
NULL, HFILL }},
{&hf_ieee80211_tag_roaming_consortium_oi1,
- {"OI #1", "wlan_mgt.roaming_consortium.oi1",
+ {"OI #1", "wlan.roaming_consortium.oi1",
FT_BYTES, BASE_NONE, NULL, 0,
NULL, HFILL }},
{&hf_ieee80211_tag_roaming_consortium_oi2,
- {"OI #2", "wlan_mgt.roaming_consortium.oi2",
+ {"OI #2", "wlan.roaming_consortium.oi2",
FT_BYTES, BASE_NONE, NULL, 0,
NULL, HFILL }},
{&hf_ieee80211_tag_roaming_consortium_oi3,
- {"OI #3", "wlan_mgt.roaming_consortium.oi3",
+ {"OI #3", "wlan.roaming_consortium.oi3",
FT_BYTES, BASE_NONE, NULL, 0,
NULL, HFILL }},
/* Timeout Interval */
{&hf_ieee80211_tag_timeout_int_type,
- {"Timeout Interval Type", "wlan_mgt.timeout_int.type",
+ {"Timeout Interval Type", "wlan.timeout_int.type",
FT_UINT8, BASE_DEC, VALS(timeout_int_types), 0,
NULL, HFILL }},
{&hf_ieee80211_tag_timeout_int_value,
- {"Timeout Interval Value", "wlan_mgt.timeout_int.value",
+ {"Timeout Interval Value", "wlan.timeout_int.value",
FT_UINT32, BASE_DEC, NULL, 0,
NULL, HFILL }},
/* Link Identifier */
{&hf_ieee80211_tag_link_id_bssid,
- {"BSSID", "wlan_mgt.link_id.bssid",
+ {"BSSID", "wlan.link_id.bssid",
FT_ETHER, BASE_NONE, NULL, 0,
NULL, HFILL }},
{&hf_ieee80211_tag_link_id_init_sta,
- {"TDLS initiator STA Address", "wlan_mgt.link_id.init_sta",
+ {"TDLS initiator STA Address", "wlan.link_id.init_sta",
FT_ETHER, BASE_NONE, NULL, 0,
NULL, HFILL }},
{&hf_ieee80211_tag_link_id_resp_sta,
- {"TDLS responder STA Address", "wlan_mgt.link_id.resp_sta",
+ {"TDLS responder STA Address", "wlan.link_id.resp_sta",
FT_ETHER, BASE_NONE, NULL, 0,
NULL, HFILL }},
/* Wakeup Schedule */
{&hf_ieee80211_tag_wakeup_schedule_offset,
- {"Offset", "wlan_mgt.wakeup_schedule.offset",
+ {"Offset", "wlan.wakeup_schedule.offset",
FT_UINT32, BASE_DEC, NULL, 0,
NULL, HFILL }},
{&hf_ieee80211_tag_wakeup_schedule_interval,
- {"Interval", "wlan_mgt.wakeup_schedule.interval",
+ {"Interval", "wlan.wakeup_schedule.interval",
FT_UINT32, BASE_DEC, NULL, 0,
NULL, HFILL }},
{&hf_ieee80211_tag_wakeup_schedule_awake_window_slots,
- {"Awake Window Slots", "wlan_mgt.wakeup_schedule.awake_window_slots",
+ {"Awake Window Slots", "wlan.wakeup_schedule.awake_window_slots",
FT_UINT32, BASE_DEC, NULL, 0,
NULL, HFILL }},
{&hf_ieee80211_tag_wakeup_schedule_max_awake_dur,
- {"Maximum Awake Window Duration", "wlan_mgt.wakeup_schedule.max_awake_dur",
+ {"Maximum Awake Window Duration", "wlan.wakeup_schedule.max_awake_dur",
FT_UINT32, BASE_DEC, NULL, 0,
NULL, HFILL }},
{&hf_ieee80211_tag_wakeup_schedule_idle_count,
- {"Idle Count", "wlan_mgt.wakeup_schedule.idle_count",
+ {"Idle Count", "wlan.wakeup_schedule.idle_count",
FT_UINT16, BASE_DEC, NULL, 0,
NULL, HFILL }},
/* Channel Switch Timing */
{&hf_ieee80211_tag_channel_switch_timing_switch_time,
- {"Switch Time", "wlan_mgt.channel_switch_timing.switch_time",
+ {"Switch Time", "wlan.channel_switch_timing.switch_time",
FT_UINT16, BASE_DEC, NULL, 0,
NULL, HFILL }},
{&hf_ieee80211_tag_channel_switch_timing_switch_timeout,
- {"Switch Timeout", "wlan_mgt.channel_switch_timing.switch_timeout",
+ {"Switch Timeout", "wlan.channel_switch_timing.switch_timeout",
FT_UINT16, BASE_DEC, NULL, 0,
NULL, HFILL }},
/* PTI Control */
{&hf_ieee80211_tag_pti_control_tid,
- {"TID", "wlan_mgt.pti_control.tid",
+ {"TID", "wlan.pti_control.tid",
FT_UINT8, BASE_DEC, NULL, 0,
NULL, HFILL }},
{&hf_ieee80211_tag_pti_control_sequence_control,
- {"Sequence Control", "wlan_mgt.pti_control.sequence_control",
+ {"Sequence Control", "wlan.pti_control.sequence_control",
FT_UINT16, BASE_HEX, NULL, 0,
NULL, HFILL }},
/* PU Buffer Status */
{&hf_ieee80211_tag_pu_buffer_status_ac_bk,
- {"AC_BK traffic available", "wlan_mgt.pu_buffer_status.ac_bk",
+ {"AC_BK traffic available", "wlan.pu_buffer_status.ac_bk",
FT_UINT8, BASE_DEC, NULL, 0x01,
NULL, HFILL }},
{&hf_ieee80211_tag_pu_buffer_status_ac_be,
- {"AC_BE traffic available", "wlan_mgt.pu_buffer_status.ac_be",
+ {"AC_BE traffic available", "wlan.pu_buffer_status.ac_be",
FT_UINT8, BASE_DEC, NULL, 0x02,
NULL, HFILL }},
{&hf_ieee80211_tag_pu_buffer_status_ac_vi,
- {"AC_VI traffic available", "wlan_mgt.pu_buffer_status.ac_vi",
+ {"AC_VI traffic available", "wlan.pu_buffer_status.ac_vi",
FT_UINT8, BASE_DEC, NULL, 0x04,
NULL, HFILL }},
{&hf_ieee80211_tag_pu_buffer_status_ac_vo,
- {"AC_VO traffic available", "wlan_mgt.pu_buffer_status.ac_vo",
+ {"AC_VO traffic available", "wlan.pu_buffer_status.ac_vo",
FT_UINT8, BASE_DEC, NULL, 0x08,
NULL, HFILL }},
{&hf_ieee80211_mysterious_olpc_stuff,
- {"Mysterious OLPC stuff", "wlan_mgt.mysterious_olpc_stuff",
+ {"Mysterious OLPC stuff", "wlan.mysterious_olpc_stuff",
FT_NONE, BASE_NONE, NULL, 0x0,
NULL, HFILL }}
@@ -26997,11 +26993,11 @@ proto_register_ieee80211(void)
"Invalid value", EXPFILL }},
{ &ei_ieee80211_tag_number,
- { "wlan_mgt.tag.number.unexpected_ie", PI_MALFORMED, PI_ERROR,
+ { "wlan.tag.number.unexpected_ie", PI_MALFORMED, PI_ERROR,
"Unexpected Information Element ID", EXPFILL }},
{ &ei_ieee80211_tag_length,
- { "wlan_mgt.tag.length.bad", PI_MALFORMED, PI_ERROR,
+ { "wlan.tag.length.bad", PI_MALFORMED, PI_ERROR,
"Bad tag length", EXPFILL }},
{ &ei_ieee80211_extra_data,
@@ -27009,87 +27005,87 @@ proto_register_ieee80211(void)
"Unexpected extra data in the end", EXPFILL }},
{ &ei_ieee80211_ff_anqp_capability,
- { "wlan_mgt.fixed.anqp.capability.invalid", PI_MALFORMED, PI_ERROR,
+ { "wlan.fixed.anqp.capability.invalid", PI_MALFORMED, PI_ERROR,
"Invalid vendor-specific ANQP capability", EXPFILL }},
{ &ei_ieee80211_ff_anqp_venue_length,
- { "wlan_mgt.fixed.anqp.venue.length.invalid", PI_MALFORMED, PI_ERROR,
+ { "wlan.fixed.anqp.venue.length.invalid", PI_MALFORMED, PI_ERROR,
"Invalid Venue Name Duple length", EXPFILL }},
{ &ei_ieee80211_ff_anqp_roaming_consortium_oi_len,
- { "wlan_mgt.fixed.anqp.roaming_consortium.oi_len.invalid", PI_MALFORMED, PI_ERROR,
+ { "wlan.fixed.anqp.roaming_consortium.oi_len.invalid", PI_MALFORMED, PI_ERROR,
"Invalid Roaming Consortium OI", EXPFILL }},
{ &ei_ieee80211_ff_anqp_nai_field_len,
- { "wlan_mgt.fixed.anqp.nai_realm_list.field_len.invalid", PI_MALFORMED, PI_ERROR,
+ { "wlan.fixed.anqp.nai_realm_list.field_len.invalid", PI_MALFORMED, PI_ERROR,
"Invalid NAI Realm List", EXPFILL }},
{ &ei_ieee80211_ff_anqp_nai_realm_eap_len,
- { "wlan_mgt.fixed.naqp_nai_realm_list.eap_method_len.invalid", PI_MALFORMED, PI_ERROR,
+ { "wlan.fixed.naqp_nai_realm_list.eap_method_len.invalid", PI_MALFORMED, PI_ERROR,
"Invalid EAP Method subfield", EXPFILL }},
{ &ei_hs20_anqp_ofn_length,
- { "wlan_mgt.hs20.anqp.ofn.length.invalid", PI_MALFORMED, PI_ERROR,
+ { "wlan.hs20.anqp.ofn.length.invalid", PI_MALFORMED, PI_ERROR,
"Invalid Operator Friendly Name Duple length", EXPFILL }},
{ &ei_hs20_anqp_nai_hrq_length,
- { "wlan_mgt.hs20.anqp.nai_hrq.length.invalid", PI_MALFORMED, PI_ERROR,
+ { "wlan.hs20.anqp.nai_hrq.length.invalid", PI_MALFORMED, PI_ERROR,
"Invalid NAI Home Realm Query length", EXPFILL }},
{ &ei_ieee80211_ff_anqp_info_length,
- { "wlan_mgt.fixed.anqp.info_length.invalid", PI_MALFORMED, PI_ERROR,
+ { "wlan.fixed.anqp.info_length.invalid", PI_MALFORMED, PI_ERROR,
"Invalid ANQP Info length", EXPFILL }},
{ &ei_ieee80211_not_enough_room_for_anqp_header,
- { "wlan_mgt.fixed.query_length_invalid", PI_MALFORMED, PI_ERROR,
+ { "wlan.fixed.query_length_invalid", PI_MALFORMED, PI_ERROR,
"Not enough room for ANQP header", EXPFILL }},
{ &ei_ieee80211_ff_query_request_length,
- { "wlan_mgt.fixed.query_request_length.invalid", PI_MALFORMED, PI_ERROR,
+ { "wlan.fixed.query_request_length.invalid", PI_MALFORMED, PI_ERROR,
"Invalid Query Request Length", EXPFILL }},
{ &ei_ieee80211_ff_query_response_length,
- { "wlan_mgt.fixed.query_response_length.invalid", PI_MALFORMED, PI_ERROR,
+ { "wlan.fixed.query_response_length.invalid", PI_MALFORMED, PI_ERROR,
"Invalid Query Response Length", EXPFILL }},
{ &ei_ieee80211_tag_wnm_sleep_mode_no_key_data,
- { "wlan_mgt.wnm_sleep_mode.no_key_data", PI_MALFORMED, PI_ERROR,
+ { "wlan.wnm_sleep_mode.no_key_data", PI_MALFORMED, PI_ERROR,
"WNM-Sleep Mode Response is not long enough to include Key Data", EXPFILL }},
{ &ei_ieee80211_tdls_setup_response_malformed,
- { "wlan_mgt.tdls_setup_response_malformed", PI_MALFORMED, PI_ERROR,
+ { "wlan.tdls_setup_response_malformed", PI_MALFORMED, PI_ERROR,
"TDLS Setup Response (success) does not include mandatory fields", EXPFILL }},
{ &ei_ieee80211_tdls_setup_confirm_malformed,
- { "wlan_mgt.tdls_setup_confirm_malformed", PI_MALFORMED, PI_ERROR,
+ { "wlan.tdls_setup_confirm_malformed", PI_MALFORMED, PI_ERROR,
"TDLS Setup Confirm (success) does not include mandatory fields", EXPFILL }},
{ &ei_ieee80211_wfa_ie_wme_qos_info_bad_ftype,
- { "wlan_mgt.wfa.ie.wme.qos_info.bad_ftype", PI_UNDECODED, PI_WARN,
+ { "wlan.wfa.ie.wme.qos_info.bad_ftype", PI_UNDECODED, PI_WARN,
"Could not deduce direction to decode correctly", EXPFILL }},
{ &ei_ieee80211_qos_info_bad_ftype,
- { "wlan_mgt.qos_info.bad_ftype", PI_UNDECODED, PI_WARN,
+ { "wlan.qos_info.bad_ftype", PI_UNDECODED, PI_WARN,
"Could not deduce direction to decode correctly", EXPFILL }},
{ &ei_ieee80211_qos_bad_aifsn,
- { "wlan_mgt.qos_info.bad_aifsn", PI_MALFORMED, PI_WARN,
+ { "wlan.qos_info.bad_aifsn", PI_MALFORMED, PI_WARN,
"Invalid AIFSN", EXPFILL }},
{ &ei_ieee80211_rsn_pcs_count,
- { "wlan_mgt.rsn.pcs.count.invalid", PI_MALFORMED, PI_ERROR,
+ { "wlan.rsn.pcs.count.invalid", PI_MALFORMED, PI_ERROR,
"Pairwise Cipher Suite Count too large", EXPFILL }},
{ &ei_ieee80211_rsn_pmkid_count,
- { "wlan_mgt.rsn.akms.count.invalid", PI_MALFORMED, PI_ERROR,
+ { "wlan.rsn.akms.count.invalid", PI_MALFORMED, PI_ERROR,
"Auth Key Management (AKM) Suite Count too large", EXPFILL }},
{ &ei_ieee80211_pmkid_count_too_large,
- { "wlan_mgt.rsn.pmkid.count.invalid", PI_MALFORMED, PI_ERROR,
+ { "wlan.rsn.pmkid.count.invalid", PI_MALFORMED, PI_ERROR,
"PMKID Count too large", EXPFILL }},
{ &ei_ieee80211_vht_tpe_pwr_info_count,
- { "wlan_mgt.vht.tpe.pwr_info.count.invalid", PI_MALFORMED, PI_ERROR,
+ { "wlan.vht.tpe.pwr_info.count.invalid", PI_MALFORMED, PI_ERROR,
"Max Tx Pwr Count is Incorrect, should be 0-7", EXPFILL }},
{ &ei_ieee80211_missing_data,
@@ -27101,19 +27097,19 @@ proto_register_ieee80211(void)
"Retransmission (retry)", EXPFILL }},
{ &ei_ieee80211_tag_measure_request_unknown,
- { "wlan_mgt.measure.req.unknown.expert", PI_UNDECODED, PI_WARN,
+ { "wlan.measure.req.unknown.expert", PI_UNDECODED, PI_WARN,
"Undecoded Measurement Request type (or subtype), Contact Wireshark developers if you want this supported", EXPFILL }},
{ &ei_ieee80211_tag_measure_request_beacon_unknown,
- { "wlan_mgt.measure.req.beacon.unknown.expert", PI_UNDECODED, PI_WARN,
+ { "wlan.measure.req.beacon.unknown.expert", PI_UNDECODED, PI_WARN,
"Unknown Data (not interpreted)", EXPFILL }},
{ &ei_ieee80211_tag_measure_report_unknown,
- { "wlan_mgt.measure.req.unknown.expert", PI_UNDECODED, PI_WARN,
+ { "wlan.measure.req.unknown.expert", PI_UNDECODED, PI_WARN,
"Undecoded Measurement Report type (or subtype), Contact Wireshark developers if you want this supported", EXPFILL }},
{ &ei_ieee80211_tag_data,
- { "wlan_mgt.tag.data.undecoded", PI_UNDECODED, PI_NOTE,
+ { "wlan.tag.data.undecoded", PI_UNDECODED, PI_NOTE,
"Dissector for 802.11 IE Tag code not implemented, Contact Wireshark developers if you want this supported", EXPFILL }},
{ &ei_ieee80211_dmg_subtype,
@@ -27121,7 +27117,7 @@ proto_register_ieee80211(void)
"Bad DMG type/subtype", EXPFILL }},
{ &ei_ieee80211_vht_action,
- { "wlan_mgt.vht.action.undecoded", PI_UNDECODED, PI_NOTE,
+ { "wlan.vht.action.undecoded", PI_UNDECODED, PI_NOTE,
"All subtype of VHT Action is not yet supported by Wireshark", EXPFILL }},
{ &ei_ieee80211_mesh_peering_unexpected,
@@ -27150,10 +27146,6 @@ proto_register_ieee80211(void)
proto_centrino = proto_register_protocol("IEEE 802.11 wireless LAN (Centrino)", "IEEE 802.11 (Centrino)", "wlan_centrino");
proto_register_field_array(proto_wlan, hf, array_length(hf));
- proto_wlan_mgt = proto_register_protocol("IEEE 802.11 wireless LAN management frame",
- "IEEE 802.11 MGT", "wlan_mgt");
- proto_register_field_array(proto_wlan_mgt, ff, array_length(ff));
-
proto_wlan_ext = proto_register_protocol("IEEE 802.11 wireless LAN extension frame",
"IEEE 802.11 EXT", "wlan_ext");