---

yaml --- r: 254223 b: refs/heads/master c: 9cfaa8d h: refs/heads/master i: 254221: 25c5b6c 254219: daeaf98 254215: 59c8fff 254207: ef7cc8f v: v3
git-mirror · Jun 22, 2011 · 57e3feb · 57e3feb
1 parent ce418ff
commit 57e3feb
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 32c90254ed4a0c698caa0794ebb4de63fcc69631
+refs/heads/master: 9cfaa8def1c795a512bc04f2aec333b03724ca2e
diff --git a/trunk/net/ipv4/udp.c b/trunk/net/ipv4/udp.c
@@ -1249,6 +1249,9 @@ int udp_recvmsg(struct kiocb *iocb, struct sock *sk, struct msghdr *msg,
 
 	if (noblock)
 		return -EAGAIN;
+
+	/* starting over for a new packet */
+	msg->msg_flags &= ~MSG_TRUNC;
 	goto try_again;
 }
 

diff --git a/trunk/net/ipv6/udp.c b/trunk/net/ipv6/udp.c
@@ -455,6 +455,9 @@ int udpv6_recvmsg(struct kiocb *iocb, struct sock *sk,
 
 	if (noblock)
 		return -EAGAIN;
+
+	/* starting over for a new packet */
+	msg->msg_flags &= ~MSG_TRUNC;
 	goto try_again;
 }