diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-08-29 05:27:07 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-08-29 05:27:07 +0000 |
| commit | a60c6812feb6ba35b5b8a9ee8a5ca3d01d1fcd5f (patch) | |
| tree | 2290ff15f280314a063f3dfc523742c8934c4259 /net/socket.c | |
| parent | 1a1d77dd589de5a567fa95e36aa6999c704ceca4 (diff) | |
Merge with Linux 2.4.0-test8-pre1.
Diffstat (limited to 'net/socket.c')
| -rw-r--r-- | net/socket.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/net/socket.c b/net/socket.c index 015630d2e..5691718c9 100644 --- a/net/socket.c +++ b/net/socket.c @@ -855,7 +855,7 @@ int sock_create(int family, int type, int protocol, struct socket **res) net_family_read_lock(); if (net_families[family] == NULL) { - i = -EINVAL; + i = -EAFNOSUPPORT; goto out; } @@ -1710,10 +1710,9 @@ void __init sock_init(void) * Initialize the protocols module. */ - proto_init(); - register_filesystem(&sock_fs_type); sock_mnt = kern_mount(&sock_fs_type); + proto_init(); /* * The netlink device handler may be needed early. |