diff -r bc89e3fba1a5 -r 5fcbd29151d2 master/datagram.c --- a/master/datagram.c Tue Feb 13 13:36:31 2007 +0000 +++ b/master/datagram.c Tue Feb 13 13:42:37 2007 +0000 @@ -78,7 +78,6 @@ datagram->index = 0x00; datagram->working_counter = 0x00; datagram->state = EC_DATAGRAM_INIT; - datagram->cycles_queued = 0; datagram->cycles_sent = 0; datagram->jiffies_sent = 0; datagram->cycles_received = 0; @@ -116,7 +115,7 @@ datagram->mem_size = 0; } - if (!(datagram->data = kmalloc(size, GFP_KERNEL))) { + if (!(datagram->data = kmalloc(size, GFP_ATOMIC))) { EC_ERR("Failed to allocate %i bytes of datagram memory!\n", size); return -1; }