Fix some duplicate display filter names.

svn path=/trunk/; revision=40611

1 files changed, 39 insertions, 39 deletions

diff --git a/epan/dissectors/packet-ismp.c b/epan/dissectors/packet-ismp.c
index a6e8475b2a..03fd4747cf 100644
--- a/epan/dissectors/packet-ismp.c
+++ b/epan/dissectors/packet-ismp.c
@@ -619,197 +619,197 @@ proto_register_ismp(void)
 			NULL, HFILL }
 		},
 		{ &hf_ismp_edp_options,
-			{ "Device Options", "ismp.edp.opts",
+			{ "Device Options", "ismp.edp.options",
 			FT_UINT32, BASE_DEC, NULL, 0x0,
 			NULL, HFILL }
 		},
 		{ &hf_ismp_edp_sfs_option_unused1,
-			{ "Unused", "ismp.edp.opts",
+			{ "Unused", "ismp.edp.sfs_option_unused1",
 			FT_BOOLEAN, 32, TFS(&is_set), EDP_SFS_OPTION_UNUSED1,
 			NULL, HFILL }
 		},
 		{ &hf_ismp_edp_sfs_option_sfssup,
-			{ "SFS Support", "ismp.edp.opts",
+			{ "SFS Support", "ismp.edp.sfs_option_sfssup",
 			FT_BOOLEAN, 32, TFS(&is_set), EDP_SFS_OPTION_SFSSUP,
 			NULL, HFILL }
 		},
 		{ &hf_ismp_edp_sfs_option_lsp,
-			{ "LSP Support", "ismp.edp.opts",
+			{ "LSP Support", "ismp.edp.sfs_option_lsp",
 			FT_BOOLEAN, 32, TFS(&is_set), EDP_SFS_OPTION_LSP,
 			NULL, HFILL }
 		},
 		{ &hf_ismp_edp_sfs_option_flood,
-			{ "Flood Path Support", "ismp.edp.opts",
+			{ "Flood Path Support", "ismp.edp.sfs_option_flood",
 			FT_BOOLEAN, 32, TFS(&is_set), EDP_SFS_OPTION_FLOOD,
 			NULL, HFILL }
 		},
 		{ &hf_ismp_edp_sfs_option_resolve,
-			{ "Resolve Support", "ismp.edp.opts",
+			{ "Resolve Support", "ismp.edp.sfs_option_resolve",
 			FT_BOOLEAN, 32, TFS(&is_set), EDP_SFS_OPTION_RESOLVE,
 			NULL, HFILL }
 		},
 		{ &hf_ismp_edp_sfs_option_unused2,
-			{ "Unused", "ismp.edp.opts",
+			{ "Unused", "ismp.edp.sfs_option_unused2",
 			FT_BOOLEAN, 32, TFS(&is_set), EDP_SFS_OPTION_UNUSED2,
 			NULL, HFILL }
 		},
 		{ &hf_ismp_edp_sfs_option_tagflood,
-			{ "Tagged Flood Support", "ismp.edp.opts",
+			{ "Tagged Flood Support", "ismp.edp.sfs_option_tagflood",
 			FT_BOOLEAN, 32, TFS(&is_set), EDP_SFS_OPTION_TAGFLOOD,
 			NULL, HFILL }
 		},
 		{ &hf_ismp_edp_sfs_option_calltap,
-			{ "Call Tap Support", "ismp.edp.opts",
+			{ "Call Tap Support", "ismp.edp.sfs_option_calltap",
 			FT_BOOLEAN, 32, TFS(&is_set), EDP_SFS_OPTION_CALLTAP,
 			NULL, HFILL }
 		},
 		{ &hf_ismp_edp_sfs_option_conmsg,
-			{ "Connection Message Support", "ismp.edp.opts",
+			{ "Connection Message Support", "ismp.edp.sfs_option_conmsg",
 			FT_BOOLEAN, 32, TFS(&is_set), EDP_SFS_OPTION_CONMSG,
 			NULL, HFILL }
 		},
 		{ &hf_ismp_edp_sfs_option_redun,
-			{ "Redundant Access Support", "ismp.edp.opts",
+			{ "Redundant Access Support", "ismp.edp.sfs_option_redun",
 			FT_BOOLEAN, 32, TFS(&is_set), EDP_SFS_OPTION_REDUN,
 			NULL, HFILL }
 		},
 		{ &hf_ismp_edp_sfs_option_isolated,
-			{ "Isolated Switch", "ismp.edp.opts",
+			{ "Isolated Switch", "ismp.edp.sfs_option_isolated",
 			FT_BOOLEAN, 32, TFS(&is_set), EDP_SFS_OPTION_ISOLATED,
 			NULL, HFILL }
 		},
 		{ &hf_ismp_edp_sfs_option_uplink_switch,
-			{ "Uplink Switch", "ismp.edp.opts",
+			{ "Uplink Switch", "ismp.edp.sfs_option_uplink_switch",
 			FT_BOOLEAN, 32, TFS(&is_set), EDP_SFS_OPTION_UPLINK_SWITCH,
 			NULL, HFILL }
 		},
 		{ &hf_ismp_edp_sfs_option_uplink_core,
-			{ "Uplink Core", "ismp.edp.opts",
+			{ "Uplink Core", "ismp.edp.sfs_option_uplink_core",
 			FT_BOOLEAN, 32, TFS(&is_set), EDP_SFS_OPTION_UPLINK_CORE,
 			NULL, HFILL }
 		},
 		{ &hf_ismp_edp_sfs_option_uplink_port,
-			{ "Uplink Port", "ismp.edp.opts",
+			{ "Uplink Port", "ismp.edp.sfs_option_uplink_port",
 			FT_BOOLEAN, 32, TFS(&is_set), EDP_SFS_OPTION_UPLINK_PORT,
 			NULL, HFILL }
 		},
 		{ &hf_ismp_edp_sfs_option_uplink_flood,
-			{ "Uplink Flood Support", "ismp.edp.opts",
+			{ "Uplink Flood Support", "ismp.edp.sfs_option_uplink_flood",
 			FT_BOOLEAN, 32, TFS(&is_set), EDP_SFS_OPTION_UPLINK_FLOOD,
 			NULL, HFILL }
 		},
 		{ &hf_ismp_edp_rtr_option_ssr,
-			{ "SSR Type Device", "ismp.edp.opts",
+			{ "SSR Type Device", "ismp.edp.rtr_option_ssr",
 			FT_BOOLEAN, 32, TFS(&is_set), EDP_RTR_OPTION_SSR,
 			NULL, HFILL }
 		},
 		{ &hf_ismp_edp_rtr_option_igmp,
-			{ "IGMP Active", "ismp.edp.opts",
+			{ "IGMP Active", "ismp.edp.rtr_option_igmp",
 			FT_BOOLEAN, 32, TFS(&is_set), EDP_RTR_OPTION_IGMP,
 			NULL, HFILL }
 		},
 		{ &hf_ismp_edp_rtr_option_rip,
-			{ "RIP Active", "ismp.edp.opts",
+			{ "RIP Active", "ismp.edp.rtr_option_rip",
 			FT_BOOLEAN, 32, TFS(&is_set), EDP_RTR_OPTION_RIP,
 			NULL, HFILL }
 		},
 		{ &hf_ismp_edp_rtr_option_bgp,
-			{ "BGP Active", "ismp.edp.opts",
+			{ "BGP Active", "ismp.edp.rtr_option_bgp",
 			FT_BOOLEAN, 32, TFS(&is_set), EDP_RTR_OPTION_BGP,
 			NULL, HFILL }
 		},
 		{ &hf_ismp_edp_rtr_option_ospf,
-			{ "OSPF Active", "ismp.edp.opts",
+			{ "OSPF Active", "ismp.edp.rtr_option_ospf",
 			FT_BOOLEAN, 32, TFS(&is_set), EDP_RTR_OPTION_OSPF,
 			NULL, HFILL }
 		},
 		{ &hf_ismp_edp_rtr_option_dvmrp,
-			{ "DVMRP Active", "ismp.edp.opts",
+			{ "DVMRP Active", "ismp.edp.rtr_option_dvmrp",
 			FT_BOOLEAN, 32, TFS(&is_set), EDP_RTR_OPTION_DVMRP,
 			NULL, HFILL }
 		},
 		{ &hf_ismp_edp_rtr_option_8021q,
-			{ "802.1Q Support", "ismp.edp.opts",
+			{ "802.1Q Support", "ismp.edp.rtr_option_8021q",
 			FT_BOOLEAN, 32, TFS(&is_set), EDP_RTR_OPTION_8021Q,
 			NULL, HFILL }
 		},
 		{ &hf_ismp_edp_rtr_option_gvrp,
-			{ "GVRP Support", "ismp.edp.opts",
+			{ "GVRP Support", "ismp.edp.rtr_option_gvrp",
 			FT_BOOLEAN, 32, TFS(&is_set), EDP_RTR_OPTION_GVRP,
 			NULL, HFILL }
 		},
 		{ &hf_ismp_edp_rtr_option_gmrp,
-			{ "GMRP Support", "ismp.edp.opts",
+			{ "GMRP Support", "ismp.edp.rtr_option_gmrp",
 			FT_BOOLEAN, 32, TFS(&is_set), EDP_RTR_OPTION_GMRP,
 			NULL, HFILL }
 		},
 		{ &hf_ismp_edp_rtr_option_igmp_snoop,
-			{ "IGMP Snooping Support", "ismp.edp.opts",
+			{ "IGMP Snooping Support", "ismp.edp.rtr_option_igmp_snoop",
 			FT_BOOLEAN, 32, TFS(&is_set), EDP_RTR_OPTION_IGMP_SNOOP,
 			NULL, HFILL }
 		},
 		{ &hf_ismp_edp_rtr_option_route,
-			{ "Route Bridging", "ismp.edp.opts",
+			{ "Route Bridging", "ismp.edp.rtr_option_route",
 			FT_BOOLEAN, 32, TFS(&is_set), EDP_RTR_OPTION_ROUTE,
 			NULL, HFILL }
 		},
 		{ &hf_ismp_edp_rtr_option_trans,
-			{ "Transparent Bridging", "ismp.edp.opts",
+			{ "Transparent Bridging", "ismp.edp.rtr_option_trans",
 			FT_BOOLEAN, 32, TFS(&is_set), EDP_RTR_OPTION_TRANS,
 			NULL, HFILL }
 		},
 		{ &hf_ismp_edp_rtr_option_level1,
-			{ "Level 1 Functionality", "ismp.edp.opts",
+			{ "Level 1 Functionality", "ismp.edp.rtr_option_level1",
 			FT_BOOLEAN, 32, TFS(&is_set), EDP_RTR_OPTION_LEVEL1,
 			NULL, HFILL }
 		},
 		{ &hf_ismp_edp_switch_option_8021q,
-			{ "802.1Q Support", "ismp.edp.opts",
+			{ "802.1Q Support", "ismp.edp.switch_option_8021q",
 			FT_BOOLEAN, 32, TFS(&is_set), EDP_SWITCH_OPTION_8021Q,
 			NULL, HFILL }
 		},
 		{ &hf_ismp_edp_switch_option_gvrp,
-			{ "GVRP Support", "ismp.edp.opts",
+			{ "GVRP Support", "ismp.edp.switch_option_gvrp",
 			FT_BOOLEAN, 32, TFS(&is_set), EDP_SWITCH_OPTION_GVRP,
 			NULL, HFILL }
 		},
 		{ &hf_ismp_edp_switch_option_gmrp,
-			{ "GMRP Support", "ismp.edp.opts",
+			{ "GMRP Support", "ismp.edp.switch_option_gmrp",
 			FT_BOOLEAN, 32, TFS(&is_set), EDP_SWITCH_OPTION_GMRP,
 			NULL, HFILL }
 		},
 		{ &hf_ismp_edp_switch_option_igmp,
-			{ "IGMP Snooping Support", "ismp.edp.opts",
+			{ "IGMP Snooping Support", "ismp.edp.switch_option_igmp",
 			FT_BOOLEAN, 32, TFS(&is_set), EDP_SWITCH_OPTION_IGMP,
 			NULL, HFILL }
 		},
 		{ &hf_ismp_edp_switch_option_route,
-			{ "Route Bridging", "ismp.edp.opts",
+			{ "Route Bridging", "ismp.edp.switch_option_route",
 			FT_BOOLEAN, 32, TFS(&is_set), EDP_SWITCH_OPTION_ROUTE,
 			NULL, HFILL }
 		},
 		{ &hf_ismp_edp_switch_option_trans,
-			{ "Transparent Bridging", "ismp.edp.opts",
+			{ "Transparent Bridging", "ismp.edp.switch_option_trans",
 			FT_BOOLEAN, 32, TFS(&is_set), EDP_SWITCH_OPTION_TRANS,
 			NULL, HFILL }
 		},
 		{ &hf_ismp_edp_switch_option_level1,
-			{ "Level 1 Functionality", "ismp.edp.opts",
+			{ "Level 1 Functionality", "ismp.edp.switch_option_level1",
 			FT_BOOLEAN, 32, TFS(&is_set), EDP_SWITCH_OPTION_LEVEL1,
 			NULL, HFILL }
 		},
 		{ &hf_ismp_edp_end_station_option_dhcp,
-			{ "DHCP Enabled", "ismp.edp.opts",
+			{ "DHCP Enabled", "ismp.edp.end_station_option_dhcp",
 			FT_BOOLEAN, 32, TFS(&is_set), EDP_END_STATION_OPTION_DHCP,
 			NULL, HFILL }
 		},
 		{ &hf_ismp_edp_end_station_option_dns,
-			{ "DNS Enabled", "ismp.edp.opts",
+			{ "DNS Enabled", "ismp.edp.end_station_option_dns",
 			FT_BOOLEAN, 32, TFS(&is_set), EDP_END_STATION_OPTION_DNS,
 			NULL, HFILL }
 		},
 		{ &hf_ismp_edp_end_station_option_ad,
-			{ "Active Directory Enabled", "ismp.edp.opts",
+			{ "Active Directory Enabled", "ismp.edp.end_station_option_ad",
 			FT_BOOLEAN, 32, TFS(&is_set), EDP_END_STATION_OPTION_AD,
 			NULL, HFILL }
 		},