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

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

net/atm: convert to ->poll_mask 



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

net/atm/common.c

+3 −8
Original line number Diff line number Diff line
@@ -648,16 +648,11 @@ int vcc_sendmsg(struct socket *sock, struct msghdr *m, size_t size) 
	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 atm_vcc *vcc;

	__poll_t mask;



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

	mask = 0;



	vcc = ATM_SD(sock);

	struct atm_vcc *vcc = ATM_SD(sock);

	__poll_t mask = 0;



	/* exceptional events */

	if (sk->sk_err)

net/atm/common.h

+1 −1
Original line number Diff line number Diff line
@@ -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 flags);

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_compat_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg);

int vcc_setsockopt(struct socket *sock, int level, int optname,

net/atm/pvc.c

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

	.accept =	sock_no_accept,

	.getname =	pvc_getname,

	.poll =		vcc_poll,

	.poll_mask =	vcc_poll_mask,

	.ioctl =	vcc_ioctl,

#ifdef CONFIG_COMPAT

	.compat_ioctl = vcc_compat_ioctl,

net/atm/svc.c

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

	.accept =	svc_accept,

	.getname =	svc_getname,

	.poll =		vcc_poll,

	.poll_mask =	vcc_poll_mask,

	.ioctl =	svc_ioctl,

#ifdef CONFIG_COMPAT

	.compat_ioctl =	svc_compat_ioctl,