aboutsummaryrefslogtreecommitdiffstats
path: root/epan
diff options
context:
space:
mode:
authorAlexis La Goutte <alexis.lagoutte@gmail.com>2016-11-20 12:20:12 +0100
committerMichael Mann <mmann78@netscape.net>2016-11-20 13:34:34 +0000
commit08e5d9ad7d82f6349aee3d13ad6d11e0a1f42d5e (patch)
treeb57a5ff59afc39e0d953e1a4de587abf4cc23ebf /epan
parentded081ccecfbba91cacabba70d69a7eb36a5288d (diff)
radiotap: Fix conflict for hf fields
'radiotap.present.flags' exists multiple times with NOT compatible types: FT_BOOLEAN and FT_UINT32 Change-Id: Ib53eb43c2103b24bd02bd41fd20030b7e7ae321b Reviewed-on: https://code.wireshark.org/review/18886 Reviewed-by: Michael Mann <mmann78@netscape.net>
Diffstat (limited to 'epan')
-rw-r--r--epan/dissectors/packet-ieee80211-radiotap.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/epan/dissectors/packet-ieee80211-radiotap.c b/epan/dissectors/packet-ieee80211-radiotap.c
index a7b5ce4a8f..8131a71257 100644
--- a/epan/dissectors/packet-ieee80211-radiotap.c
+++ b/epan/dissectors/packet-ieee80211-radiotap.c
@@ -1927,7 +1927,7 @@ void proto_register_radiotap(void)
"Bitmask indicating which fields are present", HFILL}},
{&hf_radiotap_present_word,
- {"Present flags word", "radiotap.present.flags",
+ {"Present flags word", "radiotap.present.word",
FT_UINT32, BASE_HEX, NULL, 0x0,
"Word from present flags bitmask", HFILL}},