From 69c130ff3d4c3d699ce33714e606f0b6f7f4c1d9 Mon Sep 17 00:00:00 2001
From: ru <ru@FreeBSD.org>
Date: Wed, 11 Apr 2007 14:08:42 +0000
Subject: [PATCH] Make "struct tcp_timer" visible only to the kernel, and
 unbreak world.

---
 sys/netinet/tcp_timer.h | 25 +++++++++++++------------
 1 file changed, 13 insertions(+), 12 deletions(-)

diff --git a/sys/netinet/tcp_timer.h b/sys/netinet/tcp_timer.h
index 1c801ad8f87c..e723ea36156c 100644
--- a/sys/netinet/tcp_timer.h
+++ b/sys/netinet/tcp_timer.h
@@ -128,6 +128,19 @@ static const char *tcptimers[] =
     { "REXMT", "PERSIST", "KEEP", "2MSL" };
 #endif
 
+/*
+ * Force a time value to be in a certain range.
+ */
+#define	TCPT_RANGESET(tv, value, tvmin, tvmax) do { \
+	(tv) = (value) + tcp_rexmit_slop; \
+	if ((u_long)(tv) < (u_long)(tvmin)) \
+		(tv) = (tvmin); \
+	if ((u_long)(tv) > (u_long)(tvmax)) \
+		(tv) = (tvmax); \
+} while(0)
+
+#ifdef _KERNEL
+
 struct tcp_timer {
 	struct callout	tt_timer;
 	int		tt_nextc;	/* next callout time in time_uptime */
@@ -144,18 +157,6 @@ struct tcp_timer {
 	int             tt_2msl;
 };
 
-/*
- * Force a time value to be in a certain range.
- */
-#define	TCPT_RANGESET(tv, value, tvmin, tvmax) do { \
-	(tv) = (value) + tcp_rexmit_slop; \
-	if ((u_long)(tv) < (u_long)(tvmin)) \
-		(tv) = (tvmin); \
-	if ((u_long)(tv) > (u_long)(tvmax)) \
-		(tv) = (tvmax); \
-} while(0)
-
-#ifdef _KERNEL
 extern int tcp_keepinit;		/* time to establish connection */
 extern int tcp_keepidle;		/* time before keepalive probes begin */
 extern int tcp_keepintvl;		/* time between keepalive probes */