patch-2.2.0-pre3 linux/net/ipv4/tcp_input.c

• Lines: 31
• Date: Thu Dec 31 14:57:59 1998
• Orig file: v2.2.0-pre2/linux/net/ipv4/tcp_input.c
• Orig date: Thu Dec 31 10:29:03 1998

diff -u --recursive --new-file v2.2.0-pre2/linux/net/ipv4/tcp_input.c linux/net/ipv4/tcp_input.c
@@ -2047,27 +2047,16 @@
 
 			/* We got an ack, but it's not a good ack. */
 			if(!tcp_ack(sk,th, TCP_SKB_CB(skb)->seq,
-				    TCP_SKB_CB(skb)->ack_seq, len)) {
-				sk->err = ECONNRESET;
-				sk->state_change(sk);
-				tcp_statistics.TcpAttemptFails++;
+				    TCP_SKB_CB(skb)->ack_seq, len)) 
 				return 1;
-			}
 
 			if(th->rst) {
 				tcp_reset(sk);
 				goto discard;
 			}
 
-			if(!th->syn) {
-				/* A valid ack from a different connection
-				 * start.  Shouldn't happen but cover it.
-				 */
-				sk->err = ECONNRESET;
-				sk->state_change(sk);
-				tcp_statistics.TcpAttemptFails++;
-				return 1;
-			}
+			if(!th->syn) 
+				goto discard;
 
 			/* Ok.. it's good. Set up sequence numbers and
 			 * move to established.