diff options
| author | andrew hendry <andrew.hendry@gmail.com> | 2010-09-21 11:24:45 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-09-22 16:35:51 -0400 |
| commit | 768190fdc058cc7405330f7782782df084c25d61 (patch) | |
| tree | 83c4c8017d771fc3f85bf522a593c6912936b3fd | |
| parent | 40e192c3ff7b1af680b0b03e94cadf1dad5fb82e (diff) | |
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>
| -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: | |||
| 925 | return rc; | 925 | return rc; |
| 926 | } | 926 | } |
| 927 | 927 | ||
| 928 | static unsigned int x25_datagram_poll(struct file *file, struct socket *sock, | ||
| 929 | poll_table *wait) | ||
| 930 | { | ||
| 931 | int rc; | ||
| 932 | |||
| 933 | lock_kernel(); | ||
| 934 | rc = datagram_poll(file, sock, wait); | ||
| 935 | unlock_kernel(); | ||
| 936 | |||
| 937 | return rc; | ||
| 938 | } | ||
| 939 | |||
| 940 | int x25_rx_call_request(struct sk_buff *skb, struct x25_neigh *nb, | 928 | int x25_rx_call_request(struct sk_buff *skb, struct x25_neigh *nb, |
| 941 | unsigned int lci) | 929 | unsigned int lci) |
| 942 | { | 930 | { |
| @@ -1744,7 +1732,7 @@ static const struct proto_ops x25_proto_ops = { | |||
| 1744 | .socketpair = sock_no_socketpair, | 1732 | .socketpair = sock_no_socketpair, |
| 1745 | .accept = x25_accept, | 1733 | .accept = x25_accept, |
| 1746 | .getname = x25_getname, | 1734 | .getname = x25_getname, |
| 1747 | .poll = x25_datagram_poll, | 1735 | .poll = datagram_poll, |
| 1748 | .ioctl = x25_ioctl, | 1736 | .ioctl = x25_ioctl, |
| 1749 | #ifdef CONFIG_COMPAT | 1737 | #ifdef CONFIG_COMPAT |
| 1750 | .compat_ioctl = compat_x25_ioctl, | 1738 | .compat_ioctl = compat_x25_ioctl, |
