From owner-p4-projects@FreeBSD.ORG  Sat Jul 25 13:12:33 2009
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 914181065672; Sat, 25 Jul 2009 13:12:33 +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 50396106566B
	for <perforce@freebsd.org>; Sat, 25 Jul 2009 13:12:33 +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 3E77A8FC1A
	for <perforce@freebsd.org>; Sat, 25 Jul 2009 13:12:33 +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 n6PDCXnS004877
	for <perforce@freebsd.org>; Sat, 25 Jul 2009 13:12:33 GMT
	(envelope-from andre@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n6PDCXmm004875
	for perforce@freebsd.org; Sat, 25 Jul 2009 13:12:33 GMT
	(envelope-from andre@freebsd.org)
Date: Sat, 25 Jul 2009 13:12:33 GMT
Message-Id: <200907251312.n6PDCXmm004875@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 166553 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 13:12:34 -0000

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

Change 166553 by andre@andre_flirtbox on 2009/07/25 13:12:31

	For sysctl_zonelimit() the zone has to be passed by reference.

Affected files ...

.. //depot/projects/tcp_reass/kern/kern_sysctl.c#9 edit
.. //depot/projects/tcp_reass/netinet/tcp_reass.c#50 edit

Differences ...

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

@@ -972,9 +972,10 @@
 sysctl_zonelimit(SYSCTL_HANDLER_ARGS)
 {
 	int error, nitems;
-	uma_zone_t zone = (uma_zone_t)arg1;
+	uma_zone_t *zone;
+	zone = (uma_zone_t *)arg1;
 
-	nitems = uma_zone_get_max(zone);
+	nitems = uma_zone_get_max(*zone);
 
 	error = sysctl_handle_int(oidp, &nitems, 0, req);
 	if (error || !req->newptr)
@@ -983,7 +984,7 @@
 	if (nitems < 1)
 		return (EINVAL);
 
-	uma_zone_set_max(zone, nitems);
+	uma_zone_set_max(*zone, nitems);
 	return (error);
 }
 

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

@@ -63,7 +63,6 @@
  *
  * TODO:
  * - Improve comments and annotate RFC references.
- * - Resizing of tcp_reass_globalmaxblocks through sysctl.
  * - Style improvements.
  * - Lots of testing.
  */
@@ -99,7 +98,7 @@
 #include <netinet/tcp_var.h>
 #include <netinet/tcpip.h>
 
-VNET_DEFINE(uma_zone_t, tcp_reass_zone);
+uma_zone_t	tcp_reass_zone;
 
 SYSCTL_NODE(_net_inet_tcp, OID_AUTO, reass, CTLFLAG_RW, 0,
     "TCP Segment Reassembly Queue");
@@ -116,8 +115,8 @@
 
 static int tcp_reass_globalmaxblocks = 65535;
 SYSCTL_PROC(_net_inet_tcp_reass, OID_AUTO, globalmaxblocks,
-    CTLTYPE_INT|CTLFLAG_RW|CTLFLAG_TUN, tcp_reass_zone,
-    0, sysctl_zonelimit, "I",
+    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;