From: David S. Miller <davem@sunset.davemloft.net>
Date: Thu, 22 Dec 2005 20:58:55 +0000 (-0800)
Subject: [NET]: Fix sock_init() return value.
X-Git-Tag: upstream/snapshot3+hdmi~43593^2~16^2~34^2~30
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=cbeb321a64af5437fbde249605b191ff0fdfa21c;p=platform%2Fadaptation%2Frenesas_rcar%2Frenesas_kernel.git

[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 e5241dc..1230f0a 100644
--- 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 98be7ef..f40957a 100644
--- 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 */