From owner-svn-src-all@FreeBSD.ORG Tue Mar 4 14:05:38 2014 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id D551B81B; Tue, 4 Mar 2014 14:05:38 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id B4A1A9D3; Tue, 4 Mar 2014 14:05:38 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s24E5cRH034766; Tue, 4 Mar 2014 14:05:38 GMT (envelope-from glebius@svn.freebsd.org) Received: (from glebius@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s24E5cmG034763; Tue, 4 Mar 2014 14:05:38 GMT (envelope-from glebius@svn.freebsd.org) Message-Id: <201403041405.s24E5cmG034763@svn.freebsd.org> From: Gleb Smirnoff Date: Tue, 4 Mar 2014 14:05:38 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r262735 - in stable/10/sys: net netinet netinet/cc X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 04 Mar 2014 14:05:39 -0000 Author: glebius Date: Tue Mar 4 14:05:37 2014 New Revision: 262735 URL: http://svnweb.freebsd.org/changeset/base/262735 Log: Merge r261590: Fixup for r261590 (vnet sysctl handlers cleanup) Modified: stable/10/sys/net/vnet.h stable/10/sys/netinet/cc/cc_cdg.c stable/10/sys/netinet/sctp_sysctl.c Directory Properties: stable/10/ (props changed) Modified: stable/10/sys/net/vnet.h ============================================================================== --- stable/10/sys/net/vnet.h Tue Mar 4 14:01:12 2014 (r262734) +++ stable/10/sys/net/vnet.h Tue Mar 4 14:05:37 2014 (r262735) @@ -303,7 +303,7 @@ void vnet_data_free(void *start_arg, in descr) \ SYSCTL_OID(parent, nbr, name, \ CTLTYPE_OPAQUE|CTLFLAG_VNET|(access), ptr, len, \ - vnet_sysctl_handle_opaque, fmt, descr) + sysctl_handle_opaque, fmt, descr) #define SYSCTL_VNET_STRING(parent, nbr, name, access, arg, len, descr) \ SYSCTL_OID(parent, nbr, name, \ CTLTYPE_STRING|CTLFLAG_VNET|(access), \ Modified: stable/10/sys/netinet/cc/cc_cdg.c ============================================================================== --- stable/10/sys/netinet/cc/cc_cdg.c Tue Mar 4 14:01:12 2014 (r262734) +++ stable/10/sys/netinet/cc/cc_cdg.c Tue Mar 4 14:05:37 2014 (r262735) @@ -81,11 +81,6 @@ __FBSDID("$FreeBSD$"); #define CAST_PTR_INT(X) (*((int*)(X))) -#ifndef VIMAGE -#define vnet_sysctl_handle_uint(oidp, arg1, arg2, req) \ - sysctl_handle_int(oidp, arg1, arg2, req) -#endif - /* Private delay-gradient induced congestion control signal. */ #define CC_CDG_DELAY 0x01000000 @@ -357,7 +352,7 @@ cdg_beta_handler(SYSCTL_HANDLER_ARGS) (CAST_PTR_INT(req->newptr) == 0 || CAST_PTR_INT(req->newptr) > 100)) return (EINVAL); - return (vnet_sysctl_handle_uint(oidp, arg1, arg2, req)); + return (sysctl_handle_int(oidp, arg1, arg2, req)); } static int @@ -367,7 +362,7 @@ cdg_exp_backoff_scale_handler(SYSCTL_HAN if (req->newptr != NULL && CAST_PTR_INT(req->newptr) < 1) return (EINVAL); - return (vnet_sysctl_handle_uint(oidp, arg1, arg2, req)); + return (sysctl_handle_int(oidp, arg1, arg2, req)); } static inline unsigned long Modified: stable/10/sys/netinet/sctp_sysctl.c ============================================================================== --- stable/10/sys/netinet/sctp_sysctl.c Tue Mar 4 14:01:12 2014 (r262734) +++ stable/10/sys/netinet/sctp_sysctl.c Tue Mar 4 14:05:37 2014 (r262735) @@ -587,11 +587,7 @@ sysctl_sctp_check(SYSCTL_HANDLER_ARGS) { int error; -#ifdef VIMAGE - error = vnet_sysctl_handle_int(oidp, oidp->oid_arg1, oidp->oid_arg2, req); -#else error = sysctl_handle_int(oidp, oidp->oid_arg1, oidp->oid_arg2, req); -#endif if (error == 0) { RANGECHK(SCTP_BASE_SYSCTL(sctp_sendspace), SCTPCTL_MAXDGRAM_MIN, SCTPCTL_MAXDGRAM_MAX); RANGECHK(SCTP_BASE_SYSCTL(sctp_recvspace), SCTPCTL_RECVSPACE_MIN, SCTPCTL_RECVSPACE_MAX);