[src/trunk]: src/sys/netinet There is no reason to adjust ts_recent_age for t...

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

details:   https://anonhg.NetBSD.org/src/rev/d3a82da407f4
branches:  trunk
changeset: 573453:d3a82da407f4
user:      mycroft <mycroft%NetBSD.org@localhost>
date:      Thu Jan 27 17:14:04 2005 +0000

description:
There is no reason to adjust ts_recent_age for ts_timebase; it's strictly an
internal variable.

diffstat:

 sys/netinet/tcp_input.c |  12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)

diffs (54 lines):

diff -r ea0ccc7e1373 -r d3a82da407f4 sys/netinet/tcp_input.c
--- a/sys/netinet/tcp_input.c   Thu Jan 27 17:10:07 2005 +0000
+++ b/sys/netinet/tcp_input.c   Thu Jan 27 17:14:04 2005 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: tcp_input.c,v 1.216 2005/01/27 17:10:07 mycroft Exp $  */
+/*     $NetBSD: tcp_input.c,v 1.217 2005/01/27 17:14:04 mycroft 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.216 2005/01/27 17:10:07 mycroft Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tcp_input.c,v 1.217 2005/01/27 17:14:04 mycroft Exp $");
 
 #include "opt_inet.h"
 #include "opt_ipsec.h"
@@ -1536,7 +1536,7 @@
                if (opti.ts_present &&
                    SEQ_LEQ(th->th_seq, tp->last_ack_sent) &&
                    SEQ_LT(tp->last_ack_sent, th->th_seq + tlen)) {
-                       tp->ts_recent_age = TCP_TIMESTAMP(tp);
+                       tp->ts_recent_age = tcp_now;
                        tp->ts_recent = opti.ts_val;
                }
 
@@ -1793,7 +1793,7 @@
            TSTMP_LT(opti.ts_val, tp->ts_recent)) {
 
                /* Check to see if ts_recent is over 24 days old.  */
-               if (TCP_TIMESTAMP(tp) - tp->ts_recent_age > TCP_PAWS_IDLE) {
+               if (tcp_now - tp->ts_recent_age > TCP_PAWS_IDLE) {
                        /*
                         * Invalidate ts_recent.  If this segment updates
                         * ts_recent, the age will be reset later and ts_recent
@@ -1941,7 +1941,7 @@
            SEQ_LEQ(th->th_seq, tp->last_ack_sent) &&
            SEQ_LT(tp->last_ack_sent, th->th_seq + tlen +
                   ((tiflags & (TH_SYN|TH_FIN)) != 0))) {
-               tp->ts_recent_age = TCP_TIMESTAMP(tp);
+               tp->ts_recent_age = tcp_now;
                tp->ts_recent = opti.ts_val;
        }
 
@@ -2821,7 +2821,7 @@
                        if (th->th_flags & TH_SYN) {
                                tp->t_flags |= TF_RCVD_TSTMP;
                                tp->ts_recent = oi->ts_val;
-                               tp->ts_recent_age = TCP_TIMESTAMP(tp);
+                               tp->ts_recent_age = tcp_now;
                        }
                        break;
                case TCPOPT_SACK_PERMITTED: