diff options
| author | Alexis La Goutte <alexis.lagoutte@gmail.com> | 2023-02-17 19:06:18 +0000 |
|---|---|---|
| committer | John Thacker <johnthacker@gmail.com> | 2023-02-17 19:06:18 +0000 |
| commit | 144de50d41dc5f2d0d584bd3994ae5465e8484f9 (patch) | |
| tree | 41e301e6efe08ce33dc720e47a141dd4254924b4 /plugins/epan | |
| parent | 6cdd4ca71ab47840f6c50a32d9776f21ee02109e (diff) | |
profinet: fix conflict
Diffstat (limited to 'plugins/epan')
| -rw-r--r-- | plugins/epan/profinet/packet-pn-rsi.c | 2 | ||||
| -rw-r--r-- | plugins/epan/profinet/packet-pn-rtc-one.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/plugins/epan/profinet/packet-pn-rsi.c b/plugins/epan/profinet/packet-pn-rsi.c index d3183d8ffa..94d61a8b11 100644 --- a/plugins/epan/profinet/packet-pn-rsi.c +++ b/plugins/epan/profinet/packet-pn-rsi.c @@ -1070,7 +1070,7 @@ init_pn_rsi(int proto) }; static ei_register_info ei[] = { - { &ei_pn_rsi_error, { "pn_rsi.ack_seq_num", PI_UNDECODED, PI_NOTE, "Block version not implemented yet!", EXPFILL } } + { &ei_pn_rsi_error, { "pn_rsi.error", PI_UNDECODED, PI_NOTE, "Block version not implemented yet!", EXPFILL } } }; diff --git a/plugins/epan/profinet/packet-pn-rtc-one.c b/plugins/epan/profinet/packet-pn-rtc-one.c index d3e88b549a..4581976cad 100644 --- a/plugins/epan/profinet/packet-pn-rtc-one.c +++ b/plugins/epan/profinet/packet-pn-rtc-one.c @@ -1315,7 +1315,7 @@ init_pn_io_rtc1(int proto) NULL, HFILL } }, { &hf_pn_pa_profile_value_float, - { "Value", "pn_io.pa.value", + { "Value", "pn_io.pa.value.float", FT_FLOAT, BASE_NONE, NULL, 0x0, NULL, HFILL } }, |