aboutsummaryrefslogtreecommitdiffstats
path: root/epan
diff options
context:
space:
mode:
authorAlexis La Goutte <alexis.lagoutte@gmail.com>2016-02-27 18:50:17 +0100
committerMichael Mann <mmann78@netscape.net>2016-02-27 17:53:41 +0000
commit2b5fe74c5d81c7b87819f5682aed5471af001d2b (patch)
treeb6d38eb64094e569b35566e9c7246c58d360ee9b /epan
parentdbe1d13ea4347f148e22b9450687e9c22a3cfd39 (diff)
Zbee (Security): fix 'zbee.sec.key' exists multiple times with NOT compatible types: FT_BYTES and FT_UINT8
Change-Id: If6f61c973baf02abda640553febab91b8f4f5fe6 Reviewed-on: https://code.wireshark.org/review/14206 Reviewed-by: Michael Mann <mmann78@netscape.net>
Diffstat (limited to 'epan')
-rw-r--r--epan/dissectors/packet-zbee-security.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/epan/dissectors/packet-zbee-security.c b/epan/dissectors/packet-zbee-security.c
index 590badb971..ff92c4fcd2 100644
--- a/epan/dissectors/packet-zbee-security.c
+++ b/epan/dissectors/packet-zbee-security.c
@@ -241,7 +241,7 @@ void zbee_security_register(module_t *zbee_prefs, int proto)
0x0, NULL, HFILL }},
{ &hf_zbee_sec_key_id,
- { "Key Id", "zbee.sec.key", FT_UINT8, BASE_HEX, VALS(zbee_sec_key_names),
+ { "Key Id", "zbee.sec.key_id", FT_UINT8, BASE_HEX, VALS(zbee_sec_key_names),
ZBEE_SEC_CONTROL_KEY, NULL, HFILL }},
{ &hf_zbee_sec_nonce,