From owner-svn-src-all@FreeBSD.ORG  Tue Dec 28 12:18:46 2010
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id E3685106566C;
	Tue, 28 Dec 2010 12:18:46 +0000 (UTC)
	(envelope-from oleg@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id D2C658FC13;
	Tue, 28 Dec 2010 12:18:46 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id oBSCIkSi061625;
	Tue, 28 Dec 2010 12:18:46 GMT (envelope-from oleg@svn.freebsd.org)
Received: (from oleg@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id oBSCIkPc061623;
	Tue, 28 Dec 2010 12:18:46 GMT (envelope-from oleg@svn.freebsd.org)
Message-Id: <201012281218.oBSCIkPc061623@svn.freebsd.org>
From: Oleg Bulyzhin <oleg@FreeBSD.org>
Date: Tue, 28 Dec 2010 12:18:46 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-releng@freebsd.org
X-SVN-Group: releng
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r216759 - releng/8.2/sys/netinet/ipfw
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 28 Dec 2010 12:18:47 -0000

Author: oleg
Date: Tue Dec 28 12:18:46 2010
New Revision: 216759
URL: http://svn.freebsd.org/changeset/base/216759

Log:
  MFC r213265:
  
  Fix handling of initial credit for an idle pipe.  This fixes the bug where
  setting bw > 1 MTU/tick resulted in infinite bandwidth if io_fast=1
  
  PR:		kern/147245, kern/148429
  Obtained from:	Riccardo Panicucci
  Approved by:	re (bz)

Modified:
  releng/8.2/sys/netinet/ipfw/ip_dn_io.c
Directory Properties:
  releng/8.2/sys/   (props changed)
  releng/8.2/sys/amd64/include/xen/   (props changed)
  releng/8.2/sys/cddl/contrib/opensolaris/   (props changed)
  releng/8.2/sys/contrib/dev/acpica/   (props changed)
  releng/8.2/sys/contrib/pf/   (props changed)

Modified: releng/8.2/sys/netinet/ipfw/ip_dn_io.c
==============================================================================
--- releng/8.2/sys/netinet/ipfw/ip_dn_io.c	Tue Dec 28 12:13:30 2010	(r216758)
+++ releng/8.2/sys/netinet/ipfw/ip_dn_io.c	Tue Dec 28 12:18:46 2010	(r216759)
@@ -742,8 +742,11 @@ dummynet_io(struct mbuf **m0, int dir, s
 	}
 
 	/* compute the initial allowance */
-	{
+	if (si->idle_time < dn_cfg.curr_time) {
+	    /* Do this only on the first packet on an idle pipe */
 	    struct dn_link *p = &fs->sched->link;
+
+	    si->sched_time = dn_cfg.curr_time;
 	    si->credit = dn_cfg.io_fast ? p->bandwidth : 0;
 	    if (p->burst) {
 		uint64_t burst = (dn_cfg.curr_time - si->idle_time) * p->bandwidth;