From ce418ff658ab779c9afe0b4873049684a90cff41 Mon Sep 17 00:00:00 2001
From: Xufeng Zhang <xufeng.zhang@windriver.com>
Date: Tue, 21 Jun 2011 10:43:39 +0000
Subject: [PATCH] --- yaml --- r: 254222 b: refs/heads/master c:
 32c90254ed4a0c698caa0794ebb4de63fcc69631 h: refs/heads/master v: v3

---
 [refs]               | 2 +-
 trunk/net/ipv6/udp.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 5921e92546d9..2ed196c12f6c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 58fa45973117ab7a79d5b6818275a887867fc4d7
+refs/heads/master: 32c90254ed4a0c698caa0794ebb4de63fcc69631
diff --git a/trunk/net/ipv6/udp.c b/trunk/net/ipv6/udp.c
index 41f8c9c08dba..1e7a43f500ab 100644
--- a/trunk/net/ipv6/udp.c
+++ b/trunk/net/ipv6/udp.c
@@ -453,7 +453,7 @@ int udpv6_recvmsg(struct kiocb *iocb, struct sock *sk,
 	}
 	unlock_sock_fast(sk, slow);
 
-	if (flags & MSG_DONTWAIT)
+	if (noblock)
 		return -EAGAIN;
 	goto try_again;
 }