---

yaml --- r: 118546 b: refs/heads/master c: 518a09e h: refs/heads/master v: v3
git-mirror · Nov 5, 2008 · c9d56ce · c9d56ce
1 parent 59653c1
commit c9d56ce
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git 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
@@ -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))