Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f4335f52 authored by Christoph Hellwig's avatar Christoph Hellwig
Browse files

net/dccp: convert to ->poll_mask 



Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
parent db5051ea

net/dccp/dccp.h

+1 −2
Original line number Diff line number Diff line
@@ -316,8 +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);

__poll_t dccp_poll(struct file *file, struct socket *sock,

		       poll_table *wait);

__poll_t dccp_poll_mask(struct socket *sock, __poll_t events);

int dccp_v4_connect(struct sock *sk, struct sockaddr *uaddr, int addr_len);

void dccp_req_err(struct sock *sk, u64 seq);

net/dccp/ipv4.c

+1 −1
Original line number Diff line number Diff line
@@ -984,7 +984,7 @@ static const struct proto_ops inet_dccp_ops = { 
	.accept		   = inet_accept,

	.getname	   = inet_getname,

	/* FIXME: work on tcp_poll to rename it to inet_csk_poll */

	.poll		   = dccp_poll,

	.poll_mask	   = dccp_poll_mask,

	.ioctl		   = inet_ioctl,

	/* FIXME: work on inet_listen to rename it to sock_common_listen */

	.listen		   = inet_dccp_listen,

net/dccp/ipv6.c

+1 −1
Original line number Diff line number Diff line
@@ -1070,7 +1070,7 @@ static const struct proto_ops inet6_dccp_ops = { 
	.socketpair	   = sock_no_socketpair,

	.accept		   = inet_accept,

	.getname	   = inet6_getname,

	.poll		   = dccp_poll,

	.poll_mask	   = dccp_poll_mask,

	.ioctl		   = inet6_ioctl,

	.listen		   = inet_dccp_listen,

	.shutdown	   = inet_shutdown,

net/dccp/proto.c

+2 −11
Original line number Diff line number Diff line
@@ -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)

{