openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

net/sctp: convert to ->poll_mask 

Signed-off-by: Christoph Hellwig <hch@lst.de>
This commit is contained in:
Christoph Hellwig 2017-12-31 16:37:35 +01:00
parent 4df7338f6f
commit 568ea88ef9
4 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
include/net/sctp/sctp.h
View File

@ -107,8 +107,7 @@ int sctp_backlog_rcv(struct sock *sk, struct sk_buff *skb);
int sctp_inet_listen(struct socket *sock, int backlog); int sctp_inet_listen(struct socket *sock, int backlog);
void sctp_write_space(struct sock *sk); void sctp_write_space(struct sock *sk);
void sctp_data_ready(struct sock *sk); void sctp_data_ready(struct sock *sk);
__poll_t sctp_poll(struct file *file, struct socket *sock, __poll_t sctp_poll_mask(struct socket *sock, __poll_t events);
poll_table *wait);
void sctp_sock_rfree(struct sk_buff *skb); void sctp_sock_rfree(struct sk_buff *skb);
void sctp_copy_sock(struct sock *newsk, struct sock *sk, void sctp_copy_sock(struct sock *newsk, struct sock *sk,
struct sctp_association *asoc); struct sctp_association *asoc);

2
net/sctp/ipv6.c
View File

@ -1007,7 +1007,7 @@ static const struct proto_ops inet6_seqpacket_ops = {
.socketpair = sock_no_socketpair, .socketpair = sock_no_socketpair,
.accept = inet_accept, .accept = inet_accept,
.getname = sctp_getname, .getname = sctp_getname,
.poll = sctp_poll, .poll_mask = sctp_poll_mask,
.ioctl = inet6_ioctl, .ioctl = inet6_ioctl,
.listen = sctp_inet_listen, .listen = sctp_inet_listen,
.shutdown = inet_shutdown, .shutdown = inet_shutdown,

2
net/sctp/protocol.c
View File

@ -1016,7 +1016,7 @@ static const struct proto_ops inet_seqpacket_ops = {
.socketpair = sock_no_socketpair, .socketpair = sock_no_socketpair,
.accept = inet_accept, .accept = inet_accept,
.getname = inet_getname, /* Semantics are different. */ .getname = inet_getname, /* Semantics are different. */
.poll = sctp_poll, .poll_mask = sctp_poll_mask,
.ioctl = inet_ioctl, .ioctl = inet_ioctl,
.listen = sctp_inet_listen, .listen = sctp_inet_listen,
.shutdown = inet_shutdown, /* Looks harmless. */ .shutdown = inet_shutdown, /* Looks harmless. */

4
net/sctp/socket.c
View File

@ -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 * here, again, by modeling the current TCP/UDP code. We don't have
* a good way to test with it yet. * 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 sock *sk = sock->sk;
struct sctp_sock *sp = sctp_sk(sk); struct sctp_sock *sp = sctp_sk(sk);
__poll_t mask; __poll_t mask;
poll_wait(file, sk_sleep(sk), wait);
sock_rps_record_flow(sk); sock_rps_record_flow(sk);
/* A TCP-style listening socket becomes readable when the accept queue /* A TCP-style listening socket becomes readable when the accept queue