Date: Tue, 14 Oct 2008 07:58:18 +0000 (UTC) From: Robert Watson <rwatson@FreeBSD.org> To: cvs-src-old@freebsd.org Subject: cvs commit: src/sys/kern uipc_sockbuf.c src/sys/netinet tcp_input.c Message-ID: <200810140758.m9E7wwuO074030@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
rwatson 2008-10-14 07:58:18 UTC
FreeBSD src repository
Modified files: (Branch: RELENG_7)
sys/kern uipc_sockbuf.c
sys/netinet tcp_input.c
Log:
SVN rev 183870 on 2008-10-14 07:58:18Z by rwatson
Merge r183662 and r183663 from head to stable/7:
Don't pass curthread to sbreserve_locked() in tcp_do_segment(), as the
netisr or ithread's socket buffer size limit is not the right limit to
use. Instead, pass NULL as the other two calls to sbreserve_locked()
in the TCP input path (tcp_mss()) do.
In practice, this is a no-op, as ithreads and the netisr run without a
process limit on socket buffer use, and a NULL thread pointer leads to
not using the process's limit, if any. However, if tcp_input() is
called in other contexts that do have limits, this may prevent the
incorrect limit from being used.
Rewrite sbreserve_locked()'s comment on NULL thread pointers, eliminating
an XXXRW about the comment being stale.
Approved by: re (gnn)
Revision Changes Path
1.171.2.4 +5 -4 src/sys/kern/uipc_sockbuf.c
1.370.2.8 +1 -1 src/sys/netinet/tcp_input.c
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200810140758.m9E7wwuO074030>