From owner-svn-src-head@FreeBSD.ORG  Tue Oct 28 14:14:57 2008
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 799C11065672;
	Tue, 28 Oct 2008 14:14:57 +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 6A9B48FC08;
	Tue, 28 Oct 2008 14:14:57 +0000 (UTC)
	(envelope-from oleg@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 m9SEEvKI096009;
	Tue, 28 Oct 2008 14:14:57 GMT (envelope-from oleg@svn.freebsd.org)
Received: (from oleg@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id m9SEEvZE096007;
	Tue, 28 Oct 2008 14:14:57 GMT (envelope-from oleg@svn.freebsd.org)
Message-Id: <200810281414.m9SEEvZE096007@svn.freebsd.org>
From: Oleg Bulyzhin <oleg@FreeBSD.org>
Date: Tue, 28 Oct 2008 14:14:57 +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: r184414 - in 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: Tue, 28 Oct 2008 14:14:57 -0000

Author: oleg
Date: Tue Oct 28 14:14:57 2008
New Revision: 184414
URL: http://svn.freebsd.org/changeset/base/184414

Log:
  Type of q_time (start of queue idle time) has changed: uint32_t -> uint64_t.
  This should fix q_time overflow, which happens after 2^32/(86400*hz) days of
  uptime (~50days for hz = 1000).
  q_time overflow cause following:
  - traffic shaping may not work in 'fast' mode (not enabled by default).
  - incorrect average queue length calculation in RED/GRED algorithm.
  
  NB: due to ABI change this change is not applicable to stable.
  
  PR:		kern/128401

Modified:
  head/UPDATING
  head/sys/netinet/ip_dummynet.h

Modified: head/UPDATING
==============================================================================
--- head/UPDATING	Tue Oct 28 13:44:11 2008	(r184413)
+++ head/UPDATING	Tue Oct 28 14:14:57 2008	(r184414)
@@ -22,6 +22,9 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 8.
 	to maximize performance.  (To disable malloc debugging, run
 	ln -s aj /etc/malloc.conf.)
 
+20081028:
+	dummynet(4) ABI has changed. ipfw(8) needs to be recompiled.
+
 20081009:
 	The uhci, ohci, ehci and slhci USB Host controller drivers have
 	been put into separate modules. If you load the usb module

Modified: head/sys/netinet/ip_dummynet.h
==============================================================================
--- head/sys/netinet/ip_dummynet.h	Tue Oct 28 13:44:11 2008	(r184413)
+++ head/sys/netinet/ip_dummynet.h	Tue Oct 28 14:14:57 2008	(r184414)
@@ -216,7 +216,7 @@ struct dn_flow_queue {
     int avg ;                   /* average queue length est. (scaled) */
     int count ;                 /* arrivals since last RED drop */
     int random ;                /* random value (scaled) */
-    u_int32_t q_time ;          /* start of queue idle time */
+    dn_key q_time;		/* start of queue idle time */
 
     /* WF2Q+ support */
     struct dn_flow_set *fs ;	/* parent flow set */