netlink: fix conflict

'netlink-route.ifa_address' exists multiple times with NOT compatible types: FT_IPv4 and FT_IPv6

Change-Id: I3ba350cfc479a7733d48bc07b4102c8220126247
Reviewed-on: https://code.wireshark.org/review/28841
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
Reviewed-by: Anders Broman <a.broman58@gmail.com>

diff --git a/epan/dissectors/packet-netlink-route.c b/epan/dissectors/packet-netlink-route.c
index 1f2ba5afbd004b42c86b3e65b1b465ec26b1efdb..ffb757b63eba3ce4ea9e902aa70ff9f251183ba9 100644 (file)
--- a/epan/dissectors/packet-netlink-route.c
+++ b/epan/dissectors/packet-netlink-route.c
@@ -928,11 +928,11 @@ static header_field_info hfi_netlink_route_ifa_flags32 NETLINK_ROUTE_HFI_INIT =
          CF_FUNC(hfi_netlink_route_ifa_flags_label), 0x00, NULL, HFILL };
 
 static header_field_info hfi_netlink_route_ifa_addr6 NETLINK_ROUTE_HFI_INIT =
-       { "Address", "netlink-route.ifa_address", FT_IPv6, BASE_NONE,
+       { "Address", "netlink-route.ifa_address.ipv6", FT_IPv6, BASE_NONE,
          NULL, 0x00, NULL, HFILL };
 
 static header_field_info hfi_netlink_route_ifa_addr4 NETLINK_ROUTE_HFI_INIT =
-       { "Address", "netlink-route.ifa_address", FT_IPv4, BASE_NONE,
+       { "Address", "netlink-route.ifa_address.ipv4", FT_IPv4, BASE_NONE,
          NULL, 0x00, NULL, HFILL };
 
 static int