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/rose | |
| 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/rose')
| -rw-r--r-- | net/rose/af_rose.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/net/rose/af_rose.c b/net/rose/af_rose.c index eeb396350..a575402c7 100644 --- a/net/rose/af_rose.c +++ b/net/rose/af_rose.c @@ -149,7 +149,7 @@ static struct sock *rose_alloc_sock(void) struct sock *sk; rose_cb *rose; - if ((sk = sk_alloc(AF_ROSE, GFP_ATOMIC)) == NULL) + if ((sk = sk_alloc(AF_ROSE, GFP_ATOMIC, 1)) == NULL) return NULL; if ((rose = kmalloc(sizeof(*rose), GFP_ATOMIC)) == NULL) { @@ -847,6 +847,8 @@ static int rose_accept(struct socket *sock, struct socket *newsock, int flags) newsk = skb->sk; newsk->pair = NULL; + newsk->socket = newsock; + newsk->sleep = &newsock->wait; sti(); /* Now attach up the new socket */ |