diff options
| author | Linus Torvalds <torvalds@penguin.transmeta.com> | 2002-10-29 22:54:51 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@penguin.transmeta.com> | 2002-10-29 22:54:51 -0800 |
| commit | 0fca836550e270830988f4780fde41675518ec23 (patch) | |
| tree | d1ba9aa3ae5865c3d428b68a0748a0f83e3752bc /net | |
| parent | ead7001efd9907bf591b104adcb9a558d9997299 (diff) | |
| parent | f751cfc01cc86a24d6266c7116cdc16f27e6da40 (diff) | |
Merge penguin.transmeta.com:/home/penguin/torvalds/repositories/kernel/epoll-0.15
into penguin.transmeta.com:/home/penguin/torvalds/repositories/kernel/linux
Diffstat (limited to 'net')
| -rw-r--r-- | net/ipv4/tcp.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/ipv4/tcp.c b/net/ipv4/tcp.c index e7c122e30969..c737b6f94414 100644 --- a/net/ipv4/tcp.c +++ b/net/ipv4/tcp.c @@ -476,8 +476,8 @@ void tcp_write_space(struct sock *sk) if (sk->sleep && waitqueue_active(sk->sleep)) wake_up_interruptible(sk->sleep); - if (sock->fasync_list && !(sk->shutdown & SEND_SHUTDOWN)) - sock_wake_async(sock, 2, POLL_OUT); + if (!(sk->shutdown & SEND_SHUTDOWN)) + sk_wake_async(sk, 2, POLL_OUT); } } |