Module Name:	src
Committed By:	thorpej
Date:		Mon Feb  3 23:51:04 UTC 2003

Modified Files:
	src/sys/dev/scsipi: cd.c scsipi_base.c sd.c st.c
	src/sys/net: bridgestp.c if_ethersubr.c if_pppoe.c
	src/sys/netinet: tcp_timer.c tcp_timer.h

Log Message:
Test callout_pending(), not callout_active(), and eliminate now-unnecessary
callout_deactivate() calls.


To generate a diff of this commit:
cvs rdiff -r1.176 -r1.177 src/sys/dev/scsipi/cd.c
cvs rdiff -r1.83 -r1.84 src/sys/dev/scsipi/scsipi_base.c
cvs rdiff -r1.194 -r1.195 src/sys/dev/scsipi/sd.c
cvs rdiff -r1.158 -r1.159 src/sys/dev/scsipi/st.c
cvs rdiff -r1.2 -r1.3 src/sys/net/bridgestp.c
cvs rdiff -r1.102 -r1.103 src/sys/net/if_ethersubr.c
cvs rdiff -r1.37 -r1.38 src/sys/net/if_pppoe.c
cvs rdiff -r1.61 -r1.62 src/sys/netinet/tcp_timer.c
cvs rdiff -r1.17 -r1.18 src/sys/netinet/tcp_timer.h

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