From 57e3febeaf8a7e7a8ecda33d96f4c7f5674d4e03 Mon Sep 17 00:00:00 2001
From: Xufeng Zhang <xufeng.zhang@windriver.com>
Date: Tue, 21 Jun 2011 10:43:40 +0000
Subject: [PATCH] --- yaml --- r: 254223 b: refs/heads/master c:
 9cfaa8def1c795a512bc04f2aec333b03724ca2e h: refs/heads/master i:   254221:
 25c5b6cc639248f29fb6ebbba4cf674e4e5bc7c5   254219:
 daeaf98ff8ec7029e2140f7952fb3231cabb83fe   254215:
 59c8fff54263f6f782aaa16a767f425b7de56c33   254207:
 ef7cc8f41f4d34c73cf9a83b0d7ba76ab14af65a v: v3

---
 [refs]               | 2 +-
 trunk/net/ipv4/udp.c | 3 +++
 trunk/net/ipv6/udp.c | 3 +++
 3 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 2ed196c12f6c..13651bd19b9a 100644
--- 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
index abca870d8ff6..48cd88e62553 100644
--- 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
index 1e7a43f500ab..328985c40883 100644
--- 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;
 }