diff options
author | David S. Miller <davem@sunset.davemloft.net> | 2005-12-22 21:58:55 +0100 |
---|---|---|
committer | David S. Miller <davem@sunset.davemloft.net> | 2006-01-03 22:11:17 +0100 |
commit | cbeb321a64af5437fbde249605b191ff0fdfa21c (patch) | |
tree | 15a0c109583ee1aeee00bae7086324be03c63f48 /net/socket.c | |
parent | [PKTGEN]: Deinitialise static variables. (diff) | |
download | linux-cbeb321a64af5437fbde249605b191ff0fdfa21c.tar.xz linux-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/socket.c')
-rw-r--r-- | net/socket.c | 2 |
1 files changed, 2 insertions, 0 deletions
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 */ |