diff options
| author | David S. Miller <davem@davemloft.net> | 2009-07-09 23:18:24 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-07-09 23:18:24 -0400 |
| commit | e5a8a896f5180f2950695d2d0b79db348d200ca4 (patch) | |
| tree | 04adc57ae51a6d30a89ffae970770b81ee81fc23 /net/rxrpc | |
| 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/rxrpc')
| -rw-r--r-- | net/rxrpc/af_rxrpc.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/rxrpc/af_rxrpc.c b/net/rxrpc/af_rxrpc.c index eac5e7bb7365..bfe493ebf27c 100644 --- a/net/rxrpc/af_rxrpc.c +++ b/net/rxrpc/af_rxrpc.c | |||
| @@ -63,7 +63,7 @@ static void rxrpc_write_space(struct sock *sk) | |||
| 63 | _enter("%p", sk); | 63 | _enter("%p", sk); |
| 64 | read_lock(&sk->sk_callback_lock); | 64 | read_lock(&sk->sk_callback_lock); |
| 65 | if (rxrpc_writable(sk)) { | 65 | if (rxrpc_writable(sk)) { |
| 66 | if (sk->sk_sleep && waitqueue_active(sk->sk_sleep)) | 66 | if (sk_has_sleeper(sk)) |
| 67 | wake_up_interruptible(sk->sk_sleep); | 67 | wake_up_interruptible(sk->sk_sleep); |
| 68 | sk_wake_async(sk, SOCK_WAKE_SPACE, POLL_OUT); | 68 | sk_wake_async(sk, SOCK_WAKE_SPACE, POLL_OUT); |
| 69 | } | 69 | } |
| @@ -588,7 +588,7 @@ static unsigned int rxrpc_poll(struct file *file, struct socket *sock, | |||
| 588 | unsigned int mask; | 588 | unsigned int mask; |
| 589 | struct sock *sk = sock->sk; | 589 | struct sock *sk = sock->sk; |
| 590 | 590 | ||
| 591 | poll_wait(file, sk->sk_sleep, wait); | 591 | sock_poll_wait(file, sk->sk_sleep, wait); |
| 592 | mask = 0; | 592 | mask = 0; |
| 593 | 593 | ||
| 594 | /* the socket is readable if there are any messages waiting on the Rx | 594 | /* the socket is readable if there are any messages waiting on the Rx |