Module Name:	src
Committed By:	mycroft
Date:		Fri Mar  4 05:51:41 UTC 2005

Modified Files:
	src/sys/netinet: tcp_timer.h
	src/sys/sys: callout.h

Log Message:
Re-add callout_active(), in a way compatible with the FreeBSD version, and use
it in the TCP stack to test which of the REXMT or PERSIST timer is in use.
This fixes a race condition that could cause "panic: tcp_output REXMT".  See
tech-net for details.


To generate a diff of this commit:
cvs rdiff -r1.20 -r1.21 src/sys/netinet/tcp_timer.h
cvs rdiff -r1.20 -r1.21 src/sys/sys/callout.h

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