diff options
| author | Guy Harris <guy@alum.mit.edu> | 2018-03-25 18:19:00 -0700 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2018-03-26 01:19:35 +0000 |
| commit | 5da6842732dc58eaa05ba3341ee343b06b0d4f92 (patch) | |
| tree | ef829269c19d04ccb04a815dc704aa47ebeeaf85 | |
| parent | 494508f2d02d8380c4060354fa06de6a3de417f4 (diff) | |
Fix more FT_UINT64s with value_strings.
Bug: 14565
Change-Id: I6cdd160f91637a8bed8c9b959d324ced65e5bea6
Reviewed-on: https://code.wireshark.org/review/26644
Reviewed-by: Guy Harris <guy@alum.mit.edu>
| -rw-r--r-- | epan/dissectors/packet-ieee80211.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/epan/dissectors/packet-ieee80211.c b/epan/dissectors/packet-ieee80211.c index 2033364e2d..8fbb77324a 100644 --- a/epan/dissectors/packet-ieee80211.c +++ b/epan/dissectors/packet-ieee80211.c @@ -19825,7 +19825,7 @@ static const val64_string trigger_type_vals[] = { { 0, NULL } }; -static const value_string bw_subfield_vals[] = { +static const val64_string bw_subfield_vals[] = { { 0, "20 MHz" }, { 1, "40 MHz" }, { 2, "80 MHz" }, @@ -19833,7 +19833,7 @@ static const value_string bw_subfield_vals[] = { { 0, NULL } }; -static const value_string gi_and_ltf_type_subfield_vals[] = { +static const val64_string gi_and_ltf_type_subfield_vals[] = { { 0, "1x LTF + 1.6 us GI" }, { 1, "2x LTF + 1.6 us GI" }, { 2, "4x LTF + 3.2 us GI" }, @@ -30326,11 +30326,11 @@ proto_register_ieee80211(void) {&hf_ieee80211_he_trigger_bw, {"BW", "wlan.trigger.he.bw", - FT_UINT64, BASE_DEC, VALS(bw_subfield_vals), 0x00000000000C0000, NULL, HFILL }}, + FT_UINT64, BASE_DEC|BASE_VAL64_STRING, VALS64(bw_subfield_vals), 0x00000000000C0000, NULL, HFILL }}, {&hf_ieee80211_he_trigger_gi_and_ltf_type, {"GI And LTF Type", "wlan.trigger.he.gi_and_ltf_type", - FT_UINT64, BASE_DEC, VALS(gi_and_ltf_type_subfield_vals), 0x0000000000300000, + FT_UINT64, BASE_DEC|BASE_VAL64_STRING, VALS64(gi_and_ltf_type_subfield_vals), 0x0000000000300000, NULL, HFILL }}, {&hf_ieee80211_he_trigger_mu_mimo_ltf_mode, |