From owner-p4-projects@FreeBSD.ORG  Tue Jul 21 15:09:37 2009
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 3A590106566B; Tue, 21 Jul 2009 15:09:37 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id EE7B01065670
	for <perforce@freebsd.org>; Tue, 21 Jul 2009 15:09:36 +0000 (UTC)
	(envelope-from andre@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id C2AD38FC13
	for <perforce@freebsd.org>; Tue, 21 Jul 2009 15:09:36 +0000 (UTC)
	(envelope-from andre@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n6LF9aiO054474
	for <perforce@freebsd.org>; Tue, 21 Jul 2009 15:09:36 GMT
	(envelope-from andre@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n6LF9ahY054472
	for perforce@freebsd.org; Tue, 21 Jul 2009 15:09:36 GMT
	(envelope-from andre@freebsd.org)
Date: Tue, 21 Jul 2009 15:09:36 GMT
Message-Id: <200907211509.n6LF9ahY054472@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	andre@freebsd.org using -f
From: Andre Oppermann <andre@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 166371 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 21 Jul 2009 15:09:38 -0000

http://perforce.freebsd.org/chv.cgi?CH=166371

Change 166371 by andre@andre_flirtbox on 2009/07/21 15:08:40

	Move initialization of tcp_reass_timeout to tcp_reass_init().
	Remove second argument to m_last().

Affected files ...

.. //depot/projects/tcp_reass/kern/kern_sysctl.c#6 edit
.. //depot/projects/tcp_reass/modules/Makefile#8 edit
.. //depot/projects/tcp_reass/netinet/tcp_reass.c#37 edit

Differences ...

==== //depot/projects/tcp_reass/kern/kern_sysctl.c#6 (text+ko) ====


==== //depot/projects/tcp_reass/modules/Makefile#8 (text+ko) ====

@@ -235,7 +235,6 @@
 	rl \
 	${_s3} \
 	${_safe} \
-	${_sbni} \
 	scc \
 	scd \
 	${_scsi_low} \

==== //depot/projects/tcp_reass/netinet/tcp_reass.c#37 (text+ko) ====

@@ -122,9 +122,9 @@
     &tcp_reass_globalmaxblocks, 0,
     "Global limit of TCP segment blocks in reassembly queue");
 
-static int tcp_reass_timeout = 30 * HZ;
+static int tcp_reass_timeout = 0;
 SYSCTL_PROC(_net_inet_tcp_reass, OID_AUTO, timeout, CTLTYPE_INT|CTLFLAG_RW,
-    &tcp_reass_timeout, NULL, sysctl_msec_to_ticks, "I",
+    &tcp_reass_timeout, 0, sysctl_msec_to_ticks, "I",
     "Reassembly queue flush timeout in milliseconds");
 
 static int tcp_reass_spacetime = 0;
@@ -174,6 +174,7 @@
 	tcp_reass_zone = uma_zcreate("tcpreass", sizeof(struct tcp_reass_block),
 	    NULL, NULL, NULL, NULL, UMA_ALIGN_PTR, 0);
 	uma_zone_set_max(tcp_reass_zone, tcp_reass_globalmaxblocks);
+	tcp_reass_timeout = 30 * hz;
 }
 
 /*
@@ -533,7 +534,7 @@
 		trb->trb_mt->m_next = trbn->trb_m;
 		if (tcp_reass_spacetime) {
 			trb->trb_mt = m_collapse(trb->trb_mt, M_DONTWAIT, 1024);
-			trb->trb_mt = m_last(trb->trb_mt, NULL);
+			trb->trb_mt = m_last(trb->trb_mt);
 		} else
 			trb->trb_mt = trbn->trb_mt;
 	} else if (SEQ_LEQ(trb->trb_seqs, trbn->trb_seqe)) {
@@ -548,7 +549,7 @@
 		trbn->trb_mt->m_next = trb->trb_m;
 		if (tcp_reass_spacetime) {
 			trbn->trb_mt = m_collapse(trbn->trb_mt, M_DONTWAIT, 1024);
-			trb->trb_mt = m_last(trbn->trb_mt, NULL);
+			trb->trb_mt = m_last(trbn->trb_mt);
 		}
 	} else
 		return (NULL);