patch-2.3.99-pre6 linux/include/net/sock.h

Next file: linux/include/net/tcp.h
Previous file: linux/include/net/dn.h
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.3.99-pre5/linux/include/net/sock.h linux/include/net/sock.h
@@ -356,7 +356,10 @@
 	 */
 	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 @@
 
 
 	/* 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 @@
 						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,

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)