From c9d56cecb7b86960aa770efc6482aeb65541bb17 Mon Sep 17 00:00:00 2001
From: "David S. Miller" <davem@davemloft.net>
Date: Wed, 5 Nov 2008 03:36:01 -0800
Subject: [PATCH] --- yaml --- r: 118546 b: refs/heads/master c:
 518a09ef11f8454f4676125d47c3e775b300c6a5 h: refs/heads/master v: v3

---
 [refs]               | 2 +-
 trunk/net/ipv4/tcp.c | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 5ddc96a3c68c..b6af1b6a3a3c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: efb9a8c28ca0edd9e2572117105ebad9bbc0c368
+refs/heads/master: 518a09ef11f8454f4676125d47c3e775b300c6a5
diff --git a/trunk/net/ipv4/tcp.c b/trunk/net/ipv4/tcp.c
index eccb7165a80c..c5aca0bb116a 100644
--- a/trunk/net/ipv4/tcp.c
+++ b/trunk/net/ipv4/tcp.c
@@ -1374,8 +1374,7 @@ int tcp_recvmsg(struct kiocb *iocb, struct sock *sk, struct msghdr *msg,
 			    sk->sk_state == TCP_CLOSE ||
 			    (sk->sk_shutdown & RCV_SHUTDOWN) ||
 			    !timeo ||
-			    signal_pending(current) ||
-			    (flags & MSG_PEEK))
+			    signal_pending(current))
 				break;
 		} else {
 			if (sock_flag(sk, SOCK_DONE))