From 0cc12cc57ecd3cffd54efe8c2c5d779fe5e0d3a9 Mon Sep 17 00:00:00 2001
From: Joerg Wunsch <joerg@FreeBSD.org>
Date: Tue, 16 Sep 1997 18:36:06 +0000
Subject: [PATCH] Make TCPDEBUG a new-style option.

---
 sys/conf/options           | 3 ++-
 sys/netinet/in_proto.c     | 4 +++-
 sys/netinet/tcp_debug.c    | 4 +++-
 sys/netinet/tcp_input.c    | 4 +++-
 sys/netinet/tcp_output.c   | 4 +++-
 sys/netinet/tcp_reass.c    | 4 +++-
 sys/netinet/tcp_subr.c     | 4 +++-
 sys/netinet/tcp_timer.c    | 4 +++-
 sys/netinet/tcp_timewait.c | 4 +++-
 sys/netinet/tcp_usrreq.c   | 4 +++-
 10 files changed, 29 insertions(+), 10 deletions(-)

diff --git a/sys/conf/options b/sys/conf/options
index 083391e24bac..2b035a8ca973 100644
--- a/sys/conf/options
+++ b/sys/conf/options
@@ -1,4 +1,4 @@
-#	$Id: options,v 1.32 1997/08/19 17:05:23 peter Exp $
+#	$Id: options,v 1.33 1997/09/10 03:07:12 peter Exp $
 
 # Format:
 # Option name	filename
@@ -101,3 +101,4 @@ IPFIREWALL_VERBOSE_LIMIT	opt_ipfw.h
 IPFIREWALL_DEFAULT_TO_ACCEPT	opt_ipfw.h
 PPP_BSDCOMP		opt_ppp.h
 PPP_DEFLATE		opt_ppp.h
+TCPDEBUG
diff --git a/sys/netinet/in_proto.c b/sys/netinet/in_proto.c
index cf2cba6ba811..fe70e3716b40 100644
--- a/sys/netinet/in_proto.c
+++ b/sys/netinet/in_proto.c
@@ -31,9 +31,11 @@
  * SUCH DAMAGE.
  *
  *	@(#)in_proto.c	8.2 (Berkeley) 2/9/95
- *	$Id: in_proto.c,v 1.40 1997/05/25 06:09:23 peter Exp $
+ *	$Id: in_proto.c,v 1.41 1997/09/16 11:43:55 bde Exp $
  */
 
+#include "opt_tcpdebug.h"
+
 #include <sys/param.h>
 #include <sys/queue.h>
 #include <sys/kernel.h>
diff --git a/sys/netinet/tcp_debug.c b/sys/netinet/tcp_debug.c
index b90ff6e0f1ff..3b0edd818441 100644
--- a/sys/netinet/tcp_debug.c
+++ b/sys/netinet/tcp_debug.c
@@ -31,9 +31,11 @@
  * SUCH DAMAGE.
  *
  *	@(#)tcp_debug.c	8.1 (Berkeley) 6/10/93
- * $Id: tcp_debug.c,v 1.9 1997/02/22 09:41:37 peter Exp $
+ * $Id: tcp_debug.c,v 1.10 1997/08/02 14:32:55 bde Exp $
  */
 
+#include "opt_tcpdebug.h"
+
 #ifdef TCPDEBUG
 /* load symbolic names */
 #define PRUREQUESTS
diff --git a/sys/netinet/tcp_input.c b/sys/netinet/tcp_input.c
index 14f0754fadd2..1b9f7554a400 100644
--- a/sys/netinet/tcp_input.c
+++ b/sys/netinet/tcp_input.c
@@ -31,9 +31,11 @@
  * SUCH DAMAGE.
  *
  *	@(#)tcp_input.c	8.12 (Berkeley) 5/24/95
- *	$Id: tcp_input.c,v 1.59 1997/07/01 05:42:16 jdp Exp $
+ *	$Id: tcp_input.c,v 1.60 1997/08/16 19:15:39 wollman Exp $
  */
 
+#include "opt_tcpdebug.h"
+
 #ifndef TUBA_INCLUDE
 #include <sys/param.h>
 #include <sys/queue.h>
diff --git a/sys/netinet/tcp_output.c b/sys/netinet/tcp_output.c
index bcaca20ddbf6..5773d9a0697f 100644
--- a/sys/netinet/tcp_output.c
+++ b/sys/netinet/tcp_output.c
@@ -31,9 +31,11 @@
  * SUCH DAMAGE.
  *
  *	@(#)tcp_output.c	8.4 (Berkeley) 5/24/95
- *	$Id: tcp_output.c,v 1.24 1997/04/03 05:14:43 davidg Exp $
+ *	$Id: tcp_output.c,v 1.25 1997/08/02 14:32:56 bde Exp $
  */
 
+#include "opt_tcpdebug.h"
+
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/mbuf.h>
diff --git a/sys/netinet/tcp_reass.c b/sys/netinet/tcp_reass.c
index 14f0754fadd2..1b9f7554a400 100644
--- a/sys/netinet/tcp_reass.c
+++ b/sys/netinet/tcp_reass.c
@@ -31,9 +31,11 @@
  * SUCH DAMAGE.
  *
  *	@(#)tcp_input.c	8.12 (Berkeley) 5/24/95
- *	$Id: tcp_input.c,v 1.59 1997/07/01 05:42:16 jdp Exp $
+ *	$Id: tcp_input.c,v 1.60 1997/08/16 19:15:39 wollman Exp $
  */
 
+#include "opt_tcpdebug.h"
+
 #ifndef TUBA_INCLUDE
 #include <sys/param.h>
 #include <sys/queue.h>
diff --git a/sys/netinet/tcp_subr.c b/sys/netinet/tcp_subr.c
index 4d82dd241767..b13f27476400 100644
--- a/sys/netinet/tcp_subr.c
+++ b/sys/netinet/tcp_subr.c
@@ -31,9 +31,11 @@
  * SUCH DAMAGE.
  *
  *	@(#)tcp_subr.c	8.2 (Berkeley) 5/24/95
- *	$Id: tcp_subr.c,v 1.36 1997/04/03 05:14:44 davidg Exp $
+ *	$Id: tcp_subr.c,v 1.37 1997/09/16 11:43:59 bde Exp $
  */
 
+#include "opt_tcpdebug.h"
+
 #include <sys/param.h>
 #include <sys/queue.h>
 #include <sys/proc.h>
diff --git a/sys/netinet/tcp_timer.c b/sys/netinet/tcp_timer.c
index 63357dd23ae6..e9cb50858dab 100644
--- a/sys/netinet/tcp_timer.c
+++ b/sys/netinet/tcp_timer.c
@@ -31,9 +31,11 @@
  * SUCH DAMAGE.
  *
  *	@(#)tcp_timer.c	8.2 (Berkeley) 5/24/95
- *	$Id: tcp_timer.c,v 1.22 1997/02/22 09:41:42 peter Exp $
+ *	$Id: tcp_timer.c,v 1.23 1997/08/02 14:32:57 bde Exp $
  */
 
+#include "opt_tcpdebug.h"
+
 #ifndef TUBA_INCLUDE
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/netinet/tcp_timewait.c b/sys/netinet/tcp_timewait.c
index 4d82dd241767..b13f27476400 100644
--- a/sys/netinet/tcp_timewait.c
+++ b/sys/netinet/tcp_timewait.c
@@ -31,9 +31,11 @@
  * SUCH DAMAGE.
  *
  *	@(#)tcp_subr.c	8.2 (Berkeley) 5/24/95
- *	$Id: tcp_subr.c,v 1.36 1997/04/03 05:14:44 davidg Exp $
+ *	$Id: tcp_subr.c,v 1.37 1997/09/16 11:43:59 bde Exp $
  */
 
+#include "opt_tcpdebug.h"
+
 #include <sys/param.h>
 #include <sys/queue.h>
 #include <sys/proc.h>
diff --git a/sys/netinet/tcp_usrreq.c b/sys/netinet/tcp_usrreq.c
index 9412727a3923..471f9b5e4f6f 100644
--- a/sys/netinet/tcp_usrreq.c
+++ b/sys/netinet/tcp_usrreq.c
@@ -31,9 +31,11 @@
  * SUCH DAMAGE.
  *
  *	From: @(#)tcp_usrreq.c	8.2 (Berkeley) 1/3/94
- *	$Id: tcp_usrreq.c,v 1.33 1997/08/16 19:15:40 wollman Exp $
+ *	$Id: tcp_usrreq.c,v 1.34 1997/09/14 03:10:40 peter Exp $
  */
 
+#include "opt_tcpdebug.h"
+
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>