diff options
| author | Jun-ichiro itojun Hagino <itojun@cvs.openbsd.org> | 2004-06-20 18:16:51 +0000 |
|---|---|---|
| committer | Jun-ichiro itojun Hagino <itojun@cvs.openbsd.org> | 2004-06-20 18:16:51 +0000 |
| commit | be08ad3d22f0423e3500f5e451524e48eb04f7fc (patch) | |
| tree | 0a6e0234d49d85491db045a970d6992c7903ed76 /sys/netinet | |
| parent | 0ba3c390669638266bf33fe8993ef1fbf0f6e407 (diff) | |
remove #ifdef TUBA
Diffstat (limited to 'sys/netinet')
| -rw-r--r-- | sys/netinet/tcp_input.c | 9 | ||||
| -rw-r--r-- | sys/netinet/tcp_output.c | 13 |
2 files changed, 2 insertions, 20 deletions
diff --git a/sys/netinet/tcp_input.c b/sys/netinet/tcp_input.c index c7e594f3dfc..4e444260b28 100644 --- a/sys/netinet/tcp_input.c +++ b/sys/netinet/tcp_input.c @@ -1,4 +1,4 @@ -/* $OpenBSD: tcp_input.c,v 1.173 2004/06/14 08:26:49 dhartmei Exp $ */ +/* $OpenBSD: tcp_input.c,v 1.174 2004/06/20 18:16:50 itojun Exp $ */ /* $NetBSD: tcp_input.c,v 1.23 1996/02/13 23:43:44 christos Exp $ */ /* @@ -68,7 +68,6 @@ * Research Laboratory (NRL). */ -#ifndef TUBA_INCLUDE #include <sys/param.h> #include <sys/systm.h> #include <sys/mbuf.h> @@ -122,7 +121,6 @@ int tcp_ackdrop_ppslim = 100; /* 100pps */ int tcp_ackdrop_ppslim_count = 0; struct timeval tcp_ackdrop_ppslim_last; -#endif /* TUBA_INCLUDE */ #define TCP_PAWS_IDLE (24 * 24 * 60 * 60 * PR_SLOWHZ) /* for modulo comparisons of timestamps */ @@ -182,8 +180,6 @@ do { \ * when segments are out of order (so fast retransmit can work). */ -#ifndef TUBA_INCLUDE - int tcp_reass(tp, th, m, tlen) struct tcpcb *tp; @@ -542,7 +538,6 @@ tcp_input(struct mbuf *m, ...) break; #endif } -#endif /* TUBA_INCLUDE */ /* * Check that TCP offset makes sense, @@ -2164,7 +2159,6 @@ drop: m_freem(m); return; -#ifndef TUBA_INCLUDE } int @@ -3084,7 +3078,6 @@ tcp_mss_update(tp) } } -#endif /* TUBA_INCLUDE */ #if defined (TCP_SACK) /* diff --git a/sys/netinet/tcp_output.c b/sys/netinet/tcp_output.c index 6fecca6ba02..c9f7df5c495 100644 --- a/sys/netinet/tcp_output.c +++ b/sys/netinet/tcp_output.c @@ -1,4 +1,4 @@ -/* $OpenBSD: tcp_output.c,v 1.70 2004/06/08 19:47:24 markus Exp $ */ +/* $OpenBSD: tcp_output.c,v 1.71 2004/06/20 18:16:50 itojun Exp $ */ /* $NetBSD: tcp_output.c,v 1.16 1997/06/03 16:17:09 kml Exp $ */ /* @@ -93,11 +93,6 @@ #include <netinet/tcpip.h> #include <netinet/tcp_debug.h> -#ifdef TUBA -#include <netiso/iso.h> -#include <netiso/tuba_table.h> -#endif - #ifdef INET6 #include <netinet6/tcpipv6.h> #include <netinet6/in6_var.h> @@ -1101,12 +1096,6 @@ send: (so->so_options & SO_DONTROUTE), NULL, NULL); break; #endif /* INET6 */ -#ifdef TUBA - case AF_ISO: - if (tp->t_tuba_pcb) - error = tuba_output(m, tp); - break; -#endif /* TUBA */ } #if defined(TCP_SACK) && defined(TCP_FACK) |