patch-2.3.99-pre6 linux/net/econet/af_econet.c

Next file: linux/net/ipv4/af_inet.c
Previous file: linux/net/decnet/sysctl_net_decnet.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.3.99-pre5/linux/net/econet/af_econet.c linux/net/econet/af_econet.c
@@ -705,24 +705,23 @@
 };
 
 static struct proto_ops SOCKOPS_WRAPPED(econet_ops) = {
-	PF_ECONET,
+	family:		PF_ECONET,
 
-	econet_release,
-	econet_bind,
-	sock_no_connect,
-	sock_no_socketpair,
-	sock_no_accept,
-	econet_getname, 
-	datagram_poll,
-	econet_ioctl,
-	sock_no_listen,
-	sock_no_shutdown,
-	sock_no_setsockopt,
-	sock_no_getsockopt,
-	sock_no_fcntl,
-	econet_sendmsg,
-	econet_recvmsg,
-	sock_no_mmap
+	release:	econet_release,
+	bind:		econet_bind,
+	connect:	sock_no_connect,
+	socketpair:	sock_no_socketpair,
+	accept:		sock_no_accept,
+	getname:	econet_getname, 
+	poll:		datagram_poll,
+	ioctl:		econet_ioctl,
+	listen:		sock_no_listen,
+	shutdown:	sock_no_shutdown,
+	setsockopt:	sock_no_setsockopt,
+	getsockopt:	sock_no_getsockopt,
+	sendmsg:	econet_sendmsg,
+	recvmsg:	econet_recvmsg,
+	mmap:		sock_no_mmap,
 };
 
 #include <linux/smp_lock.h>
@@ -1131,7 +1130,7 @@
 #endif
 }
 
-int __init econet_proto_init(struct net_proto *pro)
+int __init econet_proto_init(void)
 {
 	extern void econet_sysctl_register(void);
 	sock_register(&econet_family_ops);

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)