From 9fd04b11ccf2420f8b87f81640f35fa72e803ee0 Mon Sep 17 00:00:00 2001
From: Eric Dumazet <eric.dumazet@gmail.com>
Date: Thu, 1 Oct 2009 15:26:00 -0700
Subject: [PATCH] --- yaml --- r: 166725 b: refs/heads/master c:
 42324c62704365d6a3e89138dea55909d2f26afe h: refs/heads/master i:   166723:
 56f49fef239ddb08bc7e244870b1ccacff631ab9 v: v3

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

diff --git a/[refs] b/[refs]
index 878bcbd09c30..a93551e734ff 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 914a9ab386a288d0f22252fc268ecbc048cdcbd5
+refs/heads/master: 42324c62704365d6a3e89138dea55909d2f26afe
diff --git a/trunk/net/ipv4/tcp.c b/trunk/net/ipv4/tcp.c
index 7bb8479b1eaf..64d0af675823 100644
--- a/trunk/net/ipv4/tcp.c
+++ b/trunk/net/ipv4/tcp.c
@@ -580,7 +580,7 @@ ssize_t tcp_splice_read(struct socket *sock, loff_t *ppos,
 
 	lock_sock(sk);
 
-	timeo = sock_rcvtimeo(sk, flags & SPLICE_F_NONBLOCK);
+	timeo = sock_rcvtimeo(sk, sock->file->f_flags & O_NONBLOCK);
 	while (tss.len) {
 		ret = __tcp_splice_read(sk, &tss);
 		if (ret < 0)