patch-2.1.90 linux/net/socket.c

• Lines: 38
• Date: Tue Mar 10 14:49:26 1998
• Orig file: v2.1.89/linux/net/socket.c
• Orig date: Tue Mar 10 10:03:37 1998

diff -u --recursive --new-file v2.1.89/linux/net/socket.c linux/net/socket.c
@@ -76,8 +76,8 @@
 #include <linux/init.h>
 #include <linux/poll.h>
 
-#if defined(CONFIG_KERNELD) && defined(CONFIG_NET)
-#include <linux/kerneld.h>
+#if defined(CONFIG_KMOD) && defined(CONFIG_NET)
+#include <linux/kmod.h>
 #endif
 
 #include <asm/system.h>
@@ -577,7 +577,7 @@
 	if(family<0||family>=NPROTO)
 		return -EINVAL;
 		
-#if defined(CONFIG_KERNELD) && defined(CONFIG_NET)
+#if defined(CONFIG_KMOD) && defined(CONFIG_NET)
 	/* Attempt to load a protocol module if the find failed. 
 	 * 
 	 * 12/09/1996 Marcin: But! this makes REALLY only sense, if the user 
@@ -814,7 +814,7 @@
 	newsock = socki_lookup(inode);
 
 	if ((err = get_fd(inode)) < 0) 
-		goto out_inval;
+		goto out_release;
 	newsock->file = current->files->fd[err];
 
 	if (upeer_sockaddr)
@@ -835,8 +835,6 @@
 	unlock_kernel();
 	return err;
 
-out_inval:
-	err = -EINVAL;
 out_release:
 	sock_release(newsock);
 	goto out_put;