---

yaml --- r: 211401 b: refs/heads/master c: 482964e h: refs/heads/master i: 211399: b7f1f1b v: v3
git-mirror · Oct 4, 2010 · 407a60c · 407a60c
1 parent 4c35bb7
commit 407a60c
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ae878ae280bea286ff2b1e1cb6e609dd8cb4501d
+refs/heads/master: 482964e56e1320cb7952faa1932d8ecf59c4bf75
diff --git a/trunk/net/core/stream.c b/trunk/net/core/stream.c
@@ -141,10 +141,10 @@ int sk_stream_wait_memory(struct sock *sk, long *timeo_p)
 
 		set_bit(SOCK_NOSPACE, &sk->sk_socket->flags);
 		sk->sk_write_pending++;
-		sk_wait_event(sk, &current_timeo, !sk->sk_err &&
-						  !(sk->sk_shutdown & SEND_SHUTDOWN) &&
-						  sk_stream_memory_free(sk) &&
-						  vm_wait);
+		sk_wait_event(sk, &current_timeo, sk->sk_err ||
+						  (sk->sk_shutdown & SEND_SHUTDOWN) ||
+						  (sk_stream_memory_free(sk) &&
+						  !vm_wait));
 		sk->sk_write_pending--;
 
 		if (vm_wait) {