Date: Sat, 6 Jul 2013 23:12:29 +0300 From: Konstantin Belousov <kostikbel@gmail.com> To: Glen Barber <gjb@FreeBSD.org> Cc: svn-src-stable@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org, Andre Oppermann <andre@FreeBSD.org>, svn-src-stable-9@freebsd.org Subject: Re: svn commit: r252835 - stable/9/sys/netinet Message-ID: <20130706201229.GB91021@kib.kiev.ua> In-Reply-To: <20130706192146.GL20631@glenbarber.us> References: <201307052011.r65KBRCG063754@svn.freebsd.org> <20130706192146.GL20631@glenbarber.us>
next in thread | previous in thread | raw e-mail | index | archive | help
--UXNJ9ANe8MmuJ4dV Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Sat, Jul 06, 2013 at 03:21:46PM -0400, Glen Barber wrote: > 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, >=20 > I think this breaks the LINT build. >=20 > 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 'stat= ic' > /src/sys/netinet/tcp_input.c:199: error: > 'sysctl___net_inet_tcp_recvspace' undeclared here (not in a function) > *** Error code 1 >=20 > Stop in /obj/amd64.amd64/src/sys/LINT-VIMAGE. > *** Error code 1 Hopefully fixed by r252893. --UXNJ9ANe8MmuJ4dV Content-Type: application/pgp-signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.20 (FreeBSD) iQIcBAEBAgAGBQJR2HotAAoJEJDCuSvBvK1B5RsP/3+4hQr5+Wa8fTyg2v1UgY3U DdzKN5utaR/xZuv2TRWOHmGhBqPLwPhkVRV1tPl5+w4pQccsjIQxoKsN/WZNGx9M H3XD2nNzaXUdWZoeAeho0XBTsp/xywTcJkrGoM9D7VLZFCUGSNEiG4y68E2V3MV2 Dm3R6fq9iq/mTAARC3jw0N2VF6XODrtOGmyKHSshBfiXOSfIfnnS2ydd6JFaTt/d wOBLPphlDDWPZK1ef6rH5QMZc38jOtT9nIK1DqReH9X/mQGzB3GZlqG/riMpcLDp ff3TUTjgkFgfT8fuQx8Ho/4INEjcPWTb5zS8OYrTLEum8Q6MRod+vwJ9911ShUl7 LRazLLmcBlRNYhAX0ji1ycvkNkXClIXR3AE2MHLWIjE0Tu8e4pSwcaJ+LqUoqcx2 rHUQUabiJtj64Rr1czqG/Q1QU+2TJJkJSPQ9wDx9p9GUxEl8HL2IQeU3LYijUCew 0w2qcLJHwFLSnCvy9w5vjxaUUqKpHkF4/6gbFqzlnrHVOPBg2Pn/AyxbwoXBWmDG TPI/nCTA5V1YXSCyl1/39G+7Z2s6OGeEHOGMoI1i1KBZRU8Dj3hcyDYjgDYieFa4 cwDVAXlp+mCx2SiSmeXXO+c0yX4XeZdEUQ1FuR8y7xw4mddl1/XKOGoW1EJyJJ/z 070mUWbClTCSv54pID5g =5X+i -----END PGP SIGNATURE----- --UXNJ9ANe8MmuJ4dV--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20130706201229.GB91021>