Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cbeb321a authored by David S. Miller's avatar David S. Miller
Browse files

[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: default avatarDavid S. Miller <davem@davemloft.net>
parent f34fbb97

net/nonet.c

+0 −5
Original line number Diff line number Diff line
@@ -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;

net/socket.c

+2 −0
Original line number Diff line number Diff line
@@ -2063,6 +2063,8 @@ static int __init sock_init(void) 
#ifdef CONFIG_NETFILTER

	netfilter_init();

#endif



	return 0;

}



core_initcall(sock_init);	/* early initcall */