* [PATCH 2/2] X.25 remove bkl in poll
@ 2010-09-22 1:24 Andrew Hendry
2010-09-22 20:36 ` David Miller
0 siblings, 1 reply; 2+ messages in thread
From: Andrew Hendry @ 2010-09-22 1:24 UTC (permalink / raw)
To: netdev
The x25_datagram_poll didn't add anything, removed it.
Signed-off-by: Andrew Hendry <andrew.hendry@gmail.com>
---
net/x25/af_x25.c | 14 +-------------
1 files changed, 1 insertions(+), 13 deletions(-)
diff --git a/net/x25/af_x25.c b/net/x25/af_x25.c
index 4ebde0d..b371a47 100644
--- a/net/x25/af_x25.c
+++ b/net/x25/af_x25.c
@@ -923,18 +923,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)
{
@@ -1742,7 +1730,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,
--
1.7.0.4
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH 2/2] X.25 remove bkl in poll
2010-09-22 1:24 [PATCH 2/2] X.25 remove bkl in poll Andrew Hendry
@ 2010-09-22 20:36 ` David Miller
0 siblings, 0 replies; 2+ messages in thread
From: David Miller @ 2010-09-22 20:36 UTC (permalink / raw)
To: andrew.hendry; +Cc: netdev
From: Andrew Hendry <andrew.hendry@gmail.com>
Date: Wed, 22 Sep 2010 11:24:45 +1000
> The x25_datagram_poll didn't add anything, removed it.
>
> Signed-off-by: Andrew Hendry <andrew.hendry@gmail.com>
Applied.
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2010-09-22 20:36 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-09-22 1:24 [PATCH 2/2] X.25 remove bkl in poll Andrew Hendry
2010-09-22 20:36 ` David Miller
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).