diff options
author | Al Viro <viro@zeniv.linux.org.uk> | 2017-07-03 00:01:49 -0400 |
---|---|---|
committer | Al Viro <viro@zeniv.linux.org.uk> | 2017-11-27 16:20:04 -0500 |
commit | ade994f4f6c8c3ef4c3bfc2d02166262fb9d089c (patch) | |
tree | ab92ca31c845daf847c38ec0b3844a1fdd87ecad /net/dccp | |
parent | e6c5a7d997db73aaab2fb8337710f109e5d931b1 (diff) | |
download | linux-ade994f4f6c8c3ef4c3bfc2d02166262fb9d089c.tar.gz linux-ade994f4f6c8c3ef4c3bfc2d02166262fb9d089c.tar.bz2 linux-ade994f4f6c8c3ef4c3bfc2d02166262fb9d089c.zip |
net: annotate ->poll() instances
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'net/dccp')
-rw-r--r-- | net/dccp/dccp.h | 2 | ||||
-rw-r--r-- | net/dccp/proto.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/net/dccp/dccp.h b/net/dccp/dccp.h index 0c55ffb859bf..f91e3816806b 100644 --- a/net/dccp/dccp.h +++ b/net/dccp/dccp.h @@ -316,7 +316,7 @@ int dccp_recvmsg(struct sock *sk, struct msghdr *msg, size_t len, int nonblock, int flags, int *addr_len); void dccp_shutdown(struct sock *sk, int how); int inet_dccp_listen(struct socket *sock, int backlog); -unsigned int dccp_poll(struct file *file, struct socket *sock, +__poll_t dccp_poll(struct file *file, struct socket *sock, poll_table *wait); int dccp_v4_connect(struct sock *sk, struct sockaddr *uaddr, int addr_len); void dccp_req_err(struct sock *sk, u64 seq); diff --git a/net/dccp/proto.c b/net/dccp/proto.c index b68168fcc06a..cfa9ca9939ce 100644 --- a/net/dccp/proto.c +++ b/net/dccp/proto.c @@ -313,10 +313,10 @@ EXPORT_SYMBOL_GPL(dccp_disconnect); * take care of normal races (between the test and the event) and we don't * go look at any of the socket buffers directly. */ -unsigned int dccp_poll(struct file *file, struct socket *sock, +__poll_t dccp_poll(struct file *file, struct socket *sock, poll_table *wait) { - unsigned int mask; + __poll_t mask; struct sock *sk = sock->sk; sock_poll_wait(file, sk_sleep(sk), wait); |