Commit 9f728af3 authored by Christoph Hellwig's avatar Christoph Hellwig

net/atm: convert to ->poll_mask

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
parent f4335f52
...@@ -648,16 +648,11 @@ int vcc_sendmsg(struct socket *sock, struct msghdr *m, size_t size) ...@@ -648,16 +648,11 @@ int vcc_sendmsg(struct socket *sock, struct msghdr *m, size_t size)
return error; return error;
} }
__poll_t vcc_poll(struct file *file, struct socket *sock, poll_table *wait) __poll_t vcc_poll_mask(struct socket *sock, __poll_t events)
{ {
struct sock *sk = sock->sk; struct sock *sk = sock->sk;
struct atm_vcc *vcc; struct atm_vcc *vcc = ATM_SD(sock);
__poll_t mask; __poll_t mask = 0;
sock_poll_wait(file, sk_sleep(sk), wait);
mask = 0;
vcc = ATM_SD(sock);
/* exceptional events */ /* exceptional events */
if (sk->sk_err) if (sk->sk_err)
......
...@@ -17,7 +17,7 @@ int vcc_connect(struct socket *sock, int itf, short vpi, int vci); ...@@ -17,7 +17,7 @@ int vcc_connect(struct socket *sock, int itf, short vpi, int vci);
int vcc_recvmsg(struct socket *sock, struct msghdr *msg, size_t size, int vcc_recvmsg(struct socket *sock, struct msghdr *msg, size_t size,
int flags); int flags);
int vcc_sendmsg(struct socket *sock, struct msghdr *m, size_t total_len); int vcc_sendmsg(struct socket *sock, struct msghdr *m, size_t total_len);
__poll_t vcc_poll(struct file *file, struct socket *sock, poll_table *wait); __poll_t vcc_poll_mask(struct socket *sock, __poll_t events);
int vcc_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg); int vcc_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg);
int vcc_compat_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg); int vcc_compat_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg);
int vcc_setsockopt(struct socket *sock, int level, int optname, int vcc_setsockopt(struct socket *sock, int level, int optname,
......
...@@ -113,7 +113,7 @@ static const struct proto_ops pvc_proto_ops = { ...@@ -113,7 +113,7 @@ static const struct proto_ops pvc_proto_ops = {
.socketpair = sock_no_socketpair, .socketpair = sock_no_socketpair,
.accept = sock_no_accept, .accept = sock_no_accept,
.getname = pvc_getname, .getname = pvc_getname,
.poll = vcc_poll, .poll_mask = vcc_poll_mask,
.ioctl = vcc_ioctl, .ioctl = vcc_ioctl,
#ifdef CONFIG_COMPAT #ifdef CONFIG_COMPAT
.compat_ioctl = vcc_compat_ioctl, .compat_ioctl = vcc_compat_ioctl,
......
...@@ -636,7 +636,7 @@ static const struct proto_ops svc_proto_ops = { ...@@ -636,7 +636,7 @@ static const struct proto_ops svc_proto_ops = {
.socketpair = sock_no_socketpair, .socketpair = sock_no_socketpair,
.accept = svc_accept, .accept = svc_accept,
.getname = svc_getname, .getname = svc_getname,
.poll = vcc_poll, .poll_mask = vcc_poll_mask,
.ioctl = svc_ioctl, .ioctl = svc_ioctl,
#ifdef CONFIG_COMPAT #ifdef CONFIG_COMPAT
.compat_ioctl = svc_compat_ioctl, .compat_ioctl = svc_compat_ioctl,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment