diff options
| author | andrew hendry <andrew.hendry@gmail.com> | 2010-09-21 15:24:45 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-09-22 13:35:51 -0700 |
| commit | 768190fdc058cc7405330f7782782df084c25d61 (patch) | |
| tree | 83c4c8017d771fc3f85bf522a593c6912936b3fd /net | |
| parent | 40e192c3ff7b1af680b0b03e94cadf1dad5fb82e (diff) | |
| download | linux-768190fdc058cc7405330f7782782df084c25d61.tar.bz2 | |
X.25 remove bkl in poll
The x25_datagram_poll didn't add anything, removed it.
Signed-off-by: Andrew Hendry <andrew.hendry@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
| -rw-r--r-- | 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 dc6767ecdaf8..f7af98dff409 100644 --- a/net/x25/af_x25.c +++ b/net/x25/af_x25.c @@ -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, |