[src/trunk]: src/sys/netinet From PR #3733: Only disarm timer if SYN containe...

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

details:   https://anonhg.NetBSD.org/src/rev/e1214925f122
branches:  trunk
changeset: 485779:e1214925f122
user:      matt <matt%NetBSD.org@localhost>
date:      Fri May 05 14:51:46 2000 +0000

description:
>From PR #3733: Only disarm timer if SYN contained the ACK bit since if
it didn't it would be a crossing/simultaneous SYN and doesn't mean the
remote TCP received our SYN.

diffstat:

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

diffs (19 lines):

diff -r 525a8ac05826 -r e1214925f122 sys/netinet/tcp_input.c
--- a/sys/netinet/tcp_input.c   Fri May 05 14:19:25 2000 +0000
+++ b/sys/netinet/tcp_input.c   Fri May 05 14:51:46 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: tcp_input.c,v 1.106 2000/03/30 13:25:05 augustss Exp $ */
+/*     $NetBSD: tcp_input.c,v 1.107 2000/05/05 14:51:46 matt Exp $     */
 
 /*
 %%% portions-copyright-nrl-95
@@ -1352,8 +1352,8 @@
                        tp->snd_una = tp->snd_recover = th->th_ack;
                        if (SEQ_LT(tp->snd_nxt, tp->snd_una))
                                tp->snd_nxt = tp->snd_una;
+                       TCP_TIMER_DISARM(tp, TCPT_REXMT);
                }
-               TCP_TIMER_DISARM(tp, TCPT_REXMT);
                tp->irs = th->th_seq;
                tcp_rcvseqinit(tp);
                tp->t_flags |= TF_ACKNOW;