From owner-svn-src-head@FreeBSD.ORG  Fri Feb 20 14:33:45 2009
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 8DD781065676;
	Fri, 20 Feb 2009 14:33:45 +0000 (UTC) (envelope-from rrs@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 7BB178FC12;
	Fri, 20 Feb 2009 14:33:45 +0000 (UTC) (envelope-from rrs@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n1KEXjcO031368;
	Fri, 20 Feb 2009 14:33:45 GMT (envelope-from rrs@svn.freebsd.org)
Received: (from rrs@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n1KEXjTq031367;
	Fri, 20 Feb 2009 14:33:45 GMT (envelope-from rrs@svn.freebsd.org)
Message-Id: <200902201433.n1KEXjTq031367@svn.freebsd.org>
From: Randall Stewart <rrs@FreeBSD.org>
Date: Fri, 20 Feb 2009 14:33:45 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r188852 - 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: Fri, 20 Feb 2009 14:33:46 -0000

Author: rrs
Date: Fri Feb 20 14:33:45 2009
New Revision: 188852
URL: http://svn.freebsd.org/changeset/base/188852

Log:
  Fix a bug. The sending was being restricted improperly by
  the max_burst. It should only be gated by cwnd in the
  lower level send.
  
  Obtained from:	Michael Tuexen
  MFC after:	1 week.

Modified:
  head/sys/netinet/sctp_output.c

Modified: head/sys/netinet/sctp_output.c
==============================================================================
--- head/sys/netinet/sctp_output.c	Fri Feb 20 14:28:56 2009	(r188851)
+++ head/sys/netinet/sctp_output.c	Fri Feb 20 14:33:45 2009	(r188852)
@@ -15014,7 +15014,7 @@ skip_preblock:
 			} else {
 				un_sent = ((stcb->asoc.total_output_queue_size - stcb->asoc.total_flight) +
 				    (stcb->asoc.stream_queue_cnt * sizeof(struct sctp_data_chunk)));
-				if (net->flight_size > (net->mtu * stcb->asoc.max_burst)) {
+				if (net->flight_size > net->cwnd) {
 					queue_only = 1;
 					SCTP_STAT_INCR(sctps_send_burst_avoid);
 				} else if (net->flight_size > net->cwnd) {
@@ -15291,7 +15291,7 @@ skip_out_eof:
 	} else {
 		un_sent = ((stcb->asoc.total_output_queue_size - stcb->asoc.total_flight) +
 		    (stcb->asoc.stream_queue_cnt * sizeof(struct sctp_data_chunk)));
-		if (net->flight_size > (net->mtu * stcb->asoc.max_burst)) {
+		if (net->flight_size > net->cwnd) {
 			queue_only = 1;
 			SCTP_STAT_INCR(sctps_send_burst_avoid);
 		} else if (net->flight_size > net->cwnd) {