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

Commit 568ea88e authored by Christoph Hellwig's avatar Christoph Hellwig
Browse files

net/sctp: convert to ->poll_mask 



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

include/net/sctp/sctp.h

+1 −2
Original line number Diff line number Diff line
@@ -107,8 +107,7 @@ int sctp_backlog_rcv(struct sock *sk, struct sk_buff *skb); 
int sctp_inet_listen(struct socket *sock, int backlog);

void sctp_write_space(struct sock *sk);

void sctp_data_ready(struct sock *sk);

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

		poll_table *wait);

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

void sctp_sock_rfree(struct sk_buff *skb);

void sctp_copy_sock(struct sock *newsk, struct sock *sk,

		    struct sctp_association *asoc);

net/sctp/ipv6.c

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

	.accept		   = inet_accept,

	.getname	   = sctp_getname,

	.poll		   = sctp_poll,

	.poll_mask	   = sctp_poll_mask,

	.ioctl		   = inet6_ioctl,

	.listen		   = sctp_inet_listen,

	.shutdown	   = inet_shutdown,

net/sctp/protocol.c

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

	.accept		   = inet_accept,

	.getname	   = inet_getname,	/* Semantics are different.  */

	.poll		   = sctp_poll,

	.poll_mask	   = sctp_poll_mask,

	.ioctl		   = inet_ioctl,

	.listen		   = sctp_inet_listen,

	.shutdown	   = inet_shutdown,	/* Looks harmless.  */

net/sctp/socket.c

+1 −3
Original line number Diff line number Diff line
@@ -7701,14 +7701,12 @@ int sctp_inet_listen(struct socket *sock, int backlog) 
 * here, again, by modeling the current TCP/UDP code.  We don't have

 * a good way to test with it yet.

 */

__poll_t sctp_poll(struct file *file, struct socket *sock, poll_table *wait)

__poll_t sctp_poll_mask(struct socket *sock, __poll_t events)

{

	struct sock *sk = sock->sk;

	struct sctp_sock *sp = sctp_sk(sk);

	__poll_t mask;



	poll_wait(file, sk_sleep(sk), wait);



	sock_rps_record_flow(sk);



	/* A TCP-style listening socket becomes readable when the accept queue