In the txsegsize bounding code, it is not necessary to adjust for the options

length.
This commit is contained in:
mycroft 2002-09-13 18:26:55 +00:00
parent 42321e369a
commit 129af72834
1 changed files with 4 additions and 5 deletions

View File

@ -1,4 +1,4 @@
/* $NetBSD: tcp_output.c,v 1.85 2002/08/20 16:29:42 thorpej Exp $ */
/* $NetBSD: tcp_output.c,v 1.86 2002/09/13 18:26:55 mycroft 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.85 2002/08/20 16:29:42 thorpej Exp $");
__KERNEL_RCSID(0, "$NetBSD: tcp_output.c,v 1.86 2002/09/13 18:26:55 mycroft Exp $");
#include "opt_inet.h"
#include "opt_ipsec.h"
@ -358,12 +358,11 @@ tcp_segsize(struct tcpcb *tp, int *txsegsizep, int *rxsegsizep)
/*
* 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) {