---

yaml --- r: 166725 b: refs/heads/master c: 42324c6 h: refs/heads/master i: 166723: 56f49fe v: v3
git-mirror · Oct 2, 2009 · 9fd04b1 · 9fd04b1
1 parent 4e972cf
commit 9fd04b1
Show file tree

Hide file tree

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