---

yaml --- r: 214749 b: refs/heads/master c: 768190f h: refs/heads/master i: 214747: 08daaa1 v: v3
git-mirror · Sep 22, 2010 · 24d458b · 24d458b
1 parent 6d317f6
commit 24d458b
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 14 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 40e192c3ff7b1af680b0b03e94cadf1dad5fb82e
+refs/heads/master: 768190fdc058cc7405330f7782782df084c25d61
diff --git a/trunk/net/x25/af_x25.c b/trunk/net/x25/af_x25.c
@@ -925,18 +925,6 @@ static int x25_getname(struct socket *sock, struct sockaddr *uaddr,
 	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,