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

Commit db5051ea authored by Christoph Hellwig's avatar Christoph Hellwig
Browse files

net: convert datagram_poll users tp ->poll_mask 



Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent e76cd24d

drivers/isdn/mISDN/socket.c

+1 −1
Original line number Diff line number Diff line
@@ -588,7 +588,7 @@ static const struct proto_ops data_sock_ops = { 
	.getname	= data_sock_getname,

	.sendmsg	= mISDN_sock_sendmsg,

	.recvmsg	= mISDN_sock_recvmsg,

	.poll		= datagram_poll,

	.poll_mask	= datagram_poll_mask,

	.listen		= sock_no_listen,

	.shutdown	= sock_no_shutdown,

	.setsockopt	= data_sock_setsockopt,

drivers/net/ppp/pppoe.c

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

	.accept		= sock_no_accept,

	.getname	= pppoe_getname,

	.poll		= datagram_poll,

	.poll_mask	= datagram_poll_mask,

	.listen		= sock_no_listen,

	.shutdown	= sock_no_shutdown,

	.setsockopt	= sock_no_setsockopt,

drivers/staging/ipx/af_ipx.c

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

	.accept		= sock_no_accept,

	.getname	= ipx_getname,

	.poll		= datagram_poll,

	.poll_mask	= datagram_poll_mask,

	.ioctl		= ipx_ioctl,

#ifdef CONFIG_COMPAT

	.compat_ioctl	= ipx_compat_ioctl,

include/linux/skbuff.h

+1 −2
Original line number Diff line number Diff line
@@ -3250,8 +3250,7 @@ struct sk_buff *__skb_recv_datagram(struct sock *sk, unsigned flags, 
				    int *peeked, int *off, int *err);

struct sk_buff *skb_recv_datagram(struct sock *sk, unsigned flags, int noblock,

				  int *err);

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

			   struct poll_table_struct *wait);

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

int skb_copy_datagram_iter(const struct sk_buff *from, int offset,

			   struct iov_iter *to, int size);

static inline int skb_copy_datagram_msg(const struct sk_buff *from, int offset,

include/net/udp.h

+1 −1
Original line number Diff line number Diff line
@@ -276,7 +276,7 @@ int udp_init_sock(struct sock *sk); 
int udp_pre_connect(struct sock *sk, struct sockaddr *uaddr, int addr_len);

int __udp_disconnect(struct sock *sk, int flags);

int udp_disconnect(struct sock *sk, int flags);

__poll_t udp_poll(struct file *file, struct socket *sock, poll_table *wait);

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

struct sk_buff *skb_udp_tunnel_segment(struct sk_buff *skb,

				       netdev_features_t features,

				       bool is_ipv6);