patch-2.1.20 linux/net/ipv4/tcp_input.c

Next file: linux/net/ipv6/addrconf.c
Previous file: linux/net/ipv4/tcp.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.1.19/linux/net/ipv4/tcp_input.c linux/net/ipv4/tcp_input.c
@@ -567,10 +567,11 @@
 		kfree_skb(skb, FREE_WRITE);
 	}
 
-	if (acked && !sk->dead)
+	if (acked)
 	{
 		tp->retrans_head = NULL;
-		sk->write_space(sk);
+		if (!sk->dead)
+			sk->write_space(sk);
 	}
 	
 	return acked;
@@ -1744,8 +1745,6 @@
 			if (tp->snd_una == sk->write_seq) 
 			{
 				tcp_time_wait(sk);
-				if (!sk->dead) 
-					sk->state_change(sk);
 			}
 			break;
 
@@ -1812,7 +1811,7 @@
 		
 	case TCP_ESTABLISHED:
 		queued = tcp_data(skb, sk, len);
-		break;		
+		break;
 	}
 
 	/*

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