diff options
| author | Christoph Hellwig <hch@lst.de> | 2017-12-31 16:34:24 +0100 |
|---|---|---|
| committer | Christoph Hellwig <hch@lst.de> | 2018-05-26 09:16:44 +0200 |
| commit | f4335f52bb9e4e257e5a6426cdecef786f5739b7 (patch) | |
| tree | 25f67d3a2c01daede232a3448c117a21e12b0036 /net/dccp/proto.c | |
| parent | net: convert datagram_poll users tp ->poll_mask (diff) | |
| download | linux-f4335f52bb9e4e257e5a6426cdecef786f5739b7.tar.xz linux-f4335f52bb9e4e257e5a6426cdecef786f5739b7.zip | |
net/dccp: convert to ->poll_mask
Signed-off-by: Christoph Hellwig <hch@lst.de>
Diffstat (limited to 'net/dccp/proto.c')
| -rw-r--r-- | net/dccp/proto.c | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/net/dccp/proto.c b/net/dccp/proto.c index 84cd4e3fd01b..88b668db244b 100644 --- a/net/dccp/proto.c +++ b/net/dccp/proto.c @@ -314,20 +314,11 @@ int dccp_disconnect(struct sock *sk, int flags) EXPORT_SYMBOL_GPL(dccp_disconnect); -/* - * Wait for a DCCP event. - * - * Note that we don't need to lock the socket, as the upper poll layers - * take care of normal races (between the test and the event) and we don't - * go look at any of the socket buffers directly. - */ -__poll_t dccp_poll(struct file *file, struct socket *sock, - poll_table *wait) +__poll_t dccp_poll_mask(struct socket *sock, __poll_t events) { __poll_t mask; struct sock *sk = sock->sk; - sock_poll_wait(file, sk_sleep(sk), wait); if (sk->sk_state == DCCP_LISTEN) return inet_csk_listen_poll(sk); @@ -369,7 +360,7 @@ __poll_t dccp_poll(struct file *file, struct socket *sock, return mask; } -EXPORT_SYMBOL_GPL(dccp_poll); +EXPORT_SYMBOL_GPL(dccp_poll_mask); int dccp_ioctl(struct sock *sk, int cmd, unsigned long arg) { |