aboutsummaryrefslogtreecommitdiffstats
path: root/epan/dissectors
diff options
context:
space:
mode:
authorAlexis La Goutte <alexis.lagoutte@gmail.com>2016-02-27 18:35:15 +0100
committerMichael Mann <mmann78@netscape.net>2016-02-27 18:42:22 +0000
commitbebe51e2c59e4aa331349d88a42f5e19cd4b5cd5 (patch)
tree69596a7461a980d1f6651db352ccb38b7d6ba7f5 /epan/dissectors
parent2eadb734bfc476a6d0207ed3ef25747cbb980ad9 (diff)
ZEP: fix 'zep.seqno' exists multiple times with NOT compatible types: FT_STRING and FT_UINT8
Change-Id: I8d39436efaa5b561a95b08b5849b200a51e3c981 Reviewed-on: https://code.wireshark.org/review/14204 Reviewed-by: Michael Mann <mmann78@netscape.net>
Diffstat (limited to 'epan/dissectors')
-rw-r--r--epan/dissectors/packet-zep.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/epan/dissectors/packet-zep.c b/epan/dissectors/packet-zep.c
index 9e334a8164..de6024d7e8 100644
--- a/epan/dissectors/packet-zep.c
+++ b/epan/dissectors/packet-zep.c
@@ -292,7 +292,7 @@ void proto_register_zep(void)
"The length (in bytes) of the encapsulated IEEE 802.15.4 MAC frame.", HFILL }},
{ &hf_zep_protocol_id,
- { "Protocol ID String", "zep.seqno", FT_STRING, BASE_NONE, NULL, 0x0,
+ { "Protocol ID String", "zep.protocol_id", FT_STRING, BASE_NONE, NULL, 0x0,
NULL, HFILL }},
{ &hf_zep_reserved_field,