From cc0cee67577406adda00798b4bf151cbaf82cb06 Mon Sep 17 00:00:00 2001 From: Florian Pose Date: Thu, 9 Aug 2007 14:40:29 +0000 Subject: [PATCH] Re-ordered criteria for datagram matching. --- master/master.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/master/master.c b/master/master.c index 1e17b9cb..5095df9f 100644 --- a/master/master.c +++ b/master/master.c @@ -705,9 +705,9 @@ void ec_master_receive_datagrams(ec_master_t *master, /**< EtherCAT master */ // search for matching datagram in the queue matched = 0; list_for_each_entry(datagram, &master->datagram_queue, queue) { - if (datagram->state == EC_DATAGRAM_SENT + if (datagram->index == datagram_index + && datagram->state == EC_DATAGRAM_SENT && datagram->type == datagram_type - && datagram->index == datagram_index && datagram->data_size == data_size) { matched = 1; break;