From owner-svn-src-all@FreeBSD.ORG Mon Oct 17 06:51:05 2011 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 975E31065674 for ; Mon, 17 Oct 2011 06:51:05 +0000 (UTC) (envelope-from andre@freebsd.org) Received: from c00l3r.networx.ch (c00l3r.networx.ch [62.48.2.2]) by mx1.freebsd.org (Postfix) with ESMTP id EC91C8FC1B for ; Mon, 17 Oct 2011 06:51:04 +0000 (UTC) Received: (qmail 81583 invoked from network); 17 Oct 2011 05:31:27 -0000 Received: from localhost (HELO [127.0.0.1]) ([127.0.0.1]) (envelope-sender ) by c00l3r.networx.ch (qmail-ldap-1.03) with SMTP for ; 17 Oct 2011 05:31:27 -0000 Message-ID: <4E9BD057.4060609@freebsd.org> Date: Mon, 17 Oct 2011 08:51:03 +0200 From: Andre Oppermann User-Agent: Mozilla/5.0 (Windows NT 5.1; rv:7.0.1) Gecko/20110929 Thunderbird/7.0.1 MIME-Version: 1.0 To: "Bjoern A. Zeeb" References: <201110170005.p9H05VrP086262@svn.freebsd.org> In-Reply-To: Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org Subject: Re: svn commit: r226454 - head/sys/netinet X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 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: Mon, 17 Oct 2011 06:51:05 -0000 On 17.10.2011 02:16, Bjoern A. Zeeb wrote: > > On 17. Oct 2011, at 00:05 , Bjoern A. Zeeb wrote: > >> Author: bz >> Date: Mon Oct 17 00:05:31 2011 >> New Revision: 226454 >> URL: http://svn.freebsd.org/changeset/base/226454 >> >> Log: >> Add syntactic sugar missed in r226437 and then not added either when moving >> things around in r226448 but desperately needed to always make things >> compile successfully. >> > > > GENRIC and LINT did not fail failed on it as it expanded to: > > int tcp_recvspace = 1024*64 > > followed by: > > #define SYSCTL_VNET_INT(parent, nbr, name, access, ptr, val, descr) \ > SYSCTL_INT(parent, nbr, name, access, ptr, val, descr) > > => > > #define SYSCTL_INT(parent, nbr, name, access, ptr, val, descr) \ > SYSCTL_ASSERT_TYPE(INT, ptr, parent, name); \ > SYSCTL_OID(parent, nbr, name, \ > CTLTYPE_INT | CTLFLAG_MPSAFE | (access), \ > ptr, val, sysctl_handle_int, "I", descr) > > and the SYSCTL_ASSERT_TYPE() expanding to nothing in > > #define SYSCTL_ASSERT_TYPE(type, ptr, parent, name) > > leaving just the ';' around; so it ended up as: > > int tcp_recvspace = 1024*64 > > ; > and an expanded SYSCTL_OID(...); Oops, sorry missing that one. And thanks for comitting the fix. -- Andre >> MFC after: 1 week >> >> Modified: >> head/sys/netinet/tcp_input.c >> >> Modified: head/sys/netinet/tcp_input.c >> ============================================================================== >> --- head/sys/netinet/tcp_input.c Sun Oct 16 22:24:04 2011 (r226453) >> +++ head/sys/netinet/tcp_input.c Mon Oct 17 00:05:31 2011 (r226454) >> @@ -183,7 +183,7 @@ SYSCTL_VNET_INT(_net_inet_tcp, OID_AUTO, >> &VNET_NAME(tcp_insecure_rst), 0, >> "Follow the old (insecure) criteria for accepting RST packets"); >> >> -VNET_DEFINE(int, tcp_recvspace) = 1024*64 >> +VNET_DEFINE(int, tcp_recvspace) = 1024*64; >> #define V_tcp_recvspace VNET(tcp_recvspace) >> SYSCTL_VNET_INT(_net_inet_tcp, TCPCTL_RECVSPACE, tcp_recvspace, CTLFLAG_RW, >> &VNET_NAME(tcp_recvspace), 0, "Initial receive socket buffer size"); >