diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 1998-03-18 17:17:51 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 1998-03-18 17:17:51 +0000 |
| commit | f1382dc4850bb459d24a81c6cb0ef93ea7bd4a79 (patch) | |
| tree | 225271a3d5dcd4e9dea5ee393556abd754c964b1 /net/socket.c | |
| parent | 135b00fc2e90e605ac2a96b20b0ebd93851a3f89 (diff) | |
o Merge with Linux 2.1.90.
o Divide L1 cache sizes by 1024 before printing, makes the numbers a
bit more credible ...
Diffstat (limited to 'net/socket.c')
| -rw-r--r-- | net/socket.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/net/socket.c b/net/socket.c index 5c9534031..dc77ef3e8 100644 --- a/net/socket.c +++ b/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 @@ int sock_create(int family, int type, int protocol, struct socket **res) 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 @@ restart: 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 @@ out: unlock_kernel(); return err; -out_inval: - err = -EINVAL; out_release: sock_release(newsock); goto out_put; |