|
@@ -925,18 +925,6 @@ out:
|
|
|
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,
|