Update plugins/ with recent change.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@50774 f5534014-38df-0310-8fa8-9805f1628bb7

diff --git a/plugins/ethercat/packet-esl.c b/plugins/ethercat/packet-esl.c
index 34e6dfdfd8a01bae0349bbd92a4a788a835d67ae..0e48bf5f27d4c2640b24b69262d1ee3175203b50 100644 (file)
--- 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 23284c4735a92efafd6a1481c9114b81c29eaa36..0b9284bd886625140574e40e33850915e59e43a1 100644 (file)
--- 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 ) {