[src/netbsd-2-0]: src/sys/netinet Apply patch (requested by christos in ticke...

[tron <tron%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/7058b6ea87ac
branches:  netbsd-2-0
changeset: 564765:7058b6ea87ac
user:      tron <tron%NetBSD.org@localhost>
date:      Fri Apr 22 06:58:40 2005 +0000

description:
Apply patch (requested by christos in ticket #1445):
Fix TCP performance problems introduced in ticket 1401.

diffstat:

 sys/netinet/tcp_input.c |  9 ++++-----
 1 files changed, 4 insertions(+), 5 deletions(-)

diffs (37 lines):

diff -r 6cd56c7608ef -r 7058b6ea87ac sys/netinet/tcp_input.c
--- a/sys/netinet/tcp_input.c   Wed Apr 13 21:53:05 2005 +0000
+++ b/sys/netinet/tcp_input.c   Fri Apr 22 06:58:40 2005 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: tcp_input.c,v 1.190.2.7 2005/04/06 13:48:34 tron Exp $ */
+/*     $NetBSD: tcp_input.c,v 1.190.2.8 2005/04/22 06:58:40 tron Exp $ */
 
 /*
  * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -148,7 +148,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: tcp_input.c,v 1.190.2.7 2005/04/06 13:48:34 tron Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tcp_input.c,v 1.190.2.8 2005/04/22 06:58:40 tron Exp $");
 
 #include "opt_inet.h"
 #include "opt_ipsec.h"
@@ -1502,8 +1502,7 @@
                                 */
                                ++tcpstat.tcps_predack;
                                if (opti.ts_present && opti.ts_ecr)
-                                       tcp_xmit_timer(tp,
-                                         TCP_TIMESTAMP(tp) - opti.ts_ecr + 1);
+                                       tcp_xmit_timer(tp, opti.ts_ecr);
                                else if (tp->t_rtttime &&
                                    SEQ_GT(th->th_ack, tp->t_rtseq))
                                        tcp_xmit_timer(tp,
@@ -2132,7 +2131,7 @@
                 * Recompute the initial retransmit timer.
                 */
                if (opti.ts_present && opti.ts_ecr)
-                       tcp_xmit_timer(tp, TCP_TIMESTAMP(tp) - opti.ts_ecr + 1);
+                       tcp_xmit_timer(tp, opti.ts_ecr);
                else if (tp->t_rtttime && SEQ_GT(th->th_ack, tp->t_rtseq))
                        tcp_xmit_timer(tp, tcp_now - tp->t_rtttime);