osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

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 <alexis.lagoutte@gmail.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
This commit is contained in:
Alexis La Goutte 2016-03-09 08:46:22 +01:00 committed by Anders Broman
parent 4c6a18688e
commit f82c46c795
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
epan/dissectors/packet-trmac.c
View File

@ -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,