Remove the last traces of TUBA.

Inspired by:	PR kern/3317

5 files changed, 5 insertions, 32 deletions

diff --git a/sys/netinet/tcp_input.c b/sys/netinet/tcp_input.c
index e9cb3c8..e5e8dd4 100644
--- a/sys/netinet/tcp_input.c
+++ b/sys/netinet/tcp_input.c
@@ -31,12 +31,11 @@
  * SUCH DAMAGE.
  *
  *	@(#)tcp_input.c	8.12 (Berkeley) 5/24/95
- *	$Id: tcp_input.c,v 1.70 1998/02/26 05:25:28 dg Exp $
+ *	$Id: tcp_input.c,v 1.71 1998/03/20 00:43:29 fenner Exp $
  */
 
 #include "opt_tcpdebug.h"
 
-#ifndef TUBA_INCLUDE
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
@@ -97,7 +96,6 @@ static void	 tcp_pulloutofband __P((struct socket *,
 static int	 tcp_reass __P((struct tcpcb *, struct tcpiphdr *, struct mbuf *));
 static void	 tcp_xmit_timer __P((struct tcpcb *, int));
 
-#endif /* TUBA_INCLUDE */
 
 /*
  * Insert segment ti into reassembly queue of tcp with
@@ -128,7 +126,6 @@ static void	 tcp_xmit_timer __P((struct tcpcb *, int));
 		tp->t_flags |= TF_ACKNOW; \
 	} \
 }
-#ifndef TUBA_INCLUDE
 
 static int
 tcp_reass(tp, ti, m)
@@ -299,7 +296,6 @@ tcp_input(m, iphlen)
 		tcpstat.tcps_rcvbadsum++;
 		goto drop;
 	}
-#endif /* TUBA_INCLUDE */
 
 	/*
 	 * Check that TCP offset makes sense,
@@ -1689,7 +1685,6 @@ drop:
 	if (dropsocket)
 		(void) soabort(so);
 	return;
-#ifndef TUBA_INCLUDE
 }
 
 static void
@@ -2119,4 +2114,3 @@ tcp_mssopt(tp)
 
 	return rt->rt_ifp->if_mtu - sizeof(struct tcpiphdr);
 }
-#endif /* TUBA_INCLUDE */
diff --git a/sys/netinet/tcp_output.c b/sys/netinet/tcp_output.c
index b63f858..cb7498a 100644
--- a/sys/netinet/tcp_output.c
+++ b/sys/netinet/tcp_output.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)tcp_output.c	8.4 (Berkeley) 5/24/95
- *	$Id: tcp_output.c,v 1.27 1997/10/07 21:10:06 fenner Exp $
+ *	$Id: tcp_output.c,v 1.28 1998/02/20 13:37:39 bde Exp $
  */
 
 #include "opt_tcpdebug.h"
@@ -662,11 +662,6 @@ send:
 	 * the template, but need a way to checksum without them.
 	 */
 	m->m_pkthdr.len = hdrlen + len;
-#ifdef TUBA
-	if (tp->t_tuba_pcb)
-		error = tuba_output(m, tp);
-	else
-#endif
     {
 #if 1
 	struct rtentry *rt;
diff --git a/sys/netinet/tcp_reass.c b/sys/netinet/tcp_reass.c
index e9cb3c8..e5e8dd4 100644
--- a/sys/netinet/tcp_reass.c
+++ b/sys/netinet/tcp_reass.c
@@ -31,12 +31,11 @@
  * SUCH DAMAGE.
  *
  *	@(#)tcp_input.c	8.12 (Berkeley) 5/24/95
- *	$Id: tcp_input.c,v 1.70 1998/02/26 05:25:28 dg Exp $
+ *	$Id: tcp_input.c,v 1.71 1998/03/20 00:43:29 fenner Exp $
  */
 
 #include "opt_tcpdebug.h"
 
-#ifndef TUBA_INCLUDE
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
@@ -97,7 +96,6 @@ static void	 tcp_pulloutofband __P((struct socket *,
 static int	 tcp_reass __P((struct tcpcb *, struct tcpiphdr *, struct mbuf *));
 static void	 tcp_xmit_timer __P((struct tcpcb *, int));
 
-#endif /* TUBA_INCLUDE */
 
 /*
  * Insert segment ti into reassembly queue of tcp with
@@ -128,7 +126,6 @@ static void	 tcp_xmit_timer __P((struct tcpcb *, int));
 		tp->t_flags |= TF_ACKNOW; \
 	} \
 }
-#ifndef TUBA_INCLUDE
 
 static int
 tcp_reass(tp, ti, m)
@@ -299,7 +296,6 @@ tcp_input(m, iphlen)
 		tcpstat.tcps_rcvbadsum++;
 		goto drop;
 	}
-#endif /* TUBA_INCLUDE */
 
 	/*
 	 * Check that TCP offset makes sense,
@@ -1689,7 +1685,6 @@ drop:
 	if (dropsocket)
 		(void) soabort(so);
 	return;
-#ifndef TUBA_INCLUDE
 }
 
 static void
@@ -2119,4 +2114,3 @@ tcp_mssopt(tp)
 
 	return rt->rt_ifp->if_mtu - sizeof(struct tcpiphdr);
 }
-#endif /* TUBA_INCLUDE */
diff --git a/sys/netinet/tcp_timer.c b/sys/netinet/tcp_timer.c
index ac1dedb..65ace37 100644
--- a/sys/netinet/tcp_timer.c
+++ b/sys/netinet/tcp_timer.c
@@ -31,13 +31,12 @@
  * SUCH DAMAGE.
  *
  *	@(#)tcp_timer.c	8.2 (Berkeley) 5/24/95
- *	$Id: tcp_timer.c,v 1.25 1998/01/25 04:23:33 eivind Exp $
+ *	$Id: tcp_timer.c,v 1.26 1998/02/26 05:25:33 dg Exp $
  */
 
 #include "opt_compat.h"
 #include "opt_tcpdebug.h"
 
-#ifndef TUBA_INCLUDE
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
@@ -85,10 +84,6 @@ static int	tcp_keepcnt = TCPTV_KEEPCNT;
 static int	tcp_maxpersistidle = TCPTV_KEEP_IDLE;
 	/* max idle time in persist */
 int	tcp_maxidle;
-#else /* TUBA_INCLUDE */
-
-static	int tcp_maxpersistidle;
-#endif /* TUBA_INCLUDE */
 
 /*
  * Fast timeout routine for processing delayed acks
@@ -180,7 +175,6 @@ tpgone:
 	tcp_now++;					/* for timestamps */
 	splx(s);
 }
-#ifndef TUBA_INCLUDE
 
 /*
  * Cancel all timers for TCP tp.
@@ -380,4 +374,3 @@ tcp_timers(tp, timer)
 	}
 	return (tp);
 }
-#endif /* TUBA_INCLUDE */
diff --git a/sys/netinet/tcp_var.h b/sys/netinet/tcp_var.h
index 71f58073..fdeeecf 100644
--- a/sys/netinet/tcp_var.h
+++ b/sys/netinet/tcp_var.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)tcp_var.h	8.4 (Berkeley) 5/24/95
- * 	$Id: tcp_var.h,v 1.40 1998/01/27 09:15:12 davidg Exp $
+ * 	$Id: tcp_var.h,v 1.41 1998/02/26 05:25:39 dg Exp $
  */
 
 #ifndef _NETINET_TCP_VAR_H_
@@ -131,9 +131,6 @@ struct tcpcb {
 /* RFC 1644 variables */
 	tcp_cc	cc_send;		/* send connection count */
 	tcp_cc	cc_recv;		/* receive connection count */
-
-/* TUBA stuff */
-	caddr_t	t_tuba_pcb;		/* next level down pcb for TCP over z */
 };
 
 /*