diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-04-28 01:09:25 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-04-28 01:09:25 +0000 |
| commit | b9ba7aeb165cffecdffb60aec8c3fa8d590d9ca9 (patch) | |
| tree | 42d07b0c7246ae2536a702e7c5de9e2732341116 /include/net/sock.h | |
| parent | 7406b0a326f2d70ade2671c37d1beef62249db97 (diff) | |
Merge with 2.3.99-pre6.
Diffstat (limited to 'include/net/sock.h')
| -rw-r--r-- | include/net/sock.h | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/include/net/sock.h b/include/net/sock.h index 9b7720969..afeb31bea 100644 --- a/include/net/sock.h +++ b/include/net/sock.h @@ -356,7 +356,10 @@ struct tcp_opt { */ rwlock_t syn_wait_lock; struct tcp_listen_opt *listen_opt; - struct open_request *accept_queue; /* Established children */ + + /* FIFO of established children */ + struct open_request *accept_queue; + struct open_request *accept_queue_tail; int write_pending; /* A write to socket waits to start. */ @@ -597,7 +600,6 @@ struct sock { /* This part is used for the timeout functions. */ - spinlock_t timer_lock; /* Required until timer in core is repaired */ struct timer_list timer; /* This is the sock cleanup timer. */ struct timeval stamp; @@ -818,7 +820,7 @@ extern int sock_no_sendmsg(struct socket *, struct msghdr *, int, struct scm_cookie *); extern int sock_no_recvmsg(struct socket *, - struct msghdr *, int, + struct msghdr *, int, int, struct scm_cookie *); extern int sock_no_mmap(struct file *file, struct socket *sock, |