From 91613a04db4d6381df06b582b4375609f6613f0c Mon Sep 17 00:00:00 2001 From: Alexis La Goutte Date: Wed, 3 Feb 2016 07:36:57 +0100 Subject: pcapng (dissector): fix 'pcapng.options.option.data.ipv4' exists multiple times with NOT compatible types: FT_IPv6 and FT_IPv4 Change-Id: I9f6e713a50e0c73d0ecc7a66b62dffe270d4a35f Reviewed-on: https://code.wireshark.org/review/13678 Reviewed-by: Anders Broman --- epan/dissectors/file-pcapng.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'epan/dissectors/file-pcapng.c') diff --git a/epan/dissectors/file-pcapng.c b/epan/dissectors/file-pcapng.c index c56110efcd..133b3c6330 100644 --- a/epan/dissectors/file-pcapng.c +++ b/epan/dissectors/file-pcapng.c @@ -1480,7 +1480,7 @@ proto_register_pcapng(void) NULL, HFILL } }, { &hf_pcapng_option_data_ipv6, - { "IPv6", "pcapng.options.option.data.ipv4", + { "IPv6", "pcapng.options.option.data.ipv6", FT_IPv6, BASE_NONE, NULL, 0x00, NULL, HFILL } }, -- cgit v1.2.1