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

Commit 768190fd authored by andrew hendry's avatar andrew hendry Committed by David S. Miller
Browse files

X.25 remove bkl in poll 



The x25_datagram_poll didn't add anything, removed it.

Signed-off-by: default avatarAndrew Hendry <andrew.hendry@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 40e192c3

net/x25/af_x25.c

+1 −13
Original line number Diff line number Diff line
@@ -925,18 +925,6 @@ static int x25_getname(struct socket *sock, struct sockaddr *uaddr, 
	return rc;

}



static unsigned int x25_datagram_poll(struct file *file, struct socket *sock,

			   poll_table *wait)

{

	int rc;



	lock_kernel();

	rc = datagram_poll(file, sock, wait);

	unlock_kernel();



	return rc;

}



int x25_rx_call_request(struct sk_buff *skb, struct x25_neigh *nb,

			unsigned int lci)

{
@@ -1744,7 +1732,7 @@ static const struct proto_ops x25_proto_ops = { 
	.socketpair =	sock_no_socketpair,

	.accept =	x25_accept,

	.getname =	x25_getname,

	.poll =		x25_datagram_poll,

	.poll =		datagram_poll,

	.ioctl =	x25_ioctl,

#ifdef CONFIG_COMPAT

	.compat_ioctl = compat_x25_ioctl,