aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexis La Goutte <alexis.lagoutte@gmail.com>2018-03-07 08:25:18 +0100
committerAnders Broman <a.broman58@gmail.com>2018-03-07 08:00:15 +0000
commit8a5cd7a5c67cdca5eed91ec6a36ba310772e795f (patch)
tree025cc360dd142d226b00a08e80d93a38eb6762e2
parent99a329891dca9e1e033313aad2a8445e2d5206af (diff)
ieee802154: fix 'wpan.tsch.timeslot' exists multiple times with NOT compatible types: FT_UINT16 and FT_NONE
Change-Id: I36ca5c469281f17e3ed9aebe1899648533a9b1a5 Reviewed-on: https://code.wireshark.org/review/26323 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>
-rw-r--r--epan/dissectors/packet-ieee802154.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/epan/dissectors/packet-ieee802154.c b/epan/dissectors/packet-ieee802154.c
index cb7bdd751e..6f99a19c91 100644
--- a/epan/dissectors/packet-ieee802154.c
+++ b/epan/dissectors/packet-ieee802154.c
@@ -4570,7 +4570,7 @@ void proto_register_ieee802154(void)
NULL, HFILL }},
{ &hf_ieee802154_tsch_slotf_link_timeslot,
- { "Timeslot", "wpan.tsch.timeslot", FT_UINT16, BASE_DEC, NULL, 0x0,
+ { "Timeslot", "wpan.tsch.link_timeslot", FT_UINT16, BASE_DEC, NULL, 0x0,
NULL, HFILL }},
{ &hf_ieee802154_tsch_slotf_link_channel_offset,