[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 <davem@davemloft.net>

diff --git a/net/nonet.c b/net/nonet.c
index e5241dceaa571d897dfdf2db6c938e6f334af10b..1230f0ae832e9d52bdd50e4411a56e0ebd795510 100644 (file)
--- 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
index 98be7ef3c0866ac91378304f9683eb457c3f6a98..f40957adc7c70886cb4ee598d56096d482b77c19 100644 (file)
--- 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 */