Message ID | 605654.23716.qm@web53705.mail.re2.yahoo.com |
---|---|
State | Superseded, archived |
Delegated to: | David Miller |
Headers | show |
--- linux-2.6.35.7/net/core/stream.c.orig 2010-03-24 09:31:00.000000000 +0530 +++ linux-2.6.35.7/net/core/stream.c 2010-03-24 09:31:08.000000000 +0530 @@ -143,10 +143,9 @@ int sk_stream_wait_memory(struct sock *s set_bit(SOCK_NOSPACE, &sk->sk_socket->flags); sk->sk_write_pending++; - sk_wait_event(sk, ¤t_timeo, !sk->sk_err && - !(sk->sk_shutdown & SEND_SHUTDOWN) && - sk_stream_memory_free(sk) && - vm_wait); + sk_wait_event(sk, ¤t_timeo, sk->sk_err || + (sk->sk_shutdown & SEND_SHUTDOWN) || + (sk_stream_memory_free(sk) && !vm_wait)); sk->sk_write_pending--; if (vm_wait) {