Merge with 2.3.99-pre6.

1 files changed, 18 insertions, 19 deletions

diff --git a/net/appletalk/ddp.c b/net/appletalk/ddp.c
index 9a1b18270..e2012cbb3 100644
--- a/net/appletalk/ddp.c
+++ b/net/appletalk/ddp.c
@@ -292,7 +292,7 @@ static int atalk_get_info(char *buffer, char **start, off_t offset, int length)
 		if (pos > offset + length)	/* We have dumped enough */
 			break;
 	}
-	spin_lock_bh(&atalk_sockets_lock);
+	spin_unlock_bh(&atalk_sockets_lock);
 
 	/* The data in question runs from begin to begin+len */
 	*start = buffer + (offset - begin);	/* Start of wanted data */
@@ -2055,24 +2055,23 @@ static struct net_proto_family atalk_family_ops=
 
 static struct proto_ops SOCKOPS_WRAPPED(atalk_dgram_ops)=
 {
-	PF_APPLETALK,
-
-	atalk_release,
-	atalk_bind,
-	atalk_connect,
-	sock_no_socketpair,
-	sock_no_accept,
-	atalk_getname,
-	datagram_poll,
-	atalk_ioctl,
-	sock_no_listen,
-	sock_no_shutdown,
-	sock_no_setsockopt,
-	sock_no_getsockopt,
-	sock_no_fcntl,
-	atalk_sendmsg,
-	atalk_recvmsg,
-	sock_no_mmap
+	family:		PF_APPLETALK,
+
+	release:	atalk_release,
+	bind:		atalk_bind,
+	connect:	atalk_connect,
+	socketpair:	sock_no_socketpair,
+	accept:		sock_no_accept,
+	getname:	atalk_getname,
+	poll:		datagram_poll,
+	ioctl:		atalk_ioctl,
+	listen:		sock_no_listen,
+	shutdown:	sock_no_shutdown,
+	setsockopt:	sock_no_setsockopt,
+	getsockopt:	sock_no_getsockopt,
+	sendmsg:	atalk_sendmsg,
+	recvmsg:	atalk_recvmsg,
+	mmap:		sock_no_mmap,
 };
 
 #include <linux/smp_lock.h>