patch-2.3.9 linux/net/ipv4/tcp.c

Next file: linux/net/ipv4/udp.c
Previous file: linux/net/ipv4/ipconfig.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.3.8/linux/net/ipv4/tcp.c linux/net/ipv4/tcp.c
@@ -5,7 +5,7 @@
  *
  *		Implementation of the Transmission Control Protocol(TCP).
  *
- * Version:	$Id: tcp.c,v 1.144 1999/05/27 01:03:37 davem Exp $
+ * Version:	$Id: tcp.c,v 1.145 1999/06/29 12:35:56 davem Exp $
  *
  * Authors:	Ross Biro, <bir7@leland.Stanford.Edu>
  *		Fred N. van Kempen, <waltje@uWalt.NL.Mugnet.ORG>
@@ -749,7 +749,6 @@
 	int mss_now;
 	int err, copied;
 
-	unlock_kernel();
 	lock_sock(sk);
 
 	err = 0;
@@ -976,7 +975,6 @@
 out:
 	tcp_push_pending_frames(sk, tp);
 	release_sock(sk);
-	lock_kernel();
 	return err;
 }
 
@@ -1156,7 +1154,6 @@
 	if (flags & MSG_WAITALL)
 		target=len;
 
-	unlock_kernel();
 	add_wait_queue(sk->sleep, &wait);
 	lock_sock(sk);
 	
@@ -1355,7 +1352,6 @@
 	/* Clean up data we have read: This will do ACK frames. */
 	cleanup_rbuf(sk, copied);
 	release_sock(sk);
-	lock_kernel();
 	return copied;
 }
 

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