| Message ID | 1285118685.28503.46.camel@jaunty |
|---|---|
| State | Accepted, archived |
| Delegated to: | David Miller |
| Headers | show |
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. -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
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,
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(-)