From f82c46c795419052208a2480f5625bd560e493e2 Mon Sep 17 00:00:00 2001 From: Alexis La Goutte Date: Wed, 9 Mar 2016 08:46:22 +0100 Subject: [PATCH] trmac: fix 'trmac.group_address' exists multiple times with NOT compatible types: FT_ETHER and FT_UINT32 Change-Id: I5289022752513e84783a8c65ab8f2327a7023597 Reviewed-on: https://code.wireshark.org/review/14414 Petri-Dish: Alexis La Goutte Reviewed-by: Anders Broman --- epan/dissectors/packet-trmac.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/epan/dissectors/packet-trmac.c b/epan/dissectors/packet-trmac.c index 4e613630c9..2b44ee97c5 100644 --- a/epan/dissectors/packet-trmac.c +++ b/epan/dissectors/packet-trmac.c @@ -647,11 +647,11 @@ proto_register_trmac(void) NULL, HFILL }}, { &hf_trmac_group_address32, - { "Group Address", "trmac.group_address", FT_UINT32, BASE_HEX, NULL, 0x0, + { "Group Address", "trmac.group_addres32s", FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL }}, { &hf_trmac_group_address_ether, - { "Group Address", "trmac.group_address", FT_ETHER, BASE_NONE, NULL, 0x0, + { "Group Address", "trmac.group_address_ether", FT_ETHER, BASE_NONE, NULL, 0x0, NULL, HFILL }}, { &hf_trmac_functional_addresses,