From owner-svn-src-user@FreeBSD.ORG  Mon Mar 12 20:46:19 2012
Return-Path: <owner-svn-src-user@FreeBSD.ORG>
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 7B95E106564A;
	Mon, 12 Mar 2012 20:46:19 +0000 (UTC)
	(envelope-from andre@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 6B5068FC17;
	Mon, 12 Mar 2012 20:46:19 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q2CKkJBZ086091;
	Mon, 12 Mar 2012 20:46:19 GMT (envelope-from andre@svn.freebsd.org)
Received: (from andre@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q2CKkJBn086089;
	Mon, 12 Mar 2012 20:46:19 GMT (envelope-from andre@svn.freebsd.org)
Message-Id: <201203122046.q2CKkJBn086089@svn.freebsd.org>
From: Andre Oppermann <andre@FreeBSD.org>
Date: Mon, 12 Mar 2012 20:46:19 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r232891 - user/andre/tcp_workqueue/sys/netinet
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the experimental &quot; user&quot;
	src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 12 Mar 2012 20:46:19 -0000

Author: andre
Date: Mon Mar 12 20:46:18 2012
New Revision: 232891
URL: http://svn.freebsd.org/changeset/base/232891

Log:
  Simplify implementation of net.inet.tcp.reass.cursegments.

Modified:
  user/andre/tcp_workqueue/sys/netinet/tcp_reass.c

Modified: user/andre/tcp_workqueue/sys/netinet/tcp_reass.c
==============================================================================
--- user/andre/tcp_workqueue/sys/netinet/tcp_reass.c	Mon Mar 12 20:44:44 2012	(r232890)
+++ user/andre/tcp_workqueue/sys/netinet/tcp_reass.c	Mon Mar 12 20:46:18 2012	(r232891)
@@ -85,11 +85,8 @@ SYSCTL_VNET_INT(_net_inet_tcp_reass, OID
     &VNET_NAME(tcp_reass_maxseg), 0,
     "Global maximum number of TCP Segments in Reassembly Queue");
 
-static VNET_DEFINE(int, tcp_reass_qsize) = 0;
-#define	V_tcp_reass_qsize		VNET(tcp_reass_qsize)
 SYSCTL_VNET_PROC(_net_inet_tcp_reass, OID_AUTO, cursegments,
-    CTLTYPE_INT | CTLFLAG_RD,
-    &VNET_NAME(tcp_reass_qsize), 0, &tcp_reass_sysctl_qsize, "I",
+    (CTLTYPE_INT | CTLFLAG_RD), NULL, 0, &tcp_reass_sysctl_qsize, "I",
     "Global number of TCP Segments currently in Reassembly Queue");
 
 static VNET_DEFINE(int, tcp_reass_overflows) = 0;
@@ -160,8 +157,10 @@ tcp_reass_flush(struct tcpcb *tp)
 static int
 tcp_reass_sysctl_qsize(SYSCTL_HANDLER_ARGS)
 {
-	V_tcp_reass_qsize = uma_zone_get_cur(V_tcp_reass_zone);
-	return (sysctl_handle_int(oidp, arg1, arg2, req));
+	int qsize;
+
+	qsize = uma_zone_get_cur(V_tcp_reass_zone);
+	return (sysctl_handle_int(oidp, &qsize, sizeof(qsize), req));
 }
 
 int