patch-2.1.24 linux/net/ipv4/tcp_ipv4.c

• Lines: 55
• Date: Mon Jan 27 11:04:48 1997
• Orig file: v2.1.23/linux/net/ipv4/tcp_ipv4.c
• Orig date: Tue Jan 28 18:50:58 1997

diff -u --recursive --new-file v2.1.23/linux/net/ipv4/tcp_ipv4.c linux/net/ipv4/tcp_ipv4.c
@@ -346,7 +346,6 @@
 	struct tcphdr *th = (struct tcphdr*)(dp+(iph->ihl<<2));
 	int type = skb->h.icmph->type;
 	int code = skb->h.icmph->code;
-	struct tcp_opt *tp;
 	struct sock *sk;
 
 	sk = get_sock(&tcp_prot, th->source, iph->daddr, th->dest, iph->saddr);
@@ -356,19 +355,12 @@
 
 	if (type == ICMP_SOURCE_QUENCH)
 	{
-		/*
-		 * FIXME:
-		 * Follow BSD for now and just reduce cong_window to 1 again.
-		 * It is possible that we just want to reduce the
-		 * window by 1/2, or that we want to reduce ssthresh by 1/2
-		 * here as well.
-		 */
-
-		tp = &sk->tp_pinfo.af_tcp;
+		struct tcp_opt *tp = &sk->tp_pinfo.af_tcp;
 
-		sk->cong_window = 1;
+		sk->ssthresh = max(sk->cong_window >> 1, 2);
+		sk->cong_window = sk->ssthresh + 3;
 		tp->high_seq = tp->snd_nxt;
-		
+
 		return;
 	}
 
@@ -629,10 +621,7 @@
 	/* If the socket is dead, don't accept the connection.	*/
 	if (sk->dead)
 	{
-		if(sk->debug)
-		{
-			printk("Reset on %p: Connect on dead socket.\n",sk);
-		}
+		SOCK_DEBUG(sk, "Reset on %p: Connect on dead socket.\n",sk);
 		tcp_statistics.TcpAttemptFails++;
 		return -ENOTCONN;		
 	}
@@ -1229,10 +1218,3 @@
 	0, 0,
 	NULL
 };
-
-/*
- * Local variables:
- *  compile-command: "gcc -D__KERNEL__ -I/usr/src/linux/include -Wall -Wstrict-prototypes -O2 -fomit-frame-pointer -fno-strength-reduce -pipe -m486 -DCPU=486 -c -o tcp_ipv4.o tcp_ipv4.c"
- * c-file-style: "Linux"
- * End:
- */