--- a/master/domain.c	Mon Sep 25 12:15:36 2006 +0000
+++ b/master/domain.c	Mon Sep 25 12:20:44 2006 +0000
@@ -515,10 +515,14 @@
     ec_datagram_t *datagram;
 
     working_counter_sum = 0;
+    domain->state = 0;
     list_for_each_entry(datagram, &domain->datagrams, list) {
         if (datagram->state == EC_DATAGRAM_RECEIVED) {
             working_counter_sum += datagram->working_counter;
         }
+        else {
+            domain->state = -1;
+        }
     }
 
     if (working_counter_sum != domain->response_count) {
@@ -554,13 +558,7 @@
 
 int ecrt_domain_state(const ec_domain_t *domain /**< EtherCAT domain */)
 {
-    ec_datagram_t *datagram;
-
-    list_for_each_entry(datagram, &domain->datagrams, list) {
-        if (datagram->state != EC_DATAGRAM_RECEIVED) return -1;
-    }
-
-    return 0;
+    return domain->state;
 }
 
 /*****************************************************************************/