patch-2.1.37 linux/net/socket.c

Next file: linux/net/unix/af_unix.c
Previous file: linux/net/rose/sysctl_net_rose.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.1.36/linux/net/socket.c linux/net/socket.c
@@ -71,6 +71,7 @@
 #include <linux/proc_fs.h>
 #include <linux/firewall.h>
 #include <linux/wanrouter.h>
+#include <linux/init.h>
 
 #if defined(CONFIG_KERNELD) && defined(CONFIG_NET)
 #include <linux/kerneld.h>
@@ -207,7 +208,6 @@
 		file->f_op = &socket_file_ops;
 		file->f_mode = 3;
 		file->f_flags = O_RDWR;
-		file->f_count = 1;
 		file->f_inode = inode;
 		if (inode) 
 			inode->i_count++;
@@ -1400,7 +1400,7 @@
 	return 0;
 }
 
-void proto_init(void)
+__initfunc(void proto_init(void))
 {
 	extern struct net_proto protocols[];	/* Network protocols */
 	struct net_proto *pro;
@@ -1417,7 +1417,7 @@
 
 extern void sk_init(void);
 
-void sock_init(void)
+__initfunc(void sock_init(void))
 {
 	int i;
 

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen, slshen@lbl.gov