diff options
author | Jakub Zawadzki <darkjames-ws@darkjames.pl> | 2013-07-21 23:26:07 +0000 |
---|---|---|
committer | Jakub Zawadzki <darkjames-ws@darkjames.pl> | 2013-07-21 23:26:07 +0000 |
commit | 1a1360c2e152ffa764b8ceb4779c78fc8b0bbc1c (patch) | |
tree | 75ea9eea0e5646560bef491458b021ef5845c541 /plugins | |
parent | e7d733b31b253942c5e832032772a79c257045ff (diff) |
Update plugins/ with recent change.
svn path=/trunk/; revision=50774
Diffstat (limited to 'plugins')
-rw-r--r-- | plugins/ethercat/packet-esl.c | 1 | ||||
-rw-r--r-- | plugins/mate/mate_runtime.c | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/plugins/ethercat/packet-esl.c b/plugins/ethercat/packet-esl.c index 34e6dfdfd8..0e48bf5f27 100644 --- a/plugins/ethercat/packet-esl.c +++ b/plugins/ethercat/packet-esl.c @@ -251,7 +251,6 @@ void modify_times(tvbuff_t *tvb, gint offset, packet_info *pinfo) nstime_delta(&ts_delta, &ts, &pinfo->fd->abs_ts); pinfo->fd->abs_ts = ts; - nstime_add(&pinfo->fd->rel_ts, &ts_delta); } } diff --git a/plugins/mate/mate_runtime.c b/plugins/mate/mate_runtime.c index 23284c4735..0b9284bd88 100644 --- a/plugins/mate/mate_runtime.c +++ b/plugins/mate/mate_runtime.c @@ -846,7 +846,7 @@ extern void mate_analyze_frame(packet_info *pinfo, proto_tree* tree) { mate_pdu* pdu = NULL; mate_pdu* last = NULL; - rd->now = (float) nstime_to_sec(&pinfo->fd->rel_ts); + rd->now = (float) nstime_to_sec(&pinfo->rel_ts); if ( proto_tracking_interesting_fields(tree) && rd->highest_analyzed_frame < pinfo->fd->num ) { |