diff options
| author | YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org> | 2007-02-09 23:24:36 +0900 |
|---|---|---|
| committer | David S. Miller <davem@sunset.davemloft.net> | 2007-02-10 23:19:25 -0800 |
| commit | 4ec93edb14fe5fdee9fae6335f2cbba204627eac (patch) | |
| tree | b768f96942b5d19f5bc36b47262c42a8a7acdd7f /net/core/stream.c | |
| parent | 9d6f229fc45b6ac268020c0c8eff29e94bb34381 (diff) | |
| download | kernel_samsung_smdk4412-4ec93edb14fe5fdee9fae6335f2cbba204627eac.zip kernel_samsung_smdk4412-4ec93edb14fe5fdee9fae6335f2cbba204627eac.tar.gz kernel_samsung_smdk4412-4ec93edb14fe5fdee9fae6335f2cbba204627eac.tar.bz2 | |
[NET] CORE: Fix whitespace errors.
Signed-off-by: YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/core/stream.c')
| -rw-r--r-- | net/core/stream.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/core/stream.c b/net/core/stream.c index d1d7dec..755bacb 100644 --- a/net/core/stream.c +++ b/net/core/stream.c @@ -69,7 +69,7 @@ int sk_stream_wait_connect(struct sock *sk, long *timeo_p) sk->sk_write_pending++; done = sk_wait_event(sk, timeo_p, !sk->sk_err && - !((1 << sk->sk_state) & + !((1 << sk->sk_state) & ~(TCPF_ESTABLISHED | TCPF_CLOSE_WAIT))); finish_wait(sk->sk_sleep, &wait); sk->sk_write_pending--; @@ -139,7 +139,7 @@ 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, ¤t_timeo, !sk->sk_err && + sk_wait_event(sk, ¤t_timeo, !sk->sk_err && !(sk->sk_shutdown & SEND_SHUTDOWN) && sk_stream_memory_free(sk) && vm_wait); |