aboutsummaryrefslogtreecommitdiffstats
path: root/epan
diff options
context:
space:
mode:
authorPascal Quantin <pascal.quantin@gmail.com>2012-06-23 15:04:13 +0000
committerPascal Quantin <pascal.quantin@gmail.com>2012-06-23 15:04:13 +0000
commit3ceda0e1c4eac3ba4f0910a75fa72b47639d327f (patch)
treebd6cb5583cd9afa68e0e34d6bb9fc38105a21458 /epan
parent472f0365525717b8c4c846791675a41ce2cbc4cf (diff)
Rename two entries to avoid having same filter name for entries with incompatible types
svn path=/trunk/; revision=43449
Diffstat (limited to 'epan')
-rw-r--r--epan/dissectors/packet-ieee17221.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/epan/dissectors/packet-ieee17221.c b/epan/dissectors/packet-ieee17221.c
index 723f37f348..06b73b5c95 100644
--- a/epan/dissectors/packet-ieee17221.c
+++ b/epan/dissectors/packet-ieee17221.c
@@ -4515,7 +4515,7 @@ proto_register_17221(void)
/* SET_CLOCK_SOURCE / GET_CLOCK_SOURCE */
{ &hf_aecp_clock_source_id,
- { "Clock Source ID", "ieee17221.clock_source_id",
+ { "Clock Source ID", "ieee17221.aecp_clock_source_id",
FT_UINT64, BASE_HEX, NULL, 0x00, NULL, HFILL }
},
@@ -5854,7 +5854,7 @@ proto_register_17221(void)
},
/* BEGIN STREAM FORMAT (SF) FIELDS */
{ &hf_aem_stream_format,
- {"Stream Format", "ieee17221.stream_format",
+ {"Stream Format", "ieee17221.aem_stream_format",
FT_NONE, BASE_NONE, NULL, 0x00, NULL, HFILL }
},
{ &hf_aem_sf_version,