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

Commit 17112d80 authored by Christoph Hellwig's avatar Christoph Hellwig
Browse files

net/bluetooth: convert to ->poll_mask 



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

include/net/bluetooth/bluetooth.h

+1 −1
Original line number Diff line number Diff line
@@ -271,7 +271,7 @@ int bt_sock_recvmsg(struct socket *sock, struct msghdr *msg, size_t len, 
		     int flags);

int  bt_sock_stream_recvmsg(struct socket *sock, struct msghdr *msg,

			    size_t len, int flags);

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

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

int  bt_sock_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg);

int  bt_sock_wait_state(struct sock *sk, int state, unsigned long timeo);

int  bt_sock_wait_ready(struct sock *sk, unsigned long flags);

net/bluetooth/af_bluetooth.c

+2 −5
Original line number Diff line number Diff line
@@ -437,16 +437,13 @@ static inline __poll_t bt_accept_poll(struct sock *parent) 
	return 0;

}



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

			  poll_table *wait)

__poll_t bt_sock_poll_mask(struct socket *sock, __poll_t events)

{

	struct sock *sk = sock->sk;

	__poll_t mask = 0;



	BT_DBG("sock %p, sk %p", sock, sk);



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



	if (sk->sk_state == BT_LISTEN)

		return bt_accept_poll(sk);
@@ -478,7 +475,7 @@ __poll_t bt_sock_poll(struct file *file, struct socket *sock, 


	return mask;

}

EXPORT_SYMBOL(bt_sock_poll);

EXPORT_SYMBOL(bt_sock_poll_mask);



int bt_sock_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg)

{

net/bluetooth/l2cap_sock.c

+1 −1
Original line number Diff line number Diff line
@@ -1653,7 +1653,7 @@ static const struct proto_ops l2cap_sock_ops = { 
	.getname	= l2cap_sock_getname,

	.sendmsg	= l2cap_sock_sendmsg,

	.recvmsg	= l2cap_sock_recvmsg,

	.poll		= bt_sock_poll,

	.poll_mask	= bt_sock_poll_mask,

	.ioctl		= bt_sock_ioctl,

	.mmap		= sock_no_mmap,

	.socketpair	= sock_no_socketpair,

net/bluetooth/rfcomm/sock.c

+1 −1
Original line number Diff line number Diff line
@@ -1049,7 +1049,7 @@ static const struct proto_ops rfcomm_sock_ops = { 
	.setsockopt	= rfcomm_sock_setsockopt,

	.getsockopt	= rfcomm_sock_getsockopt,

	.ioctl		= rfcomm_sock_ioctl,

	.poll		= bt_sock_poll,

	.poll_mask	= bt_sock_poll_mask,

	.socketpair	= sock_no_socketpair,

	.mmap		= sock_no_mmap

};

net/bluetooth/sco.c

+1 −1
Original line number Diff line number Diff line
@@ -1197,7 +1197,7 @@ static const struct proto_ops sco_sock_ops = { 
	.getname	= sco_sock_getname,

	.sendmsg	= sco_sock_sendmsg,

	.recvmsg	= sco_sock_recvmsg,

	.poll		= bt_sock_poll,

	.poll_mask	= bt_sock_poll_mask,

	.ioctl		= bt_sock_ioctl,

	.mmap		= sock_no_mmap,

	.socketpair	= sock_no_socketpair,