From cbeb321a64af5437fbde249605b191ff0fdfa21c Mon Sep 17 00:00:00 2001
From: "David S. Miller" <davem@sunset.davemloft.net>
Date: Thu, 22 Dec 2005 12:58:55 -0800
Subject: [PATCH] [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>
---
net/nonet.c | 5 -----
net/socket.c | 2 ++
2 files changed, 2 insertions(+), 5 deletions(-)
diff --git a/net/nonet.c b/net/nonet.c
index e5241dceaa57..1230f0ae832e 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 98be7ef3c086..f40957adc7c7 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 */
--
GitLab