patch-2.1.34 linux/net/ipv4/af_inet.c

• Lines: 36
• Date: Mon Apr 14 09:31:10 1997
• Orig file: v2.1.33/linux/net/ipv4/af_inet.c
• Orig date: Fri Apr 4 08:52:28 1997

diff -u --recursive --new-file v2.1.33/linux/net/ipv4/af_inet.c linux/net/ipv4/af_inet.c
@@ -184,7 +184,7 @@
 	 */
 		  
 	printk(KERN_DEBUG "Socket destroy delayed (r=%d w=%d)\n",
-	       sk->rmem_alloc, sk->wmem_alloc);
+	       atomic_read(&sk->rmem_alloc), atomic_read(&sk->wmem_alloc));
 
 	sk->destroy = 1;
 	sk->ack_backlog = 0;
@@ -216,7 +216,7 @@
 	 * structure, otherwise we need to keep it around until
 	 * everything is gone.
 	 */
-	if (sk->rmem_alloc == 0 && sk->wmem_alloc == 0)
+	if (atomic_read(&sk->rmem_alloc) == 0 && atomic_read(&sk->wmem_alloc) == 0)
 		kill_sk_now(sk);
 	else
 		kill_sk_later(sk);
@@ -1057,6 +1057,7 @@
 };
 #endif		/* CONFIG_PROC_FS */
 
+extern void tcp_init(void);
 
 /*
  *	Called by socket.c on kernel startup.  
@@ -1107,6 +1108,9 @@
   	 */
 
 	ip_init();
+
+	/* Setup TCP slab cache for open requests. */
+	tcp_init();
 
 	/*
 	 *	Set the ICMP layer up