Date: Sat, 6 Jul 2013 15:21:46 -0400 From: Glen Barber <gjb@FreeBSD.org> To: Andre Oppermann <andre@FreeBSD.org> Cc: svn-src-stable@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org, svn-src-stable-9@freebsd.org Subject: Re: svn commit: r252835 - stable/9/sys/netinet Message-ID: <20130706192146.GL20631@glenbarber.us> In-Reply-To: <201307052011.r65KBRCG063754@svn.freebsd.org> References: <201307052011.r65KBRCG063754@svn.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
--UK1lfQXsnwKrySH9 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Fri, Jul 05, 2013 at 08:11:27PM +0000, Andre Oppermann wrote: > Author: andre > Date: Fri Jul 5 20:11:27 2013 > New Revision: 252835 > URL: http://svnweb.freebsd.org/changeset/base/252835 >=20 > Log: > MFC r226433: > =20 > Update the comment and description of tcp_sendspace and tcp_recvspace > to better reflect their purpose. > =20 > MFC r226437: > =20 > VNET virtualize tcp_sendspace/tcp_recvspace and change the > type to INT. A long is not necessary as the TCP window is > limited to 2**30. A larger initial window isn't useful. > =20 > MFC r226448: > =20 > Move the tcp_sendspace and tcp_recvspace sysctl's from > the middle of tcp_usrreq.c to the top of tcp_output.c > and tcp_input.c respectively next to the socket buffer > autosizing controls. > =20 > MFC r227034: > =20 > Restore sysctl names for tcp_sendspace/tcp_recvspace. > =20 > They seem to be changed unintentionally in r226437, and there were no > any mentions of renaming in commit log message. > =20 > Reported by: Anton Yuzhaninov <citrin citrin ru> >=20 > Modified: > stable/9/sys/netinet/tcp_input.c > stable/9/sys/netinet/tcp_output.c > stable/9/sys/netinet/tcp_usrreq.c > stable/9/sys/netinet/tcp_var.h > Directory Properties: > stable/9/sys/ (props changed) >=20 > Modified: stable/9/sys/netinet/tcp_input.c > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- stable/9/sys/netinet/tcp_input.c Fri Jul 5 20:01:07 2013 (r252834) > +++ stable/9/sys/netinet/tcp_input.c Fri Jul 5 20:11:27 2013 (r252835) > @@ -194,6 +194,11 @@ SYSCTL_VNET_INT(_net_inet_tcp, OID_AUTO, > &VNET_NAME(tcp_insecure_rst), 0, > "Follow the old (insecure) criteria for accepting RST packets"); > =20 > +VNET_DEFINE(int, tcp_recvspace) =3D 1024*64 > +#define V_tcp_recvspace VNET(tcp_recvspace) > +SYSCTL_VNET_INT(_net_inet_tcp, TCPCTL_RECVSPACE, recvspace, CTLFLAG_RW, > + &VNET_NAME(tcp_recvspace), 0, "Initial receive socket buffer size"); > + > VNET_DEFINE(int, tcp_do_autorcvbuf) =3D 1; > #define V_tcp_do_autorcvbuf VNET(tcp_do_autorcvbuf) > SYSCTL_VNET_INT(_net_inet_tcp, OID_AUTO, recvbuf_auto, CTLFLAG_RW, I think this breaks the LINT build. cc -c -O2 -frename-registers -pipe -fno-strict-aliasing -std=3Dc99 -Wall -Wredundant-decls -Wnested-externs -Wstrict-prototypes -Wmissing-prototypes -Wpointer-arith -Winline -Wcast-qual -Wundef -Wno-pointer-sign -fformat-extensions -Wmissing-include-dirs -fdiagnostics-show-option -nostdinc -I. -I/src/sys -I/src/sys/contrib/altq -D_KERNEL -DHAVE_KERNEL_OPTION_HEADERS -include opt_global.h -fno-common -finline-limit=3D8000 --param inline-unit-growth=3D100 --param large-function-growth=3D1000 -DGPROF -falign-functions=3D16 -DGPROF4 -DGUPROF -fno-builtin -fno-omit-frame-pointer -mcmodel=3Dkernel -mno-red-zone -mno-mmx -mno-sse -msoft-float -fno-asynchronous-unwind-tables -ffreestanding -fstack-protector -Werror -pg -mprofiler-epilogue /src/sys/netinet/tcp_input.c /src/sys/netinet/tcp_input.c:199: error: expected ',' or ';' before 'static' /src/sys/netinet/tcp_input.c:199: error: 'sysctl___net_inet_tcp_recvspace' undeclared here (not in a function) *** Error code 1 Stop in /obj/amd64.amd64/src/sys/LINT-VIMAGE. *** Error code 1 Glen --UK1lfQXsnwKrySH9 Content-Type: application/pgp-signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.20 (FreeBSD) iQEcBAEBCAAGBQJR2G5KAAoJEFJPDDeguUajxQYIAJZG90GfFBuzWMU/Rx/HhgMS HG5XElZOtrc0V+RTqRc0Wib6Vk/tyfXlmCObqpv2QFRznVIdcP0xw9DuDzW0mC0U X0pnRgsx3FV4eQVYQSJRKW37BGszizrO+sNWetGMJU/aJRlnFQEkdiokOTDHyXGh IewXOZCYoD/7HCBVkHJ6iM5XGK+nQOrdhcilN4sFEkej51piOt8+Kq/JoYX0n50a Ggi2HOWwIIVBAT4xyLOVaY5x70GyipLE3in0QfYabGjZq7C63icPXjfT7lrsuBXw OTeyVpLs181oz7PhmpCDbJSYfJXGDkXQxRQMckFmcQ4FuTRcTXjK8HM2jl83mCs= =Yxda -----END PGP SIGNATURE----- --UK1lfQXsnwKrySH9--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20130706192146.GL20631>