From 2b5fe74c5d81c7b87819f5682aed5471af001d2b Mon Sep 17 00:00:00 2001 From: Alexis La Goutte Date: Sat, 27 Feb 2016 18:50:17 +0100 Subject: 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 --- epan/dissectors/packet-zbee-security.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'epan') 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, -- cgit v1.2.3