--- net/core/stream.c

+++ net/core/stream.c

@@ -140,10 +140,10 @@ int sk_stream_wait_memory(struct sock *s

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) {