[NET]: Fix sock_init() return value.

It needs to return zero now that it is an initcall. Also, net/nonet.c no longer needs a dummy sock_init(). Signed-off-by: David S. Miller <[email protected]>
yshchan · Jan 3, 2006 · cbeb321 · cbeb321
1 parent f34fbb9
commit cbeb321
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 5 deletions.
diff --git a/net/nonet.c b/net/nonet.c
@@ -14,11 +14,6 @@
 #include <linux/init.h>
 #include <linux/kernel.h>
 
-void __init sock_init(void)
-{
-	printk(KERN_INFO "Linux NoNET1.0 for Linux 2.6\n");
-}
-
 static int sock_no_open(struct inode *irrelevant, struct file *dontcare)
 {
 	return -ENXIO;

diff --git a/net/socket.c b/net/socket.c
@@ -2063,6 +2063,8 @@ static int __init sock_init(void)
 #ifdef CONFIG_NETFILTER
 	netfilter_init();
 #endif
+
+	return 0;
 }
 
 core_initcall(sock_init);	/* early initcall */