summaryrefslogtreecommitdiff
path: root/plugins/irda
diff options
context:
space:
mode:
authorAlexis La Goutte <alexis.lagoutte@gmail.com>2016-02-27 18:31:40 +0100
committerMichael Mann <mmann78@netscape.net>2016-02-27 18:45:10 +0000
commit9ef7b92193e4cb4e49028522f4ce5d9983d94954 (patch)
tree2aa48e6553faebfb8f1bea1db55e0357fb59cb7b /plugins/irda
parentbebe51e2c59e4aa331349d88a42f5e19cd4b5cd5 (diff)
downloadwireshark-9ef7b92193e4cb4e49028522f4ce5d9983d94954.tar.gz
irda: fix 'irlmp.xid.name' exists multiple times with NOT compatible types: FT_BYTES and FT_STRING
Change-Id: I93215bd126dab1e7b6207f8510c7ce9b116637a3 Reviewed-on: https://code.wireshark.org/review/14203 Reviewed-by: Michael Mann <mmann78@netscape.net>
Diffstat (limited to 'plugins/irda')
-rw-r--r--plugins/irda/packet-irda.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/plugins/irda/packet-irda.c b/plugins/irda/packet-irda.c
index 7975d1cbec..12da57a165 100644
--- a/plugins/irda/packet-irda.c
+++ b/plugins/irda/packet-irda.c
@@ -2009,7 +2009,7 @@ void proto_register_irda(void)
FT_STRING, BASE_NONE, NULL, 0,
NULL, HFILL }},
{ &hf_lmp_xid_name_no_ascii,
- { "Device Nickname (unsupported character set)", "irlmp.xid.name",
+ { "Device Nickname (unsupported character set)", "irlmp.xid.name.no_ascii",
FT_BYTES, BASE_NONE, NULL, 0,
NULL, HFILL }},
{ &hf_lmp_dst,