[src/netbsd-1-6]: src/sys/netinet Pull up revision 1.86 (requested by thorpej...

[he <he%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/d6f8dd2d6f3c
branches:  netbsd-1-6
changeset: 529580:d6f8dd2d6f3c
user:      he <he%NetBSD.org@localhost>
date:      Sat Nov 30 14:31:59 2002 +0000

description:
Pull up revision 1.86 (requested by thorpej in ticket #795):
  In the txsegsize bounding code, it is not necessary to adjust
  for the options length.

diffstat:

 sys/netinet/tcp_output.c |  9 ++++-----
 1 files changed, 4 insertions(+), 5 deletions(-)

diffs (33 lines):

diff -r b6390994247e -r d6f8dd2d6f3c sys/netinet/tcp_output.c
--- a/sys/netinet/tcp_output.c  Sat Nov 30 14:27:47 2002 +0000
+++ b/sys/netinet/tcp_output.c  Sat Nov 30 14:31:59 2002 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: tcp_output.c,v 1.79.4.2 2002/11/21 17:48:00 he Exp $   */
+/*     $NetBSD: tcp_output.c,v 1.79.4.3 2002/11/30 14:31:59 he 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.79.4.2 2002/11/21 17:48:00 he Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tcp_output.c,v 1.79.4.3 2002/11/30 14:31:59 he Exp $");
 
 #include "opt_inet.h"
 #include "opt_ipsec.h"
@@ -355,12 +355,11 @@
        /*
         * Never send more than half a buffer full.  This insures that we can
         * always keep 2 packets on the wire, no matter what SO_SNDBUF is, and
-        * therefore ACKs will never be delayed unless we run out of data to
+        * therefore acks will never be delayed unless we run out of data to
         * transmit.
         */
        if (so)
-               *txsegsizep = min((so->so_snd.sb_hiwat >> 1) - optlen,
-                   *txsegsizep);
+               *txsegsizep = min(so->so_snd.sb_hiwat >> 1, *txsegsizep);
        *rxsegsizep = min(tp->t_ourmss - optlen, size);
 
        if (*txsegsizep != tp->t_segsz) {