diff options
author | Eric Dumazet <eric.dumazet@gmail.com> | 2010-04-20 09:03:51 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2010-04-20 19:37:13 -0400 |
commit | aa395145165cb06a0d0885221bbe0ce4a564391d (patch) | |
tree | 118b0403621f10db8dc3dbf12079f9af5b19e05d /net/caif | |
parent | ab9304717f7624c41927f442e6b6d418b2d8b3e4 (diff) |
net: sk_sleep() helper
Define a new function to return the waitqueue of a "struct sock".
static inline wait_queue_head_t *sk_sleep(struct sock *sk)
{
return sk->sk_sleep;
}
Change all read occurrences of sk_sleep by a call to this function.
Needed for a future RCU conversion. sk_sleep wont be a field directly
available.
Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/caif')
-rw-r--r-- | net/caif/caif_socket.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/caif/caif_socket.c b/net/caif/caif_socket.c index cdf62b9fefac..90317e7d10b4 100644 --- a/net/caif/caif_socket.c +++ b/net/caif/caif_socket.c | |||
@@ -689,7 +689,7 @@ static unsigned int caif_poll(struct file *file, struct socket *sock, | |||
689 | struct sock *sk = sock->sk; | 689 | struct sock *sk = sock->sk; |
690 | struct caifsock *cf_sk = container_of(sk, struct caifsock, sk); | 690 | struct caifsock *cf_sk = container_of(sk, struct caifsock, sk); |
691 | u32 mask = 0; | 691 | u32 mask = 0; |
692 | poll_wait(file, sk->sk_sleep, wait); | 692 | poll_wait(file, sk_sleep(sk), wait); |
693 | lock_sock(&(cf_sk->sk)); | 693 | lock_sock(&(cf_sk->sk)); |
694 | if (!STATE_IS_OPEN(cf_sk)) { | 694 | if (!STATE_IS_OPEN(cf_sk)) { |
695 | if (!STATE_IS_PENDING(cf_sk)) | 695 | if (!STATE_IS_PENDING(cf_sk)) |