remove tcp_drain code since it's not longer used; ok henning, feedback thib

1 files changed, 1 insertions, 32 deletions

diff --git a/sys/netinet/tcp_var.h b/sys/netinet/tcp_var.h
index 4322cd9001c..51cf640a800 100644
--- a/sys/netinet/tcp_var.h
+++ b/sys/netinet/tcp_var.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: tcp_var.h,v 1.86 2008/02/20 14:23:31 markus Exp $	*/
+/*	$OpenBSD: tcp_var.h,v 1.87 2008/05/06 08:47:36 markus Exp $	*/
 /*	$NetBSD: tcp_var.h,v 1.17 1996/02/13 23:44:24 christos Exp $	*/
 
 /*
@@ -92,7 +92,6 @@ struct tcpcb {
 #define TF_SEND_CWR	0x00020000	/* send CWR in next seg */
 #define TF_DISABLE_ECN	0x00040000	/* disable ECN for this connection */
 #endif
-#define TF_REASSLOCK	0x00080000	/* reassembling or draining */
 #define TF_LASTIDLE	0x00100000	/* no outstanding ACK on last send */
 #define TF_DEAD		0x00200000	/* dead and to-be-released */
 #define TF_PMTUD_PEND	0x00400000	/* Path MTU Discovery pending */
@@ -302,35 +301,6 @@ struct syn_cache_head {
 	u_short sch_length;			/* # entries in bucket */
 };
 
-static __inline int tcp_reass_lock_try(struct tcpcb *);
-static __inline void tcp_reass_unlock(struct tcpcb *);
-#define tcp_reass_lock(tp) tcp_reass_lock_try(tp)
-
-static __inline int
-tcp_reass_lock_try(struct tcpcb *tp)
-{
-	int s;
-
-	/* Use splvm() due to mbuf allocation. */
-	s = splvm();
-	if (tp->t_flags & TF_REASSLOCK) {
-		splx(s);
-		return (0);
-	}
-	tp->t_flags |= TF_REASSLOCK;
-	splx(s);
-	return (1);
-}
-
-static __inline void
-tcp_reass_unlock(struct tcpcb *tp)
-{
-	int s;
-
-	s = splvm();
-	tp->t_flags &= ~TF_REASSLOCK;
-	splx(s);
-}
 #endif /* _KERNEL */
 
 /*
@@ -594,7 +564,6 @@ struct tcpcb *
 	 tcp_drop(struct tcpcb *, int);
 int	 tcp_dooptions(struct tcpcb *, u_char *, int, struct tcphdr *,
 		struct mbuf *, int, struct tcp_opt_info *);
-void	 tcp_drain(void);
 void	 tcp_init(void);
 #if defined(INET6) && !defined(TCP6)
 int	 tcp6_input(struct mbuf **, int *, int);