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

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

diff -u --recursive --new-file v2.1.92/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.108 1998/03/29 08:43:51 davem Exp $
+ * Version:	$Id: tcp.c,v 1.110 1998/04/03 09:49:51 freitag Exp $
  *
  * Authors:	Ross Biro, <bir7@leland.Stanford.Edu>
  *		Fred N. van Kempen, <waltje@uWalt.NL.Mugnet.ORG>
@@ -1160,6 +1160,11 @@
 			break;
 		}
 
+		if (sk->shutdown & RCV_SHUTDOWN) {
+			sk->done = 1;
+			break;
+		}
+
 		if (sk->state == TCP_CLOSE) {
 			if (!sk->done) {
 				sk->done = 1;
@@ -1169,11 +1174,6 @@
 			break;
 		}
 
-		if (sk->shutdown & RCV_SHUTDOWN) {
-			sk->done = 1;
-			break;
-		}
-
 		if (nonblock) {
 			copied = -EAGAIN;
 			break;
@@ -1529,7 +1529,7 @@
 	tcp_synq_unlink(tp, req, prev);
 	newsk = req->sk;
 	tcp_openreq_free(req);
-	sk->ack_backlog--;  /* XXX */
+	sk->ack_backlog--; 
 
 	/* FIXME: need to check here if newsk has already
 	 * an soft_err or err set.

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen, slshen@lbl.gov