Merge with 2.3.99-pre6.

2 files changed, 34 insertions, 34 deletions

diff --git a/net/ipx/af_ipx.c b/net/ipx/af_ipx.c
index 9db90b0b8..e4c178560 100644
--- a/net/ipx/af_ipx.c
+++ b/net/ipx/af_ipx.c
@@ -2330,23 +2330,23 @@ static struct net_proto_family ipx_family_ops = {
 };
 
 static struct proto_ops SOCKOPS_WRAPPED(ipx_dgram_ops) = {
-	PF_IPX,
-	ipx_release,
-	ipx_bind,
-	ipx_connect,
-	sock_no_socketpair,
-	sock_no_accept,
-	ipx_getname,
-	datagram_poll,
-	ipx_ioctl,
-	sock_no_listen,
-	sock_no_shutdown, /* FIXME: We have to really support shutdown. */
-	ipx_setsockopt,
-	ipx_getsockopt,
-	sock_no_fcntl,
-	ipx_sendmsg,
-	ipx_recvmsg,
-	sock_no_mmap
+	family:		PF_IPX,
+
+	release:	ipx_release,
+	bind:		ipx_bind,
+	connect:	ipx_connect,
+	socketpair:	sock_no_socketpair,
+	accept:		sock_no_accept,
+	getname:	ipx_getname,
+	poll:		datagram_poll,
+	ioctl:		ipx_ioctl,
+	listen:		sock_no_listen,
+	shutdown:	sock_no_shutdown, /* FIXME: We have to really support shutdown. */
+	setsockopt:	ipx_setsockopt,
+	getsockopt:	ipx_getsockopt,
+	sendmsg:	ipx_sendmsg,
+	recvmsg:	ipx_recvmsg,
+	mmap:		sock_no_mmap,
 };
 
 #include <linux/smp_lock.h>
diff --git a/net/ipx/af_spx.c b/net/ipx/af_spx.c
index 1eb7a725c..75aaaa34a 100644
--- a/net/ipx/af_spx.c
+++ b/net/ipx/af_spx.c
@@ -884,23 +884,23 @@ static int spx_getsockopt(struct socket *sock, int level, int optname,
 }
 
 static struct proto_ops SOCKOPS_WRAPPED(spx_ops) = {
-        PF_IPX,
-        spx_release,
-        spx_bind,
-        spx_connect,
-        sock_no_socketpair,
-        spx_accept,
-	spx_getname,
-        spx_datagram_poll,
-	spx_ioctl,
-        spx_listen,
-        sock_no_shutdown,
-	spx_setsockopt,
-	spx_getsockopt,
-        sock_no_fcntl,
-        spx_sendmsg,
-        spx_recvmsg,
-	sock_no_mmap
+	family:		PF_IPX,
+
+	release:	spx_release,
+	bind:		spx_bind,
+	connect:	spx_connect,
+	socketpair:	sock_no_socketpair,
+	accept:		spx_accept,
+	getname:	spx_getname,
+	poll:		spx_datagram_poll,
+	ioctl:		spx_ioctl,
+	listen:		spx_listen,
+	shutdown:	sock_no_shutdown,
+	setsockopt:	spx_setsockopt,
+	getsockopt:	spx_getsockopt,
+	sendmsg:	spx_sendmsg,
+	recvmsg:	spx_recvmsg,
+	mmap:		sock_no_mmap,
 };
 
 #include <linux/smp_lock.h>