mirror of
				https://github.com/torvalds/linux.git
				synced 2025-11-04 02:30:34 +02:00 
			
		
		
		
	[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>
This commit is contained in:
		
							parent
							
								
									f34fbb9713
								
							
						
					
					
						commit
						cbeb321a64
					
				
					 2 changed files with 2 additions and 5 deletions
				
			
		| 
						 | 
					@ -14,11 +14,6 @@
 | 
				
			||||||
#include <linux/init.h>
 | 
					#include <linux/init.h>
 | 
				
			||||||
#include <linux/kernel.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)
 | 
					static int sock_no_open(struct inode *irrelevant, struct file *dontcare)
 | 
				
			||||||
{
 | 
					{
 | 
				
			||||||
	return -ENXIO;
 | 
						return -ENXIO;
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -2063,6 +2063,8 @@ static int __init sock_init(void)
 | 
				
			||||||
#ifdef CONFIG_NETFILTER
 | 
					#ifdef CONFIG_NETFILTER
 | 
				
			||||||
	netfilter_init();
 | 
						netfilter_init();
 | 
				
			||||||
#endif
 | 
					#endif
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
						return 0;
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
core_initcall(sock_init);	/* early initcall */
 | 
					core_initcall(sock_init);	/* early initcall */
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
		Reference in a new issue