Module Name:	src
Committed By:	christos
Date:		Tue Mar 30 19:58:14 UTC 2004

Modified Files:
	src/sys/netinet: tcp_output.c

Log Message:
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.


To generate a diff of this commit:
cvs rdiff -r1.108 -r1.109 src/sys/netinet/tcp_output.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.