From aaabb4938be2f7773e4850c351bfa267c64ff440 Mon Sep 17 00:00:00 2001
From: dbj <dbj@NetBSD.org>
Date: Sun, 1 Oct 2006 22:29:20 +0000
Subject: [PATCH] back out revision 1.144 calculating txsegsizep since it
 unmasks other bugs.  See PR kern/34674

---
 sys/netinet/tcp_output.c | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/sys/netinet/tcp_output.c b/sys/netinet/tcp_output.c
index f4373d844c93..8e2de7d7344b 100644
--- a/sys/netinet/tcp_output.c
+++ b/sys/netinet/tcp_output.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: tcp_output.c,v 1.144 2006/09/28 04:32:47 dbj Exp $	*/
+/*	$NetBSD: tcp_output.c,v 1.145 2006/10/01 22:29:20 dbj Exp $	*/
 
 /*
  * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -142,7 +142,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: tcp_output.c,v 1.144 2006/09/28 04:32:47 dbj Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tcp_output.c,v 1.145 2006/10/01 22:29:20 dbj Exp $");
 
 #include "opt_inet.h"
 #include "opt_ipsec.h"
@@ -397,8 +397,7 @@ tcp_segsize(struct tcpcb *tp, int *txsegsizep, int *rxsegsizep)
 	 * transmit.
 	 */
 	if (so)
-		*txsegsizep = min((so->so_snd.sb_hiwat - 
-			so->so_snd.sb_lowat + 1) >> 1, *txsegsizep);
+		*txsegsizep = min(so->so_snd.sb_hiwat >> 1, *txsegsizep);
 	*rxsegsizep = min(tp->t_ourmss - optlen, size);
 
 	if (*txsegsizep != tp->t_segsz) {