summaryrefslogtreecommitdiffstats
path: root/net/ipv4/tcp.c
diff options
context:
space:
mode:
Diffstat (limited to 'net/ipv4/tcp.c')
-rw-r--r--net/ipv4/tcp.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/net/ipv4/tcp.c b/net/ipv4/tcp.c
index bc4246940f6c..46ed9afd1f5e 100644
--- a/net/ipv4/tcp.c
+++ b/net/ipv4/tcp.c
@@ -279,6 +279,7 @@
279 279
280#include <asm/uaccess.h> 280#include <asm/uaccess.h>
281#include <asm/ioctls.h> 281#include <asm/ioctls.h>
282#include <net/ll_poll.h>
282 283
283int sysctl_tcp_fin_timeout __read_mostly = TCP_FIN_TIMEOUT; 284int sysctl_tcp_fin_timeout __read_mostly = TCP_FIN_TIMEOUT;
284 285
@@ -1553,6 +1554,10 @@ int tcp_recvmsg(struct kiocb *iocb, struct sock *sk, struct msghdr *msg,
1553 struct sk_buff *skb; 1554 struct sk_buff *skb;
1554 u32 urg_hole = 0; 1555 u32 urg_hole = 0;
1555 1556
1557 if (sk_valid_ll(sk) && skb_queue_empty(&sk->sk_receive_queue)
1558 && (sk->sk_state == TCP_ESTABLISHED))
1559 sk_poll_ll(sk, nonblock);
1560
1556 lock_sock(sk); 1561 lock_sock(sk);
1557 1562
1558 err = -ENOTCONN; 1563 err = -ENOTCONN;