UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

net/phonet: convert to ->poll_mask 

Signed-off-by: Christoph Hellwig <hch@lst.de>
This commit is contained in:
Christoph Hellwig 2017-12-31 16:39:42 +01:00
parent 4bac2bcd83
commit e7a98d47ee
1 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
net/phonet/socket.c
View File

@ -340,15 +340,12 @@ static int pn_socket_getname(struct socket *sock, struct sockaddr *addr,
return sizeof(struct sockaddr_pn); return sizeof(struct sockaddr_pn);
} }
static __poll_t pn_socket_poll(struct file *file, struct socket *sock, static __poll_t pn_socket_poll_mask(struct socket *sock, __poll_t events)
poll_table *wait)
{ {
struct sock *sk = sock->sk; struct sock *sk = sock->sk;
struct pep_sock *pn = pep_sk(sk); struct pep_sock *pn = pep_sk(sk);
__poll_t mask = 0; __poll_t mask = 0;
poll_wait(file, sk_sleep(sk), wait);
if (sk->sk_state == TCP_CLOSE) if (sk->sk_state == TCP_CLOSE)
return EPOLLERR; return EPOLLERR;
if (!skb_queue_empty(&sk->sk_receive_queue)) if (!skb_queue_empty(&sk->sk_receive_queue))
@ -473,7 +470,7 @@ const struct proto_ops phonet_stream_ops = {
.socketpair = sock_no_socketpair, .socketpair = sock_no_socketpair,
.accept = pn_socket_accept, .accept = pn_socket_accept,
.getname = pn_socket_getname, .getname = pn_socket_getname,
.poll = pn_socket_poll, .poll_mask = pn_socket_poll_mask,
.ioctl = pn_socket_ioctl, .ioctl = pn_socket_ioctl,
.listen = pn_socket_listen, .listen = pn_socket_listen,
.shutdown = sock_no_shutdown, .shutdown = sock_no_shutdown,