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/atm | |
| parent | bff38771e1065c7fc3de87e47ba366151eea573c (diff) | |
| parent | e594e96e8a14101a6decabf6746bd5186287debc (diff) | |
| download | kernel_samsung_smdk4412-e5a8a896f5180f2950695d2d0b79db348d200ca4.zip kernel_samsung_smdk4412-e5a8a896f5180f2950695d2d0b79db348d200ca4.tar.gz kernel_samsung_smdk4412-e5a8a896f5180f2950695d2d0b79db348d200ca4.tar.bz2 | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Diffstat (limited to 'net/atm')
| -rw-r--r-- | net/atm/common.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/net/atm/common.c b/net/atm/common.c index c1c9793..8c4d843 100644 --- a/net/atm/common.c +++ b/net/atm/common.c @@ -92,7 +92,7 @@ static void vcc_sock_destruct(struct sock *sk) static void vcc_def_wakeup(struct sock *sk) { read_lock(&sk->sk_callback_lock); - if (sk->sk_sleep && waitqueue_active(sk->sk_sleep)) + if (sk_has_sleeper(sk)) wake_up(sk->sk_sleep); read_unlock(&sk->sk_callback_lock); } @@ -110,7 +110,7 @@ static void vcc_write_space(struct sock *sk) read_lock(&sk->sk_callback_lock); if (vcc_writable(sk)) { - if (sk->sk_sleep && waitqueue_active(sk->sk_sleep)) + if (sk_has_sleeper(sk)) wake_up_interruptible(sk->sk_sleep); sk_wake_async(sk, SOCK_WAKE_SPACE, POLL_OUT); @@ -594,7 +594,7 @@ unsigned int vcc_poll(struct file *file, struct socket *sock, poll_table *wait) struct atm_vcc *vcc; unsigned int mask; - poll_wait(file, sk->sk_sleep, wait); + sock_poll_wait(file, sk->sk_sleep, wait); mask = 0; vcc = ATM_SD(sock); |