diff --git a/[refs] b/[refs] index 52d63ce16230..c3d36b165013 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f7d7fc0322c1770fe7ee836ca2732c2f88e2e1a4 +refs/heads/master: 7df551254add79a445d2e47e8f849cef8fee6e38 diff --git a/trunk/net/ipv4/tcp.c b/trunk/net/ipv4/tcp.c index 3a4c52e77e01..674bbd8cfd36 100644 --- a/trunk/net/ipv4/tcp.c +++ b/trunk/net/ipv4/tcp.c @@ -1326,7 +1326,7 @@ int tcp_recvmsg(struct kiocb *iocb, struct sock *sk, struct msghdr *msg, cleanup_rbuf(sk, copied); - if (tp->ucopy.task == user_recv) { + if (!sysctl_tcp_low_latency && tp->ucopy.task == user_recv) { /* Install new reader */ if (!user_recv && !(flags & (MSG_TRUNC | MSG_PEEK))) { user_recv = current;