summaryrefslogtreecommitdiffstats
path: root/epan/dissectors/packet-ieee1905.c
diff options
context:
space:
mode:
Diffstat (limited to 'epan/dissectors/packet-ieee1905.c')
-rw-r--r--epan/dissectors/packet-ieee1905.c60
1 files changed, 30 insertions, 30 deletions
diff --git a/epan/dissectors/packet-ieee1905.c b/epan/dissectors/packet-ieee1905.c
index e26da6f..2c98c4d 100644
--- a/epan/dissectors/packet-ieee1905.c
+++ b/epan/dissectors/packet-ieee1905.c
@@ -3280,26 +3280,26 @@ static const value_string max_he_mcs_8_ss_vals[] = {
};
static int * const rx_he_mcs_map_headers[] = {
- &hf_ieee1905_ap_he_rx_mcs_map_1ss,
- &hf_ieee1905_ap_he_rx_mcs_map_2ss,
- &hf_ieee1905_ap_he_rx_mcs_map_3ss,
- &hf_ieee1905_ap_he_rx_mcs_map_4ss,
- &hf_ieee1905_ap_he_rx_mcs_map_5ss,
- &hf_ieee1905_ap_he_rx_mcs_map_6ss,
- &hf_ieee1905_ap_he_rx_mcs_map_7ss,
&hf_ieee1905_ap_he_rx_mcs_map_8ss,
+ &hf_ieee1905_ap_he_rx_mcs_map_7ss,
+ &hf_ieee1905_ap_he_rx_mcs_map_6ss,
+ &hf_ieee1905_ap_he_rx_mcs_map_5ss,
+ &hf_ieee1905_ap_he_rx_mcs_map_4ss,
+ &hf_ieee1905_ap_he_rx_mcs_map_3ss,
+ &hf_ieee1905_ap_he_rx_mcs_map_2ss,
+ &hf_ieee1905_ap_he_rx_mcs_map_1ss,
NULL
};
static int * const tx_he_mcs_map_headers[] = {
- &hf_ieee1905_ap_he_tx_mcs_map_1ss,
- &hf_ieee1905_ap_he_tx_mcs_map_2ss,
- &hf_ieee1905_ap_he_tx_mcs_map_3ss,
- &hf_ieee1905_ap_he_tx_mcs_map_4ss,
- &hf_ieee1905_ap_he_tx_mcs_map_5ss,
- &hf_ieee1905_ap_he_tx_mcs_map_6ss,
- &hf_ieee1905_ap_he_tx_mcs_map_7ss,
&hf_ieee1905_ap_he_tx_mcs_map_8ss,
+ &hf_ieee1905_ap_he_tx_mcs_map_7ss,
+ &hf_ieee1905_ap_he_tx_mcs_map_6ss,
+ &hf_ieee1905_ap_he_tx_mcs_map_5ss,
+ &hf_ieee1905_ap_he_tx_mcs_map_4ss,
+ &hf_ieee1905_ap_he_tx_mcs_map_3ss,
+ &hf_ieee1905_ap_he_tx_mcs_map_2ss,
+ &hf_ieee1905_ap_he_tx_mcs_map_1ss,
NULL
};
@@ -9589,49 +9589,49 @@ proto_register_ieee1905(void)
{ "Max Tx HE-MCS for 1 SS",
"ieee1905.ap_he_capability.max_tx_he_mcs_1_ss",
FT_UINT16, BASE_DEC, VALS(max_he_mcs_1_ss_vals),
- 0xC000, NULL, HFILL }},
+ 0x0003, NULL, HFILL }},
{ &hf_ieee1905_ap_he_tx_mcs_map_2ss,
{ "Max Tx HE-MCS for 2 SS",
"ieee1905.ap_he_capability.max_tx_he_mcs_2_ss",
FT_UINT16, BASE_DEC, VALS(max_he_mcs_2_ss_vals),
- 0x3000, NULL, HFILL }},
+ 0x000C, NULL, HFILL }},
{ &hf_ieee1905_ap_he_tx_mcs_map_3ss,
{ "Max Tx HE-MCS for 3 SS",
"ieee1905.ap_he_capability.max_tx_he_mcs_3_ss",
FT_UINT16, BASE_DEC, VALS(max_he_mcs_3_ss_vals),
- 0x0C00, NULL, HFILL }},
+ 0x0030, NULL, HFILL }},
{ &hf_ieee1905_ap_he_tx_mcs_map_4ss,
{ "Max Tx HE-MCS for 4 SS",
"ieee1905.ap_he_capability.max_tx_he_mcs_4_ss",
FT_UINT16, BASE_DEC, VALS(max_he_mcs_4_ss_vals),
- 0x0300, NULL, HFILL }},
+ 0x00C0, NULL, HFILL }},
{ &hf_ieee1905_ap_he_tx_mcs_map_5ss,
{ "Max Tx HE-MCS for 5 SS",
"ieee1905.ap_he_capability.max_tx_he_mcs_5_ss",
FT_UINT16, BASE_DEC, VALS(max_he_mcs_5_ss_vals),
- 0x00C0, NULL, HFILL }},
+ 0x0300, NULL, HFILL }},
{ &hf_ieee1905_ap_he_tx_mcs_map_6ss,
{ "Max Tx HE-MCS for 6 SS",
"ieee1905.ap_he_capability.max_tx_he_mcs_6_ss",
FT_UINT16, BASE_DEC, VALS(max_he_mcs_6_ss_vals),
- 0x0030, NULL, HFILL }},
+ 0x0C00, NULL, HFILL }},
{ &hf_ieee1905_ap_he_tx_mcs_map_7ss,
{ "Max Tx HE-MCS for 7 SS",
"ieee1905.ap_he_capability.max_tx_he_mcs_7_ss",
FT_UINT16, BASE_DEC, VALS(max_he_mcs_7_ss_vals),
- 0x000C, NULL, HFILL }},
+ 0x3000, NULL, HFILL }},
{ &hf_ieee1905_ap_he_tx_mcs_map_8ss,
{ "Max Tx HE-MCS for 8 SS",
"ieee1905.ap_he_capability.max_tx_he_mcs_8_ss",
FT_UINT16, BASE_DEC, VALS(max_he_mcs_8_ss_vals),
- 0x0003, NULL, HFILL }},
+ 0xC000, NULL, HFILL }},
{ &hf_ieee1905_ap_he_cap_rx_mcs_le_80_mhz,
{ "Supported Rx HE-MCS <= 80 MHz",
@@ -9642,49 +9642,49 @@ proto_register_ieee1905(void)
{ "Max Rx HE-MCS for 1 SS",
"ieee1905.ap_he_capability.max_rx_he_mcs_1_ss",
FT_UINT16, BASE_DEC, VALS(max_he_mcs_1_ss_vals),
- 0xC000, NULL, HFILL }},
+ 0x0003, NULL, HFILL }},
{ &hf_ieee1905_ap_he_rx_mcs_map_2ss,
{ "Max Rx HE-MCS for 2 SS",
"ieee1905.ap_he_capability.max_rx_he_mcs_2_ss",
FT_UINT16, BASE_DEC, VALS(max_he_mcs_2_ss_vals),
- 0x3000, NULL, HFILL }},
+ 0x000C, NULL, HFILL }},
{ &hf_ieee1905_ap_he_rx_mcs_map_3ss,
{ "Max Rx HE-MCS for 3 SS",
"ieee1905.ap_he_capability.max_rx_he_mcs_3_ss",
FT_UINT16, BASE_DEC, VALS(max_he_mcs_3_ss_vals),
- 0x0C00, NULL, HFILL }},
+ 0x0030, NULL, HFILL }},
{ &hf_ieee1905_ap_he_rx_mcs_map_4ss,
{ "Max Rx HE-MCS for 4 SS",
"ieee1905.ap_he_capability.max_rx_he_mcs_4_ss",
FT_UINT16, BASE_DEC, VALS(max_he_mcs_4_ss_vals),
- 0x0300, NULL, HFILL }},
+ 0x00C0, NULL, HFILL }},
{ &hf_ieee1905_ap_he_rx_mcs_map_5ss,
{ "Max Rx HE-MCS for 5 SS",
"ieee1905.ap_he_capability.max_rx_he_mcs_5_ss",
FT_UINT16, BASE_DEC, VALS(max_he_mcs_5_ss_vals),
- 0x00C0, NULL, HFILL }},
+ 0x0300, NULL, HFILL }},
{ &hf_ieee1905_ap_he_rx_mcs_map_6ss,
{ "Max Rx HE-MCS for 6 SS",
"ieee1905.ap_he_capability.max_rx_he_mcs_6_ss",
FT_UINT16, BASE_DEC, VALS(max_he_mcs_6_ss_vals),
- 0x0030, NULL, HFILL }},
+ 0x0C00, NULL, HFILL }},
{ &hf_ieee1905_ap_he_rx_mcs_map_7ss,
{ "Max Rx HE-MCS for 7 SS",
"ieee1905.ap_he_capability.max_rx_he_mcs_7_ss",
FT_UINT16, BASE_DEC, VALS(max_he_mcs_7_ss_vals),
- 0x000C, NULL, HFILL }},
+ 0x3000, NULL, HFILL }},
{ &hf_ieee1905_ap_he_rx_mcs_map_8ss,
{ "Max Rx HE-MCS for 8 SS",
"ieee1905.ap_he_capability.max_rx_he_mcs_8_ss",
FT_UINT16, BASE_DEC, VALS(max_he_mcs_8_ss_vals),
- 0x0003, NULL, HFILL }},
+ 0xC000, NULL, HFILL }},
{ &hf_ieee1905_ap_he_cap_tx_mcs_160_mhz,
{ "Supported Tx HE-MCS 160 MHz",