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 > > > > Log: > > MFC r226433: > > > > Update the comment and description of tcp_sendspace and tcp_recvspace > > to better reflect their purpose. > > > > MFC r226437: > > > > 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. > > > > MFC r226448: > > > > 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. > > > > MFC r227034: > > > > Restore sysctl names for tcp_sendspace/tcp_recvspace. > > > > They seem to be changed unintentionally in r226437, and there were no > > any mentions of renaming in commit log message. > > > > Reported by: Anton Yuzhaninov <citrin citrin ru> > > > > 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) > > > > Modified: stable/9/sys/netinet/tcp_input.c > > ============================================================================== > > --- 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"); > > > > +VNET_DEFINE(int, tcp_recvspace) = 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) = 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=c99 -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=8000 --param > inline-unit-growth=100 --param large-function-growth=1000 -DGPROF > -falign-functions=16 -DGPROF4 -DGUPROF -fno-builtin > -fno-omit-frame-pointer -mcmodel=kernel -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
Hopefully fixed by r252893.
pgpxDffP03a2T.pgp
Description: PGP signature
