From owner-p4-projects@FreeBSD.ORG  Sat Jul 25 10:33:38 2009
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 7C42A1065673; Sat, 25 Jul 2009 10:33:38 +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 38C1F106566B
	for <perforce@freebsd.org>; Sat, 25 Jul 2009 10:33:38 +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 276DC8FC23
	for <perforce@freebsd.org>; Sat, 25 Jul 2009 10:33:38 +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 n6PAXcnj080153
	for <perforce@freebsd.org>; Sat, 25 Jul 2009 10:33:38 GMT
	(envelope-from andre@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n6PAXcTD080151
	for perforce@freebsd.org; Sat, 25 Jul 2009 10:33:38 GMT
	(envelope-from andre@freebsd.org)
Date: Sat, 25 Jul 2009 10:33:38 GMT
Message-Id: <200907251033.n6PAXcTD080151@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 166543 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: Sat, 25 Jul 2009 10:33:39 -0000

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

Change 166543 by andre@andre_t61 on 2009/07/25 10:32:52

	Use SYSCTL_PROC() with sysctl_zonelimit to handle zone limit modifications
	to the reassembly zone.

Affected files ...

.. //depot/projects/tcp_reass/netinet/tcp_reass.c#49 edit

Differences ...

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

@@ -115,8 +115,9 @@
     "Per connection limit of TCP segment blocks in reassembly queue");
 
 static int tcp_reass_globalmaxblocks = 65535;
-SYSCTL_INT(_net_inet_tcp_reass, OID_AUTO, globalmaxblocks, CTLFLAG_RDTUN,
-    &tcp_reass_globalmaxblocks, 0,
+SYSCTL_PROC(_net_inet_tcp_reass, OID_AUTO, globalmaxblocks,
+    CTLTYPE_INT|CTLFLAG_RW|CTLFLAG_TUN, tcp_reass_zone,
+    0, sysctl_zonelimit, "I",
     "Global limit of TCP segment blocks in reassembly queue");
 
 static int tcp_reass_timeout = 0;
@@ -168,7 +169,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;
+	tcp_reass_timeout = 2 * TCPTV_MSL;
 }
 
 /*
@@ -380,8 +381,11 @@
 	else
 		thflags &= ~TH_FIN;
 
-	TCPSTAT_INC(tcps_rcvoopack);
-	TCPSTAT_ADD(tcps_rcvoobyte, len);
+	/* Statistics. */
+	if (tp->rcv_nxt != th_seq) {
+		TCPSTAT_INC(tcps_rcvoopack);
+		TCPSTAT_ADD(tcps_rcvoobyte, len);
+	}
 
 	/*
 	 * Get rid of packet header and mtags.