X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;f=udp_recv.c;h=4d4b67f9b772d9d178ddbd92bc9d10fbf9f347ec;hb=c52b8398d68a87d8fac858f6681dee5f0b09289d;hp=5cd9d9dd43bdeea379953f6965d68818fc1504ef;hpb=1cccf6fa93c251f8f2805aa5fb163741d851c051;p=paraslash.git

diff --git a/udp_recv.c b/udp_recv.c
index 5cd9d9dd..4d4b67f9 100644
--- a/udp_recv.c
+++ b/udp_recv.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005-2013 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2005-2014 Andre Noll <maan@systemlinux.org>
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
@@ -29,7 +29,7 @@
 
 static void udp_recv_pre_select(struct sched *s, struct task *t)
 {
-	struct receiver_node *rn = container_of(t, struct receiver_node, task);
+	struct receiver_node *rn = task_context(t);
 
 	if (generic_recv_pre_select(s, t) <= 0)
 		return;
@@ -48,7 +48,7 @@ static int udp_check_eof(size_t sz, struct iovec iov[2])
 	}
 	if (memcmp(iov[0].iov_base, FEC_EOF_PACKET, iov[0].iov_len) != 0)
 		return 0;
-	if (memcmp(iov[1].iov_base, FEC_EOF_PACKET + iov[0].iov_len,
+	if (memcmp(iov[1].iov_base, &FEC_EOF_PACKET[iov[0].iov_len],
 			FEC_EOF_PACKET_LEN - iov[0].iov_len) != 0)
 		return 0;
 	return -E_RECV_EOF;
@@ -56,7 +56,7 @@ static int udp_check_eof(size_t sz, struct iovec iov[2])
 
 static int udp_recv_post_select(__a_unused struct sched *s, struct task *t)
 {
-	struct receiver_node *rn = container_of(t, struct receiver_node, task);
+	struct receiver_node *rn = task_context(t);
 	struct btr_node *btrn = rn->btrn;
 	size_t num_bytes;
 	struct iovec iov[2];