patch-2.4.0-test9 linux/net/ipv4/tcp_input.c

• Lines: 50
• Date: Thu Sep 21 13:20:12 2000
• Orig file: v2.4.0-test8/linux/net/ipv4/tcp_input.c
• Orig date: Thu Sep 7 08:32:01 2000

diff -u --recursive --new-file v2.4.0-test8/linux/net/ipv4/tcp_input.c linux/net/ipv4/tcp_input.c
@@ -5,7 +5,7 @@
  *
  *		Implementation of the Transmission Control Protocol(TCP).
  *
- * Version:	$Id: tcp_input.c,v 1.199 2000/09/06 23:30:29 davem Exp $
+ * Version:	$Id: tcp_input.c,v 1.202 2000/09/21 01:05:38 davem Exp $
  *
  * Authors:	Ross Biro, <bir7@leland.Stanford.Edu>
  *		Fred N. van Kempen, <waltje@uWalt.NL.Mugnet.ORG>
@@ -58,6 +58,7 @@
  *		J Hadi Salim:		ECN support
  */
 
+#include <linux/config.h>
 #include <linux/mm.h>
 #include <linux/sysctl.h>
 #include <net/tcp.h>
@@ -1492,10 +1493,8 @@
 
 		case TCP_CA_Disorder:
 			tcp_try_undo_dsack(sk, tp);
-			if (IsReno(tp) || !tp->undo_marker) {
-				tp->undo_marker = 0;
-				tp->ca_state = TCP_CA_Open;
-			}
+			tp->undo_marker = 0;
+			tp->ca_state = TCP_CA_Open;
 			break;
 
 		case TCP_CA_Recovery:
@@ -1823,7 +1822,9 @@
 #ifdef TCP_DEBUG
 	if (before(tp->snd_una + tp->snd_wnd, tp->snd_nxt)) {
 		if (net_ratelimit())
-			printk(KERN_DEBUG "TCP: peer shrinks window. Bad, what else can I say?\n");
+			printk(KERN_DEBUG "TCP: peer %u.%u.%u.%u:%u/%u shrinks window %u:%u:%u. Bad, what else can I say?\n",
+			       NIPQUAD(sk->daddr), htons(sk->dport), sk->num,
+			       tp->snd_una, tp->snd_wnd, tp->snd_nxt);
 	}
 #endif
 
@@ -1952,7 +1953,7 @@
 				if (opsize < 2) /* "silly options" */
 					return;
 				if (opsize > length)
-					break;	/* don't parse partial options */
+					return;	/* don't parse partial options */
 	  			switch(opcode) {
 				case TCPOPT_MSS:
 					if(opsize==TCPOLEN_MSS && th->syn) {