From owner-svn-src-head@FreeBSD.ORG  Sat Sep 18 21:45:12 2010
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 8B35D1065696
	for <svn-src-head@freebsd.org>; Sat, 18 Sep 2010 21:45:12 +0000 (UTC)
	(envelope-from andre@freebsd.org)
Received: from c00l3r.networx.ch (c00l3r.networx.ch [62.48.2.2])
	by mx1.freebsd.org (Postfix) with ESMTP id F10B18FC1B
	for <svn-src-head@freebsd.org>; Sat, 18 Sep 2010 21:45:11 +0000 (UTC)
Received: (qmail 27080 invoked from network); 18 Sep 2010 21:39:21 -0000
Received: from localhost (HELO [127.0.0.1]) ([127.0.0.1])
	(envelope-sender <andre@freebsd.org>)
	by c00l3r.networx.ch (qmail-ldap-1.03) with SMTP
	for <bz@FreeBSD.org>; 18 Sep 2010 21:39:21 -0000
Message-ID: <4C9532E7.8090904@freebsd.org>
Date: Sat, 18 Sep 2010 23:45:11 +0200
From: Andre Oppermann <andre@freebsd.org>
User-Agent: Mozilla/5.0 (Windows; U; Windows NT 5.1; en-US;
	rv:1.9.2.9) Gecko/20100825 Thunderbird/3.1.3
MIME-Version: 1.0
To: "Bjoern A. Zeeb" <bz@FreeBSD.org>
References: <201009172205.o8HM5RPG043265@svn.freebsd.org>
	<20100918113224.J31898@maildrop.int.zabbadoz.net>
In-Reply-To: <20100918113224.J31898@maildrop.int.zabbadoz.net>
Content-Type: text/plain; charset=ISO-8859-1; format=flowed
Content-Transfer-Encoding: 7bit
Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org,
	src-committers@freebsd.org
Subject: Re: svn commit: r212803 - head/sys/netinet
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 18 Sep 2010 21:45:12 -0000

On 18.09.2010 13:34, Bjoern A. Zeeb wrote:
> On Fri, 17 Sep 2010, Andre Oppermann wrote:
>> @@ -487,22 +482,15 @@ after_sack_rexmit:
>> */
>> ipsec_optlen = ipsec_hdrsiz_tcp(tp);
>> #endif
>> - if (len > tp->t_maxseg) {
>> - if ((tp->t_flags & TF_TSO) && V_tcp_do_tso &&
>> - ((tp->t_flags & TF_SIGNATURE) == 0) &&
>> - tp->rcv_numsacks == 0 && sack_rxmit == 0 &&
>> - tp->t_inpcb->inp_options == NULL &&
>> - tp->t_inpcb->in6p_options == NULL
>> + if ((tp->t_flags & TF_TSO) && V_tcp_do_tso && len > tp->t_maxseg &&
>> + ((tp->t_flags & TF_SIGNATURE) == 0) &&
>> + tp->rcv_numsacks == 0 && sack_rxmit == 0 &&
>> #ifdef IPSEC
>> - && ipsec_optlen == 0
>> + ipsec_optlen == 0 &&
>> #endif
>> - ) {
>> - tso = 1;
>> - } else {
>> - len = tp->t_maxseg;
>> - sendalot = 1;
>> - }
>> - }
>> + tp->t_inpcb->inp_options == NULL &&
>> + tp->t_inpcb->in6p_options == NULL)
>> + tso = 1;
>
> In the non-TSO case you are no longer reducing len to tp->t_maxseg
> here, if it's larger, which I think breaks asssumptions all the way down.

No assumptions are broken for the non-TSO case.  The value of len is
only tested against t_maxseg for being equal or grater.  This always
hold true.  When the decision to send has been made len is correctly
limited in the non-TSO and TSO case.  Before it was a bit of either
was done in both places.  That is now merged into one spot.

-- 
Andre