Fix some duplicate display filter names.

svn path=/trunk/; revision=40669

6 files changed, 15 insertions, 15 deletions

diff --git a/epan/dissectors/packet-reload.c b/epan/dissectors/packet-reload.c
index e38d9f6e04..71f6e79dd8 100644
--- a/epan/dissectors/packet-reload.c
+++ b/epan/dissectors/packet-reload.c
@@ -4490,7 +4490,7 @@ proto_register_reload(void)
       }
     },
     { &hf_reload_forwarding_options,
-      { "options",    "reload.forwarding.option", FT_NONE,
+      { "options",    "reload.forwarding.options", FT_NONE,
         BASE_NONE,  NULL,   0x0,  NULL, HFILL
       }
     },
@@ -4510,7 +4510,7 @@ proto_register_reload(void)
       }
     },
     { &hf_reload_forwarding_option_flag_ignore_state_keeping,
-      { "IGNORE_STATE_KEEPING", "reload.forwarding.option.flag.response_copy", FT_BOOLEAN, 8, TFS(&tfs_set_notset), 0x0,
+      { "IGNORE_STATE_KEEPING", "reload.forwarding.option.flag.ignore_state_keeping", FT_BOOLEAN, 8, TFS(&tfs_set_notset), 0x0,
         NULL, HFILL
       }
     },
@@ -4855,7 +4855,7 @@ proto_register_reload(void)
       }
     },
     { &hf_reload_probe_information_data,
-      { "value (ProbeInformationData)",  "reload.probe_information", FT_NONE,
+      { "value (ProbeInformationData)",  "reload.probe_information_data", FT_NONE,
         BASE_NONE,  NULL, 0x0,  NULL, HFILL
       }
     },
@@ -4885,7 +4885,7 @@ proto_register_reload(void)
       }
     },
     { &hf_reload_probeans_probe_info,
-      { "probe_info",  "reload.probeans", FT_NONE,
+      { "probe_info",  "reload.probe_info", FT_NONE,
         BASE_NONE,  NULL, 0x0,  NULL, HFILL
       }
     },
@@ -5218,17 +5218,17 @@ proto_register_reload(void)
       }
     },
     { &hf_reload_kinddescription,
-      { "KindDescription",  "reload.configupdatereq.kinds",  FT_NONE,
+      { "KindDescription",  "reload.configupdatereq.kinddescription",  FT_NONE,
         BASE_NONE,  NULL, 0x0,  NULL, HFILL
       }
     },
     { &hf_reload_pingreq,
-      { "PingReq",  "reload.padding",  FT_NONE,
+      { "PingReq",  "reload.pingreq",  FT_NONE,
         BASE_NONE,  NULL, 0x0,  NULL, HFILL
       }
     },
     { &hf_reload_pingans,
-      { "PingAns",  "reload.padding",  FT_NONE,
+      { "PingAns",  "reload.pingans",  FT_NONE,
         BASE_NONE,  NULL, 0x0,  NULL, HFILL
       }
     },
@@ -5254,7 +5254,7 @@ proto_register_reload(void)
       }
     },
     { &hf_reload_chordupdate_successors,
-      { "successors",  "reload.chordupdate.predecessors",  FT_NONE,
+      { "successors",  "reload.chordupdate.successors",  FT_NONE,
         BASE_NONE,  NULL, 0x0,  NULL, HFILL
       }
     },
@@ -5289,7 +5289,7 @@ proto_register_reload(void)
       }
     },
     { &hf_reload_chordleave_successors,
-      { "successors",  "reload.chordleavedata.predecessors",  FT_NONE,
+      { "successors",  "reload.chordleavedata.successors",  FT_NONE,
         BASE_NONE,  NULL, 0x0,  NULL, HFILL
       }
     },
diff --git a/epan/dissectors/packet-rtmpt.c b/epan/dissectors/packet-rtmpt.c
index d056c5804c..16fa656b9a 100644
--- a/epan/dissectors/packet-rtmpt.c
+++ b/epan/dissectors/packet-rtmpt.c
@@ -1931,7 +1931,7 @@ proto_register_rtmpt(void)
                     NULL, 0x0, "RTMPT SCM acknowledgement sequence number", HFILL }},
 
                 { &hf_rtmpt_scm_was,
-                  { "Window acknowledgement size", "rtmpt.scm.seq", FT_UINT32, BASE_DEC,
+                  { "Window acknowledgement size", "rtmpt.scm.was", FT_UINT32, BASE_DEC,
                     NULL, 0x0, "RTMPT SCM window acknowledgement size", HFILL }},
 
                 { &hf_rtmpt_scm_limittype,
@@ -1957,7 +1957,7 @@ proto_register_rtmpt(void)
                     NULL, 0x0, "RTMPT AMF boolean", HFILL }},
 
                 { &hf_rtmpt_amf_stringlength,
-                  { "String length", "rtmpt.amf.longstringlength", FT_UINT16, BASE_DEC,
+                  { "String length", "rtmpt.amf.stringlength", FT_UINT16, BASE_DEC,
                     NULL, 0x0, "RTMPT AMF string length", HFILL }},
 
                 { &hf_rtmpt_amf_string,
diff --git a/epan/dissectors/packet-sbus.c b/epan/dissectors/packet-sbus.c
index 36e565bf6c..dd3cf44926 100644
--- a/epan/dissectors/packet-sbus.c
+++ b/epan/dissectors/packet-sbus.c
@@ -2005,7 +2005,7 @@ proto_register_sbus(void)
               },
 
               { &hf_sbus_addr_68k,
-                     { "Base address of bytes",           "sbus.addr_prog",
+                     { "Base address of bytes",           "sbus.addr_68k",
                      FT_UINT24, BASE_HEX, NULL, 0,
                      "Base address of bytes to read or write (68k address)", HFILL }
               },
diff --git a/epan/dissectors/packet-sgsap.c b/epan/dissectors/packet-sgsap.c
index 86554c4960..b8d8811352 100644
--- a/epan/dissectors/packet-sgsap.c
+++ b/epan/dissectors/packet-sgsap.c
@@ -1505,7 +1505,7 @@ void proto_register_sgsap(void) {
         NULL, HFILL}
     },
     { &hf_sgsap_vlr_name,
-        {"VLR name", "sgsap.mme_name",
+        {"VLR name", "sgsap.vlr_name",
         FT_STRING, BASE_NONE, NULL, 0x0,
         NULL, HFILL}
     },
diff --git a/epan/dissectors/packet-smb2.c b/epan/dissectors/packet-smb2.c
index 12b142a8fe..2637f1a7a5 100644
--- a/epan/dissectors/packet-smb2.c
+++ b/epan/dissectors/packet-smb2.c
@@ -6586,7 +6586,7 @@ proto_register_smb2(void)
 		NULL, 0, "Find pattern", HFILL }},
 
 	{ &hf_smb2_find_info_blob,
-		{ "Info", "smb2.security_blob", FT_BYTES, BASE_NONE,
+		{ "Info", "smb2.find.info_blob", FT_BYTES, BASE_NONE,
 		NULL, 0, "Find Info", HFILL }},
 
 	{ &hf_smb2_ea_size,
diff --git a/epan/dissectors/packet-smpp.c b/epan/dissectors/packet-smpp.c
index 2790fe4ab5..aec19d2f83 100644
--- a/epan/dissectors/packet-smpp.c
+++ b/epan/dissectors/packet-smpp.c
@@ -3564,7 +3564,7 @@ proto_register_smpp(void)
                 }
         },
         {       &hf_smpp_broadcast_content_type_info,
-                {       "Broadcast Content Type Info", "smpp.broadcast_content_type.type",
+                {       "Broadcast Content Type Info", "smpp.broadcast_content_type.info",
                         FT_BYTES, BASE_NONE, NULL, 0x00,
                         "Cell Broadcast content type Info", HFILL
                 }