# HG changeset patch # User Florian Pose # Date 1186670429 0 # Node ID 5e231f6a3d2e68374d84e8829476b0c066fd8e36 # Parent 880b556a6efcd763147d373aa82effe5d17fbc89 Re-ordered criteria for datagram matching. diff -r 880b556a6efc -r 5e231f6a3d2e master/master.c --- a/master/master.c Thu Aug 09 14:38:18 2007 +0000 +++ b/master/master.c Thu Aug 09 14:40:29 2007 +0000 @@ -705,9 +705,9 @@ // 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;