diff options
| author | David S. Miller <davem@sunset.davemloft.net> | 2005-12-22 12:58:55 -0800 |
|---|---|---|
| committer | David S. Miller <davem@sunset.davemloft.net> | 2006-01-03 13:11:17 -0800 |
| commit | cbeb321a64af5437fbde249605b191ff0fdfa21c (patch) | |
| tree | 15a0c109583ee1aeee00bae7086324be03c63f48 /net | |
| parent | f34fbb971368c20f757f8758833a534590b16518 (diff) | |
| download | linux-stable-cbeb321a64af5437fbde249605b191ff0fdfa21c.tar.gz linux-stable-cbeb321a64af5437fbde249605b191ff0fdfa21c.tar.bz2 linux-stable-cbeb321a64af5437fbde249605b191ff0fdfa21c.zip | |
[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>
Diffstat (limited to 'net')
| -rw-r--r-- | net/nonet.c | 5 | ||||
| -rw-r--r-- | 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 */ |