From owner-cvs-src-old@FreeBSD.ORG  Tue Oct 14 07:58:58 2008
Return-Path: <owner-cvs-src-old@FreeBSD.ORG>
Delivered-To: cvs-src-old@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id B79E110656B6
	for <cvs-src-old@freebsd.org>; Tue, 14 Oct 2008 07:58:58 +0000 (UTC)
	(envelope-from rwatson@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id A40DB8FC17
	for <cvs-src-old@freebsd.org>; Tue, 14 Oct 2008 07:58:58 +0000 (UTC)
	(envelope-from rwatson@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id m9E7wwYl074031
	for <cvs-src-old@freebsd.org>; Tue, 14 Oct 2008 07:58:58 GMT
	(envelope-from rwatson@repoman.freebsd.org)
Received: (from svn2cvs@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m9E7wwuO074030
	for cvs-src-old@freebsd.org; Tue, 14 Oct 2008 07:58:58 GMT
	(envelope-from rwatson@repoman.freebsd.org)
Message-Id: <200810140758.m9E7wwuO074030@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: svn2cvs set sender to
	rwatson@repoman.freebsd.org using -f
From: Robert Watson <rwatson@FreeBSD.org>
Date: Tue, 14 Oct 2008 07:58:18 +0000 (UTC)
To: cvs-src-old@freebsd.org
X-FreeBSD-CVS-Branch: RELENG_7
Subject: cvs commit: src/sys/kern uipc_sockbuf.c src/sys/netinet tcp_input.c
X-BeenThere: cvs-src-old@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: **OBSOLETE** CVS commit messages for the src tree
	<cvs-src-old.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-src-old>,
	<mailto:cvs-src-old-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/cvs-src-old>
List-Post: <mailto:cvs-src-old@freebsd.org>
List-Help: <mailto:cvs-src-old-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-src-old>,
	<mailto:cvs-src-old-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 14 Oct 2008 07:58:58 -0000

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