aboutsummaryrefslogtreecommitdiffstats
path: root/epan/dissectors/packet-gsm_map.c
diff options
context:
space:
mode:
authorPascal Quantin <pascal.quantin@gmail.com>2012-08-20 09:28:01 +0000
committerPascal Quantin <pascal.quantin@gmail.com>2012-08-20 09:28:01 +0000
commit45a25dbf9e29f45b32f2757cfa0b316a70580d8f (patch)
tree75965bde1cd6f9dc5de6bb9bf16d0e7bfe1cadde /epan/dissectors/packet-gsm_map.c
parent2f9b5d31e485af4ac0afd63fe0176c0114defe35 (diff)
Avoid defining 2 entries with incompatible types (FT_BYTES vs FT_NONE) and same filter
svn path=/trunk/; revision=44595
Diffstat (limited to 'epan/dissectors/packet-gsm_map.c')
-rw-r--r--epan/dissectors/packet-gsm_map.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/epan/dissectors/packet-gsm_map.c b/epan/dissectors/packet-gsm_map.c
index 78650712be..7bacbe6dc8 100644
--- a/epan/dissectors/packet-gsm_map.c
+++ b/epan/dissectors/packet-gsm_map.c
@@ -22990,7 +22990,7 @@ void proto_register_gsm_map(void) {
FT_UINT32, BASE_DEC, VALS(gsm_map_ms_DomainType_vals), 0,
"DomainType", HFILL }},
{ &hf_gsm_map_ms_imei_01,
- { "imei", "gsm_map.ms.imei",
+ { "imei", "gsm_map.ms.imei_null",
FT_NONE, BASE_NONE, NULL, 0,
NULL, HFILL }},
{ &hf_gsm_map_ms_ms_classmark,