[src/trunk]: src/sys/netinet Make sure we disarm the persist timer before we ...

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

details:   https://anonhg.NetBSD.org/src/rev/131f986a64c2
branches:  trunk
changeset: 565146:131f986a64c2
user:      christos <christos%NetBSD.org@localhost>
date:      Tue Mar 30 19:58:14 2004 +0000

description:
Make sure we disarm the persist timer before we arm the rexmit
timer, otherwise there is a tiny window where both timers are
active, and this is not correct according to the comments in the
code. I believe that this is the cause of the to_ticks <= 0 assertion
failure in callout_schedule() that I've been getting.

diffstat:

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

diffs (31 lines):

diff -r a4d1869d08d6 -r 131f986a64c2 sys/netinet/tcp_output.c
--- a/sys/netinet/tcp_output.c  Tue Mar 30 19:52:02 2004 +0000
+++ b/sys/netinet/tcp_output.c  Tue Mar 30 19:58:14 2004 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: tcp_output.c,v 1.108 2004/03/03 05:59:38 thorpej Exp $ */
+/*     $NetBSD: tcp_output.c,v 1.109 2004/03/30 19:58:14 christos Exp $        */
 
 /*
  * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -138,7 +138,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: tcp_output.c,v 1.108 2004/03/03 05:59:38 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tcp_output.c,v 1.109 2004/03/30 19:58:14 christos Exp $");
 
 #include "opt_inet.h"
 #include "opt_ipsec.h"
@@ -1116,11 +1116,11 @@
                 */
                if (TCP_TIMER_ISARMED(tp, TCPT_REXMT) == 0 &&
                    tp->snd_nxt != tp->snd_una) {
-                       TCP_TIMER_ARM(tp, TCPT_REXMT, tp->t_rxtcur);
                        if (TCP_TIMER_ISARMED(tp, TCPT_PERSIST)) {
                                TCP_TIMER_DISARM(tp, TCPT_PERSIST);
                                tp->t_rxtshift = 0;
                        }
+                       TCP_TIMER_ARM(tp, TCPT_REXMT, tp->t_rxtcur);
                }
        } else
                if (SEQ_GT(tp->snd_nxt + len, tp->snd_max))