diff options
| author | David S. Miller <davem@davemloft.net> | 2009-07-09 20:18:24 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-07-09 20:18:24 -0700 |
| commit | e5a8a896f5180f2950695d2d0b79db348d200ca4 (patch) | |
| tree | 04adc57ae51a6d30a89ffae970770b81ee81fc23 /net/ipv4/tcp.c | |
| parent | bff38771e1065c7fc3de87e47ba366151eea573c (diff) | |
| parent | e594e96e8a14101a6decabf6746bd5186287debc (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Diffstat (limited to 'net/ipv4/tcp.c')
| -rw-r--r-- | net/ipv4/tcp.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ipv4/tcp.c b/net/ipv4/tcp.c index 7870a535dac..91145244ea6 100644 --- a/net/ipv4/tcp.c +++ b/net/ipv4/tcp.c @@ -339,7 +339,7 @@ unsigned int tcp_poll(struct file *file, struct socket *sock, poll_table *wait) struct sock *sk = sock->sk; struct tcp_sock *tp = tcp_sk(sk); - poll_wait(file, sk->sk_sleep, wait); + sock_poll_wait(file, sk->sk_sleep, wait); if (sk->sk_state == TCP_LISTEN) return inet_csk_listen_poll(sk); |